PR comments

elastic · Mar 19, 2020 · aaf4df5 · aaf4df5
1 parent fedc474
commit aaf4df5
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 31 deletions.
diff --git a/...gins/siem/server/lib/detection_engine/routes/schemas/add_prepackaged_rules_schema.test.ts b/...gins/siem/server/lib/detection_engine/routes/schemas/add_prepackaged_rules_schema.test.ts
@@ -1321,7 +1321,7 @@ describe('add prepackaged rules schema', () => {
         risk_score: 50,
         description: 'some description',
         name: 'some-name',
-        severity: 'junk',
+        severity: 'low',
         type: 'query',
         references: ['index-1'],
         query: 'some query',
@@ -1352,7 +1352,7 @@ describe('add prepackaged rules schema', () => {
         risk_score: 50,
         description: 'some description',
         name: 'some-name',
-        severity: 'junk',
+        severity: 'low',
         type: 'query',
         references: ['index-1'],
         query: 'some query',
@@ -1383,7 +1383,7 @@ describe('add prepackaged rules schema', () => {
         risk_score: 50,
         description: 'some description',
         name: 'some-name',
-        severity: 'junk',
+        severity: 'low',
         type: 'query',
         references: ['index-1'],
         query: 'some query',
@@ -1414,7 +1414,7 @@ describe('add prepackaged rules schema', () => {
         risk_score: 50,
         description: 'some description',
         name: 'some-name',
-        severity: 'junk',
+        severity: 'low',
         type: 'query',
         references: ['index-1'],
         query: 'some query',
@@ -1446,7 +1446,7 @@ describe('add prepackaged rules schema', () => {
         risk_score: 50,
         description: 'some description',
         name: 'some-name',
-        severity: 'junk',
+        severity: 'low',
         type: 'query',
         references: ['index-1'],
         query: 'some query',

diff --git a/...egacy/plugins/siem/server/lib/detection_engine/routes/schemas/create_rules_schema.test.ts b/...egacy/plugins/siem/server/lib/detection_engine/routes/schemas/create_rules_schema.test.ts
@@ -1266,7 +1266,7 @@ describe('create rules schema', () => {
         risk_score: 50,
         description: 'some description',
         name: 'some-name',
-        severity: 'junk',
+        severity: 'low',
         type: 'query',
         references: ['index-1'],
         query: 'some query',
@@ -1293,7 +1293,7 @@ describe('create rules schema', () => {
         risk_score: 50,
         description: 'some description',
         name: 'some-name',
-        severity: 'junk',
+        severity: 'low',
         type: 'query',
         references: ['index-1'],
         query: 'some query',
@@ -1320,7 +1320,7 @@ describe('create rules schema', () => {
         risk_score: 50,
         description: 'some description',
         name: 'some-name',
-        severity: 'junk',
+        severity: 'low',
         type: 'query',
         references: ['index-1'],
         query: 'some query',
@@ -1347,7 +1347,7 @@ describe('create rules schema', () => {
         risk_score: 50,
         description: 'some description',
         name: 'some-name',
-        severity: 'junk',
+        severity: 'low',
         type: 'query',
         references: ['index-1'],
         query: 'some query',
@@ -1381,7 +1381,7 @@ describe('create rules schema', () => {
         risk_score: 50,
         description: 'some description',
         name: 'some-name',
-        severity: 'junk',
+        severity: 'low',
         type: 'query',
         references: ['index-1'],
         query: 'some query',

diff --git a/...egacy/plugins/siem/server/lib/detection_engine/routes/schemas/import_rules_schema.test.ts b/...egacy/plugins/siem/server/lib/detection_engine/routes/schemas/import_rules_schema.test.ts
@@ -1492,7 +1492,7 @@ describe('import rules schema', () => {
         risk_score: 50,
         description: 'some description',
         name: 'some-name',
-        severity: 'junk',
+        severity: 'low',
         type: 'query',
         references: ['index-1'],
         query: 'some query',
@@ -1519,7 +1519,7 @@ describe('import rules schema', () => {
         risk_score: 50,
         description: 'some description',
         name: 'some-name',
-        severity: 'junk',
+        severity: 'low',
         type: 'query',
         references: ['index-1'],
         query: 'some query',
@@ -1546,7 +1546,7 @@ describe('import rules schema', () => {
         risk_score: 50,
         description: 'some description',
         name: 'some-name',
-        severity: 'junk',
+        severity: 'low',
         type: 'query',
         references: ['index-1'],
         query: 'some query',
@@ -1580,7 +1580,7 @@ describe('import rules schema', () => {
         risk_score: 50,
         description: 'some description',
         name: 'some-name',
-        severity: 'junk',
+        severity: 'low',
         type: 'query',
         references: ['index-1'],
         query: 'some query',

diff --git a/...legacy/plugins/siem/server/lib/detection_engine/routes/schemas/patch_rules_schema.test.ts b/...legacy/plugins/siem/server/lib/detection_engine/routes/schemas/patch_rules_schema.test.ts
@@ -1077,7 +1077,7 @@ describe('patch rules schema', () => {
         risk_score: 50,
         description: 'some description',
         name: 'some-name',
-        severity: 'junk',
+        severity: 'low',
         type: 'query',
         references: ['index-1'],
         query: 'some query',
@@ -1104,7 +1104,7 @@ describe('patch rules schema', () => {
         risk_score: 50,
         description: 'some description',
         name: 'some-name',
-        severity: 'junk',
+        severity: 'low',
         type: 'query',
         references: ['index-1'],
         query: 'some query',
@@ -1131,7 +1131,7 @@ describe('patch rules schema', () => {
         risk_score: 50,
         description: 'some description',
         name: 'some-name',
-        severity: 'junk',
+        severity: 'low',
         type: 'query',
         references: ['index-1'],
         query: 'some query',
@@ -1158,7 +1158,7 @@ describe('patch rules schema', () => {
         risk_score: 50,
         description: 'some description',
         name: 'some-name',
-        severity: 'junk',
+        severity: 'low',
         type: 'query',
         references: ['index-1'],
         query: 'some query',
@@ -1192,7 +1192,7 @@ describe('patch rules schema', () => {
         risk_score: 50,
         description: 'some description',
         name: 'some-name',
-        severity: 'junk',
+        severity: 'low',
         type: 'query',
         references: ['index-1'],
         query: 'some query',

diff --git a/...egacy/plugins/siem/server/lib/detection_engine/routes/schemas/update_rules_schema.test.ts b/...egacy/plugins/siem/server/lib/detection_engine/routes/schemas/update_rules_schema.test.ts
@@ -1285,7 +1285,7 @@ describe('create rules schema', () => {
         risk_score: 50,
         description: 'some description',
         name: 'some-name',
-        severity: 'junk',
+        severity: 'low',
         type: 'query',
         references: ['index-1'],
         query: 'some query',
@@ -1312,7 +1312,7 @@ describe('create rules schema', () => {
         risk_score: 50,
         description: 'some description',
         name: 'some-name',
-        severity: 'junk',
+        severity: 'low',
         type: 'query',
         references: ['index-1'],
         query: 'some query',
@@ -1339,7 +1339,7 @@ describe('create rules schema', () => {
         risk_score: 50,
         description: 'some description',
         name: 'some-name',
-        severity: 'junk',
+        severity: 'low',
         type: 'query',
         references: ['index-1'],
         query: 'some query',
@@ -1366,7 +1366,7 @@ describe('create rules schema', () => {
         risk_score: 50,
         description: 'some description',
         name: 'some-name',
-        severity: 'junk',
+        severity: 'low',
         type: 'query',
         references: ['index-1'],
         query: 'some query',
@@ -1400,7 +1400,7 @@ describe('create rules schema', () => {
         risk_score: 50,
         description: 'some description',
         name: 'some-name',
-        severity: 'junk',
+        severity: 'low',
         type: 'query',
         references: ['index-1'],
         query: 'some query',

diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/create_rules.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/create_rules.ts
@@ -84,7 +84,7 @@ export const createRules = ({
       },
       schedule: { interval },
       enabled,
-      actions: actions ?? [],
+      actions,
       throttle,
     },
   });

diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/patch_rules.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/patch_rules.ts
@@ -54,6 +54,7 @@ export const patchRules = async ({
   }
 
   const calculatedVersion = calculateVersion(rule.params.immutable, rule.params.version, {
+    actions,
     description,
     falsePositives,
     query,
@@ -73,6 +74,7 @@ export const patchRules = async ({
     severity,
     tags,
     threat,
+    throttle,
     to,
     type,
     references,
@@ -116,7 +118,7 @@ export const patchRules = async ({
     id: rule.id,
     data: {
       tags: addTags(tags ?? rule.tags, rule.params.ruleId, immutable ?? rule.params.immutable),
-      throttle: throttle ?? throttle === null ? null : rule.throttle,
+      throttle: throttle !== undefined ? throttle : rule.throttle,
       name: calculateName({ updatedName: name, originalName: rule.name }),
       schedule: {
         interval: calculateInterval(interval, rule.schedule.interval),

diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/update_rules.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/update_rules.ts
@@ -92,7 +92,7 @@ export const updateRules = async ({
       name,
       schedule: { interval },
       actions: actions ?? rule.actions,
-      throttle: throttle ?? throttle === null ? null : rule.throttle,
+      throttle: throttle !== undefined ? throttle : rule.throttle,
       params: {
         description,
         ruleId: rule.params.ruleId,

diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/build_rule.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/build_rule.test.ts
@@ -109,7 +109,7 @@ describe('buildRule', () => {
     expect(rule).toEqual(expected);
   });
 
-  test('it omits a null value such as if enabled is null if is present', () => {
+  test('it omits a null value such as if "enabled" is null if is present', () => {
     const ruleParams = sampleRuleAlertParams();
     ruleParams.filters = undefined;
     const rule = buildRule({
@@ -184,7 +184,7 @@ describe('buildRule', () => {
     expect(rule).toEqual(expected);
   });
 
-  test('it omits a null value such as if filters is undefined if is present', () => {
+  test('it omits a null value such as if "filters" is undefined if is present', () => {
     const ruleParams = sampleRuleAlertParams();
     ruleParams.filters = undefined;
     const rule = buildRule({
@@ -259,7 +259,7 @@ describe('buildRule', () => {
     expect(rule).toEqual(expected);
   });
 
-  test('it omits a null value such as if throttle is undefined if is present', () => {
+  test('it omits a null value such as if "throttle" is undefined if is present', () => {
     const ruleParams = sampleRuleAlertParams();
     const rule = buildRule({
       actions: [],

diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/types.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/types.ts
@@ -32,7 +32,7 @@ export interface ThreatParams {
 export type RuleType = 'query' | 'saved_query' | 'machine_learning';
 
 export interface RuleAlertParams {
-  actions: AlertAction[] | undefined;
+  actions: AlertAction[];
   anomalyThreshold: number | undefined;
   description: string;
   note: string | undefined | null;