PR comments and pass ruleAlertId to the notification params

patrykkopycinski · patrykkopycinski · commit 7cce784ad374 · 2020-03-24T21:17:11.000+01:00
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_actions_field/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_actions_field/index.tsx
@@ -22,7 +22,7 @@ type ThrottleSelectField = typeof SelectField;
 
 const DEFAULT_ACTION_GROUP_ID = 'default';
 const DEFAULT_ACTION_MESSAGE =
-  'Rule {{context.rule.name}} generated {{state.signalsCount}} signals';
+  'Rule {{context.rule.name}} generated {{state.signals_count}} signals';
 
 export const RuleActionsField: ThrottleSelectField = ({ field, messageVariables }) => {
   const [supportedActionTypes, setSupportedActionTypes] = useState<ActionType[] | undefined>();
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/helpers.test.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/helpers.test.ts
@@ -615,7 +615,7 @@ describe('helpers', () => {
       const mockAction = {
         group: 'default',
         id: '99403909-ca9b-49ba-9d7a-7e5320e68d05',
-        params: { message: 'ML Rule generated {{state.signalsCount}} signals' },
+        params: { message: 'ML Rule generated {{state.signals_count}} signals' },
         actionTypeId: '.slack',
       };
 
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/helpers.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/helpers.tsx
@@ -228,6 +228,7 @@ export const redirectToDetections = (
 
 export const getActionMessageRuleParams = (ruleType: RuleType): string[] => {
   const commonRuleParamsKeys = [
+    'id',
     'name',
     'description',
     'false_positives',
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/create_notifications.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/create_notifications.test.ts
@@ -42,7 +42,7 @@ describe('createNotifications', () => {
     const action = {
       group: 'default',
       id: '99403909-ca9b-49ba-9d7a-7e5320e68d05',
-      params: { message: 'Rule generated {{state.signalsCount}} signals' },
+      params: { message: 'Rule generated {{state.signals_count}} signals' },
       action_type_id: '.slack',
     };
     await createNotifications({
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/get_signals_count.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/get_signals_count.ts
@@ -21,7 +21,7 @@ interface GetSignalsCount {
   ruleAlertId: string;
   ruleId: string;
   index: string;
-  kibanaSiemAppUrl: string | {} | undefined;
+  kibanaSiemAppUrl: string | undefined;
   callCluster: NotificationExecutorOptions['services']['callCluster'];
 }
 
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/rules_notification_alert_type.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/rules_notification_alert_type.ts
@@ -40,14 +40,14 @@ export const rulesNotificationAlertType = ({
     }
 
     const { params: ruleAlertParams, name: ruleName } = ruleAlertSavedObject.attributes;
-    const ruleParams = { ...ruleAlertParams, name: ruleName };
+    const ruleParams = { ...ruleAlertParams, name: ruleName, id: ruleAlertSavedObject.id };
 
     const { signalsCount, resultsLink } = await getSignalsCount({
       from: previousStartedAt ?? `now-${ruleParams.interval}`,
       to: startedAt,
       index: ruleParams.outputIndex,
       ruleId: ruleParams.ruleId!,
-      kibanaSiemAppUrl: ruleAlertParams.meta?.kibanaSiemAppUrl,
+      kibanaSiemAppUrl: ruleAlertParams.meta?.kibanaSiemAppUrl as string,
       ruleAlertId: ruleAlertSavedObject.id,
       callCluster: services.callCluster,
     });
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/schedule_notification_actions.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/schedule_notification_actions.ts
@@ -10,6 +10,7 @@ import { RuleTypeParams } from '../types';
 
 type NotificationRuleTypeParams = RuleTypeParams & {
   name: string;
+  id: string;
 };
 
 interface ScheduleNotificationActions {
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/update_notifications.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/notifications/update_notifications.test.ts
@@ -88,7 +88,7 @@ describe('updateNotifications', () => {
     const action = {
       group: 'default',
       id: '99403909-ca9b-49ba-9d7a-7e5320e68d05',
-      params: { message: 'Rule generated {{state.signalsCount}} signals' },
+      params: { message: 'Rule generated {{state.signals_count}} signals' },
       action_type_id: '.slack',
     };
     await updateNotifications({
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts
@@ -323,7 +323,7 @@ export const createRuleWithActionsRequest = () => {
         {
           group: 'default',
           id: '99403909-ca9b-49ba-9d7a-7e5320e68d05',
-          params: { message: 'Rule generated {{state.signalsCount}} signals' },
+          params: { message: 'Rule generated {{state.signals_count}} signals' },
           action_type_id: '.slack',
         },
       ],
@@ -656,7 +656,8 @@ export const getNotificationResult = (): RuleNotificationAlertType => ({
     {
       actionTypeId: '.slack',
       params: {
-        message: 'Rule generated {{state.signalsCount}} signals\n\n{{rule.name}}\n{{resultsLink}}',
+        message:
+          'Rule generated {{state.signals_count}} signals\n\n{{context.rule.name}}\n{{{context.results_link}}}',
       },
       group: 'default',
       id: '99403909-ca9b-49ba-9d7a-7e5320e68d05',
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/signal_rule_alert_type.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/signal_rule_alert_type.ts
@@ -214,13 +214,14 @@ export const signalRulesAlertType = ({
             const notificationRuleParams = {
               ...ruleParams,
               name,
+              id: savedObject.id,
             };
             const { signalsCount, resultsLink } = await getSignalsCount({
               from: `now-${interval}`,
               to: 'now',
               index: ruleParams.outputIndex,
               ruleId: ruleParams.ruleId!,
-              kibanaSiemAppUrl: meta.kibanaSiemAppUrl,
+              kibanaSiemAppUrl: meta.kibanaSiemAppUrl as string,
               ruleAlertId: savedObject.id,
               callCluster: services.callCluster,
             });
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
@@ -70,9 +70,6 @@ export type RuleTypeParams = Omit<
   'name' | 'enabled' | 'interval' | 'tags' | 'actions' | 'throttle'
 >;
 
-export type RuleTypeParamsWithName = RuleTypeParams & {
-  name: string;
-};
 export type RuleAlertParamsRest = Omit<
   RuleAlertParams,
   | 'anomalyThreshold'

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ interface GetSignalsCount {`
`21`	`21`	`ruleAlertId: string;`
`22`	`22`	`ruleId: string;`
`23`	`23`	`index: string;`
`24`		`- kibanaSiemAppUrl: string \| {} \| undefined;`
	`24`	`+ kibanaSiemAppUrl: string \| undefined;`
`25`	`25`	`callCluster: NotificationExecutorOptions['services']['callCluster'];`
`26`	`26`	`}`
`27`	`27`