Fixed merge issue

elastic · Nov 10, 2020 · 8f48a39 · 8f48a39
1 parent 378fa7c
commit 8f48a39
Showing 1 changed file with 3 additions and 2 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
@@ -231,7 +231,7 @@ export class TaskRunner {
       alertInstances,
       executionHandler,
       originalAlertInstanceIds,
-      currentAlertInstanceIds
+      instancesWithScheduledActions
     );
 
     generateNewAndResolvedInstanceEvents({
@@ -464,8 +464,9 @@ function scheduleActionsForResolvedInstances(
   },
   executionHandler: ReturnType<typeof createExecutionHandler>,
   originalAlertInstanceIds: string[],
-  currentAlertInstanceIds: string[]
+  currentAlertInstances: Dictionary<AlertInstance>
 ) {
+  const currentAlertInstanceIds = Object.keys(currentAlertInstances);
   const resolvedIds = without(originalAlertInstanceIds, ...currentAlertInstanceIds);
   for (const id of resolvedIds) {
     alertInstancesMap[id].updateLastScheduledActions(ResolvedActionGroup.id);