add buildRuleMessage fn to params

elastic · Sep 28, 2020 · b114812 · b114812
1 parent 08522ef
commit b114812
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 51 deletions.
diff --git a/...k/plugins/security_solution/server/lib/detection_engine/signals/bulk_create_ml_signals.ts b/...k/plugins/security_solution/server/lib/detection_engine/signals/bulk_create_ml_signals.ts
@@ -34,6 +34,7 @@ interface BulkCreateMlSignalsParams {
   refresh: RefreshTypes;
   tags: string[];
   throttle: string;
+  buildRuleMessage: BuildRuleMessage;
 }
 
 interface EcsAnomaly extends Anomaly {
@@ -82,10 +83,10 @@ const transformAnomalyResultsToEcs = (results: AnomalyResults): SearchResponse<E
 };
 
 export const bulkCreateMlSignals = async (
-  params: BulkCreateMlSignalsParams,
-  buildRuleMessage: BuildRuleMessage
+  params: BulkCreateMlSignalsParams
 ): Promise<SingleBulkCreateResponse> => {
   const anomalyResults = params.someResult;
   const ecsResults = transformAnomalyResultsToEcs(anomalyResults);
+  const buildRuleMessage = params.buildRuleMessage;
   return singleBulkCreate({ ...params, filteredEvents: ecsResults, buildRuleMessage });
 };
diff --git a/...ns/security_solution/server/lib/detection_engine/signals/bulk_create_threshold_signals.ts b/...ns/security_solution/server/lib/detection_engine/signals/bulk_create_threshold_signals.ts
@@ -41,6 +41,7 @@ interface BulkCreateThresholdSignalsParams {
   tags: string[];
   throttle: string;
   startedAt: Date;
+  buildRuleMessage: BuildRuleMessage;
 }
 
 interface FilterObject {
@@ -185,8 +186,7 @@ export const transformThresholdResultsToEcs = (
 };
 
 export const bulkCreateThresholdSignals = async (
-  params: BulkCreateThresholdSignalsParams,
-  buildRuleMessage: BuildRuleMessage
+  params: BulkCreateThresholdSignalsParams
 ): Promise<SingleBulkCreateResponse> => {
   const thresholdResults = params.someResult;
   const ecsResults = transformThresholdResultsToEcs(
@@ -197,6 +197,7 @@ export const bulkCreateThresholdSignals = async (
     params.ruleParams.threshold!,
     params.ruleParams.ruleId
   );
+  const buildRuleMessage = params.buildRuleMessage;
 
   return singleBulkCreate({ ...params, filteredEvents: ecsResults, buildRuleMessage });
 };
diff --git a/...k/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.ts b/...k/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.ts
@@ -239,28 +239,26 @@ export const signalRulesAlertType = ({
             errors,
             bulkCreateDuration,
             createdItemsCount,
-          } = await bulkCreateMlSignals(
-            {
-              actions,
-              throttle,
-              someResult: anomalyResults,
-              ruleParams: params,
-              services,
-              logger,
-              id: alertId,
-              signalsIndex: outputIndex,
-              name,
-              createdBy,
-              createdAt,
-              updatedBy,
-              updatedAt,
-              interval,
-              enabled,
-              refresh,
-              tags,
-            },
-            buildRuleMessage
-          );
+          } = await bulkCreateMlSignals({
+            actions,
+            throttle,
+            someResult: anomalyResults,
+            ruleParams: params,
+            services,
+            logger,
+            id: alertId,
+            signalsIndex: outputIndex,
+            name,
+            createdBy,
+            createdAt,
+            updatedBy,
+            updatedAt,
+            interval,
+            enabled,
+            refresh,
+            tags,
+            buildRuleMessage,
+          });
           // The legacy ES client does not define failures when it can be present on the structure, hence why I have the & { failures: [] }
           const shardFailures =
             (anomalyResults._shards as typeof anomalyResults._shards & { failures: [] }).failures ??
@@ -306,31 +304,29 @@ export const signalRulesAlertType = ({
             bulkCreateDuration,
             createdItemsCount,
             errors,
-          } = await bulkCreateThresholdSignals(
-            {
-              actions,
-              throttle,
-              someResult: thresholdResults,
-              ruleParams: params,
-              filter: esFilter,
-              services,
-              logger,
-              id: alertId,
-              inputIndexPattern: inputIndex,
-              signalsIndex: outputIndex,
-              startedAt,
-              name,
-              createdBy,
-              createdAt,
-              updatedBy,
-              updatedAt,
-              interval,
-              enabled,
-              refresh,
-              tags,
-            },
-            buildRuleMessage
-          );
+          } = await bulkCreateThresholdSignals({
+            actions,
+            throttle,
+            someResult: thresholdResults,
+            ruleParams: params,
+            filter: esFilter,
+            services,
+            logger,
+            id: alertId,
+            inputIndexPattern: inputIndex,
+            signalsIndex: outputIndex,
+            startedAt,
+            name,
+            createdBy,
+            createdAt,
+            updatedBy,
+            updatedAt,
+            interval,
+            enabled,
+            refresh,
+            tags,
+            buildRuleMessage,
+          });
           result = mergeReturns([
             result,
             createSearchAfterReturnTypeFromResponse({ searchResult: thresholdResults }),