Fixed tests and added skip for muted resolve

elastic · Nov 11, 2020 · 676d8f1 · 676d8f1
1 parent 8f48a39
commit 676d8f1
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 27 deletions.
diff --git a/x-pack/plugins/alerts/server/task_runner/task_runner.ts b/x-pack/plugins/alerts/server/task_runner/task_runner.ts
@@ -227,12 +227,15 @@ export class TaskRunner {
       alertInstance.hasScheduledActions()
     );
 
-    scheduleActionsForResolvedInstances(
-      alertInstances,
-      executionHandler,
-      originalAlertInstanceIds,
-      instancesWithScheduledActions
-    );
+    if (!alert.muteAll) {
+      scheduleActionsForResolvedInstances(
+        alertInstances,
+        executionHandler,
+        originalAlertInstanceIds,
+        instancesWithScheduledActions,
+        alert.mutedInstanceIds
+      );
+    }
 
     generateNewAndResolvedInstanceEvents({
       eventLogger,
@@ -464,20 +467,25 @@ function scheduleActionsForResolvedInstances(
   },
   executionHandler: ReturnType<typeof createExecutionHandler>,
   originalAlertInstanceIds: string[],
-  currentAlertInstances: Dictionary<AlertInstance>
+  currentAlertInstances: Dictionary<AlertInstance>,
+  mutedInstanceIds: string[]
 ) {
   const currentAlertInstanceIds = Object.keys(currentAlertInstances);
-  const resolvedIds = without(originalAlertInstanceIds, ...currentAlertInstanceIds);
+  const resolvedIds = without(
+    originalAlertInstanceIds,
+    ...[...currentAlertInstanceIds, ...mutedInstanceIds]
+  );
   for (const id of resolvedIds) {
-    alertInstancesMap[id].updateLastScheduledActions(ResolvedActionGroup.id);
-    alertInstancesMap[id].unscheduleActions();
+    const instance = alertInstancesMap[id];
+    instance.updateLastScheduledActions(ResolvedActionGroup.id);
+    instance.unscheduleActions();
     executionHandler({
       actionGroup: ResolvedActionGroup.id,
       context: {},
       state: {},
       alertInstanceId: id,
     });
-    alertInstancesMap[id].scheduleActions(ResolvedActionGroup.id);
+    instance.scheduleActions(ResolvedActionGroup.id);
   }
 }
 

diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/list_alert_types.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/list_alert_types.ts
@@ -15,7 +15,10 @@ export default function listAlertTypes({ getService }: FtrProviderContext) {
   const supertestWithoutAuth = getService('supertestWithoutAuth');
 
   const expectedNoOpType = {
-    actionGroups: [{ id: 'default', name: 'Default' }],
+    actionGroups: [
+      { id: 'default', name: 'Default' },
+      { id: 'resolved', name: 'Resolved' },
+    ],
     defaultActionGroupId: 'default',
     id: 'test.noop',
     name: 'Test: Noop',
@@ -28,7 +31,10 @@ export default function listAlertTypes({ getService }: FtrProviderContext) {
   };
 
   const expectedRestrictedNoOpType = {
-    actionGroups: [{ id: 'default', name: 'Default' }],
+    actionGroups: [
+      { id: 'default', name: 'Default' },
+      { id: 'resolved', name: 'Resolved' },
+    ],
     defaultActionGroupId: 'default',
     id: 'test.restricted-noop',
     name: 'Test: Restricted Noop',

diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/alerts_base.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/alerts_base.ts
@@ -150,7 +150,7 @@ instanceStateValue: true
         })
         .expect(200);
 
-      // pattern of when the alert should fire
+      // pattern of when the alert should fire.
       const pattern = {
         instance: [false, true, true],
       };
@@ -189,18 +189,6 @@ instanceStateValue: true
       const alertId = createdAlert.body.id;
       objectRemover.add(space.id, alertId, 'alert', 'alerts');
 
-      const instancesSummary = await supertestWithoutAuth.post(
-        `${getUrlPrefix(space.id)}/api/alerts/alert/${createdAlert.id}/_instance_summary`
-      );
-
-      expect(instancesSummary.status).to.eql(200);
-      expect(instancesSummary.body.instances).to.eql({
-        '1': {
-          status: 'OK',
-          muted: true,
-        },
-      });
-
       const actionTestRecord = (
         await esTestIndexTool.waitForDocs('action:test.index-record', reference)
       )[0];

diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/list_alert_types.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/list_alert_types.ts
@@ -23,7 +23,10 @@ export default function listAlertTypes({ getService }: FtrProviderContext) {
         (alertType: any) => alertType.id === 'test.noop'
       );
       expect(fixtureAlertType).to.eql({
-        actionGroups: [{ id: 'default', name: 'Default' }],
+        actionGroups: [
+          { id: 'default', name: 'Default' },
+          { id: 'resolved', name: 'Resolved' },
+        ],
         defaultActionGroupId: 'default',
         id: 'test.noop',
         name: 'Test: Noop',