fix minor bug in remote monitor impl (opensearch-project#1587)

Signed-off-by: Subhobrata Dey <[email protected]>
sbcd90 · Jul 3, 2024 · 2ac1b89 · 2ac1b89
1 parent 4ef6e5e
commit 2ac1b89
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/...c/main/kotlin/org/opensearch/alerting/remote/monitors/RemoteDocumentLevelMonitorRunner.kt b/...c/main/kotlin/org/opensearch/alerting/remote/monitors/RemoteDocumentLevelMonitorRunner.kt
@@ -84,6 +84,7 @@ class RemoteDocumentLevelMonitorRunner : MonitorRunner() {
         for (ind in runContextKeys) {
             if (!allConcreteIndices.contains(ind)) {
                 updatedLastRunContext.remove(ind)
+                lastRunContext.remove(ind)
             }
         }
 
@@ -161,7 +162,7 @@ class RemoteDocumentLevelMonitorRunner : MonitorRunner() {
             val docLevelMonitorFanOutResponses = monitorCtx.remoteMonitors[monitor.monitorType]!!.monitorRunner.doFanOut(
                 monitorCtx.clusterService!!,
                 monitor,
-                monitorMetadata.copy(lastRunContext = updatedLastRunContext),
+                monitorMetadata.copy(lastRunContext = lastRunContext),
                 executionId,
                 concreteIndices,
                 workflowRunContext,

diff --git a/...le-remote-monitor-plugin/src/test/java/org/opensearch/alerting/SampleRemoteMonitorIT.java b/...le-remote-monitor-plugin/src/test/java/org/opensearch/alerting/SampleRemoteMonitorIT.java
@@ -260,6 +260,9 @@ public void testSampleRemoteDocLevelMonitorWithAlias() throws IOException, Inter
         makeRequest(client(), "POST", String.format(Locale.ROOT,  "%s/_rollover", indexAlias), Map.of(),
                 new StringEntity("", ContentType.APPLICATION_JSON));
 
+        response = makeRequest(client(), "POST", "/_plugins/_alerting/monitors/" + monitorId + "/_execute", Map.of(), null);
+        Assert.assertEquals("Unable to execute remote monitor", RestStatus.OK, RestStatus.fromCode(response.getStatusLine().getStatusCode()));
+
         response = makeRequest(client(), "POST", "/_plugins/_alerting/monitors/" + monitorId + "/_execute", Map.of(), null);
         Assert.assertEquals("Unable to execute remote monitor", RestStatus.OK, RestStatus.fromCode(response.getStatusLine().getStatusCode()));
         AtomicBoolean found = new AtomicBoolean(false);