Carry active status through alert cycles and apply to docs without updates

Aaron Caldwell · Aaron Caldwell · commit 617d71cc2bfe · 2020-12-08T17:44:32.000-07:00
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/geo_containment.ts b/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/geo_containment.ts
@@ -153,8 +153,12 @@ export const getGeoContainmentExecutor = (log: Logger) =>
       params.geoField
     );
 
-    // Cycle through new alert statuses and set active
-    currLocationMap.forEach(({ location, shapeLocationId, dateInShape, docId }, entityName) => {
+    // Combine newly active with previously active entries
+    const allActiveEntriesMap: Map<string, LatestEntityLocation> = new Map([
+      ...Object.entries(state.prevLocationMap || {}),
+      ...currLocationMap,
+    ]);
+    allActiveEntriesMap.forEach(({ location, shapeLocationId, dateInShape, docId }, entityName) => {
       const containingBoundaryName = shapesIdsNamesMap[shapeLocationId] || shapeLocationId;
       const context = {
         entityId: entityName,
@@ -166,13 +170,16 @@ export const getGeoContainmentExecutor = (log: Logger) =>
         containingBoundaryName,
       };
       const alertInstanceId = `${entityName}-${containingBoundaryName}`;
-      if (shapeLocationId !== OTHER_CATEGORY) {
+      if (shapeLocationId === OTHER_CATEGORY) {
+        allActiveEntriesMap.delete(entityName);
+      } else {
         services.alertInstanceFactory(alertInstanceId).scheduleActions(ActionGroupId, context);
       }
     });
 
     return {
       shapesFilters,
       shapesIdsNamesMap,
+      prevLocationMap: Object.fromEntries(allActiveEntriesMap),
     };
   };
