[Alerting] Passing additional rule fields to rule executor

x-pack/plugins/alerting/server/task_runner/task_runner.test.ts

@@ -100,11 +100,13 @@ describe('Task Runner', () => {
     kibanaBaseUrl: 'https://localhost:5601',
   };
 
+  const mockDate = new Date('2019-02-12T21:01:22.479Z');
+
   const mockedAlertTypeSavedObject: Alert<AlertTypeParams> = {
     id: '1',
     consumer: 'bar',
-    createdAt: new Date('2019-02-12T21:01:22.479Z'),
-    updatedAt: new Date('2019-02-12T21:01:22.479Z'),
+    createdAt: mockDate,
+    updatedAt: mockDate,
     throttle: null,
     muteAll: false,
     notifyWhen: 'onActiveAlert',
@@ -205,6 +207,37 @@ describe('Task Runner', () => {
     expect(call.tags).toEqual(['alert-', '-tags']);
     expect(call.createdBy).toBe('alert-creator');
     expect(call.updatedBy).toBe('alert-updater');
+    expect(call.consumer).toBe('bar');
+    expect(call.schedule).toMatchInlineSnapshot(`
+    Object {
+      "interval": "10s",
+    }
+    `);
+    expect(call.createdAt).toBe(mockDate);
+    expect(call.updatedAt).toBe(mockDate);
+    expect(call.notifyWhen).toBe('onActiveAlert');
+    expect(call.throttle).toBe(null);
+    expect(call.enabled).toBe(true);
+    expect(call.actions).toMatchInlineSnapshot(`
+    Array [
+      Object {
+        "actionTypeId": "action",
+        "group": "default",
+        "id": "1",
+        "params": Object {
+          "foo": true,
+        },
+      },
+      Object {
+        "actionTypeId": "action",
+        "group": "recovered",
+        "id": "2",
+        "params": Object {
+          "isResolved": true,
+        },
+      },
+    ]
+    `);
     expect(call.services.alertInstanceFactory).toBeTruthy();
     expect(call.services.scopedClusterClient).toBeTruthy();
     expect(call.services).toBeTruthy();

x-pack/plugins/alerting/server/task_runner/task_runner.ts

@@ -215,6 +215,8 @@ export class TaskRunner<
     event: Event
   ): Promise<AlertTaskState> {
     const {
+      consumer,
+      schedule,
       throttle,
       notifyWhen,
       muteAll,
@@ -223,6 +225,10 @@ export class TaskRunner<
       tags,
       createdBy,
       updatedBy,
+      createdAt,
+      updatedAt,
+      enabled,
+      actions,
     } = alert;
     const {
       params: { alertId },
@@ -265,6 +271,14 @@ export class TaskRunner<
         tags,
         createdBy,
         updatedBy,
+        consumer,
+        schedule,
+        createdAt,
+        updatedAt,
+        throttle,
+        notifyWhen,
+        enabled,
+        actions,
       });
     } catch (err) {
       event.message = `alert execution failure: ${alertLabel}`;

x-pack/plugins/alerting/server/types.ts

@@ -32,6 +32,8 @@ import {
   AlertNotifyWhenType,
   WithoutReservedActionGroups,
   ActionVariable,
+  IntervalSchedule,
+  AlertAction,
 } from '../common';
 import { LicenseType } from '../../licensing/server';
 
@@ -91,10 +93,18 @@ export interface AlertExecutorOptions<
   state: State;
   spaceId: string;
   namespace?: string;
+  consumer: string;
   name: string;
   tags: string[];
   createdBy: string | null;
   updatedBy: string | null;
+  createdAt: Date;
+  updatedAt: Date;
+  throttle: string | null;
+  notifyWhen: AlertNotifyWhenType | null;
+  schedule: IntervalSchedule;
+  enabled: boolean;
+  actions: AlertAction[];
 }
 
 export type ExecutorType<

x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.test.ts

@@ -37,6 +37,16 @@ const mockOptions = {
   tags: [],
   createdBy: null,
   updatedBy: null,
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  consumer: '',
+  throttle: null,
+  notifyWhen: null,
+  schedule: {
+    interval: '1h',
+  },
+  enabled: true,
+  actions: [],
 };
 
 describe('The metric threshold alert type', () => {

x-pack/plugins/security_solution/server/lib/detection_engine/notifications/rules_notification_alert_type.test.ts

@@ -44,6 +44,16 @@ describe('rules_notification_alert_type', () => {
       previousStartedAt: new Date('2019-12-13T16:40:33.400Z'),
       createdBy: 'elastic',
       updatedBy: 'elastic',
+      createdAt: new Date('2019-12-14T16:40:33.400Z'),
+      updatedAt: new Date('2019-12-14T16:40:33.400Z'),
+      consumer: 'foo',
+      throttle: null,
+      notifyWhen: null,
+      schedule: {
+        interval: '1h',
+      },
+      enabled: true,
+      actions: [],
     };
 
     alert = rulesNotificationAlertType({

x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.test.ts

@@ -66,6 +66,16 @@ const getPayload = (
   previousStartedAt: new Date('2019-12-13T16:40:33.400Z'),
   createdBy: 'elastic',
   updatedBy: 'elastic',
+  createdAt: new Date('2019-12-13T16:50:33.400Z'),
+  updatedAt: new Date('2019-12-13T16:50:33.400Z'),
+  consumer: 'foo',
+  throttle: null,
+  notifyWhen: null,
+  schedule: {
+    interval: '1h',
+  },
+  enabled: true,
+  actions: [],
 });
 
 describe('signal_rule_alert_type', () => {

x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type.test.ts

@@ -157,6 +157,16 @@ describe('alertType', () => {
       tags: [],
       createdBy: null,
       updatedBy: null,
+      createdAt: new Date(),
+      updatedAt: new Date(),
+      consumer: '',
+      throttle: null,
+      notifyWhen: null,
+      schedule: {
+        interval: '1h',
+      },
+      enabled: true,
+      actions: [],
     });
 
     expect(alertServices.alertInstanceFactory).not.toHaveBeenCalled();
@@ -217,6 +227,16 @@ describe('alertType', () => {
       tags: [],
       createdBy: null,
       updatedBy: null,
+      createdAt: new Date(),
+      updatedAt: new Date(),
+      consumer: '',
+      throttle: null,
+      notifyWhen: null,
+      schedule: {
+        interval: '1h',
+      },
+      enabled: true,
+      actions: [],
     });
 
     expect(alertServices.alertInstanceFactory).toHaveBeenCalledWith(ConditionMetAlertInstanceId);
@@ -274,6 +294,14 @@ describe('alertType', () => {
       tags: [],
       createdBy: null,
       updatedBy: null,
+      createdAt: new Date(),
+      updatedAt: new Date(),
+      consumer: '',
+      throttle: null,
+      notifyWhen: null,
+      schedule: {
+        interval: '1h',
+      },
     };
     const result = await alertType.executor({
       ...executorOptions,
@@ -344,6 +372,16 @@ describe('alertType', () => {
       tags: [],
       createdBy: null,
       updatedBy: null,
+      createdAt: new Date(),
+      updatedAt: new Date(),
+      consumer: '',
+      throttle: null,
+      notifyWhen: null,
+      schedule: {
+        interval: '1h',
+      },
+      enabled: true,
+      actions: [],
     });
 
     const instance: AlertInstanceMock = alertServices.alertInstanceFactory.mock.results[0].value;
@@ -402,6 +440,16 @@ describe('alertType', () => {
       tags: [],
       createdBy: null,
       updatedBy: null,
+      createdAt: new Date(),
+      updatedAt: new Date(),
+      consumer: '',
+      throttle: null,
+      notifyWhen: null,
+      schedule: {
+        interval: '1h',
+      },
+      enabled: true,
+      actions: [],
     };
     const result = await alertType.executor(executorOptions);
 
@@ -498,6 +546,16 @@ describe('alertType', () => {
       tags: [],
       createdBy: null,
       updatedBy: null,
+      createdAt: new Date(),
+      updatedAt: new Date(),
+      consumer: '',
+      throttle: null,
+      notifyWhen: null,
+      schedule: {
+        interval: '1h',
+      },
+      enabled: true,
+      actions: [],
     });
 
     const instance: AlertInstanceMock = alertServices.alertInstanceFactory.mock.results[0].value;
@@ -563,6 +621,16 @@ describe('alertType', () => {
       tags: [],
       createdBy: null,
       updatedBy: null,
+      createdAt: new Date(),
+      updatedAt: new Date(),
+      consumer: '',
+      throttle: null,
+      notifyWhen: null,
+      schedule: {
+        interval: '1h',
+      },
+      enabled: true,
+      actions: [],
     });
 
     const instance: AlertInstanceMock = alertServices.alertInstanceFactory.mock.results[0].value;