Use custom query index in update monitor flow (#591) (#595)

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>
opensearch-project · Oct 10, 2022 · 56452c1 · 56452c1
1 parent 860d0b7
commit 56452c1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportIndexMonitorAction.kt b/alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportIndexMonitorAction.kt
@@ -541,7 +541,7 @@ class TransportIndexMonitorAction @Inject constructor(
                 if (currentMonitor.monitorType == Monitor.MonitorType.DOC_LEVEL_MONITOR) {
                     client.suspendUntil<Client, BulkByScrollResponse> {
                         DeleteByQueryRequestBuilder(client, DeleteByQueryAction.INSTANCE)
-                            .source(ScheduledJob.DOC_LEVEL_QUERIES_INDEX)
+                            .source(currentMonitor.dataSources.queryIndex)
                             .filter(QueryBuilders.matchQuery("monitor_id", currentMonitor.id))
                             .execute(it)
                     }

diff --git a/alerting/src/test/kotlin/org/opensearch/alerting/MonitorDataSourcesIT.kt b/alerting/src/test/kotlin/org/opensearch/alerting/MonitorDataSourcesIT.kt
@@ -302,6 +302,7 @@ class MonitorDataSourcesIT : AlertingSingleNodeTestCase() {
 
         val customAlertsIndex = "custom_alerts_index"
         val customQueryIndex = "custom_query_index"
+        Assert.assertFalse(client().admin().cluster().state(ClusterStateRequest()).get().state.routingTable.hasIndex(customQueryIndex))
         val customFindingsIndex = "custom_findings_index"
         val updateMonitorResponse = updateMonitor(
             monitor.copy(
@@ -316,9 +317,8 @@ class MonitorDataSourcesIT : AlertingSingleNodeTestCase() {
         )
         Assert.assertNotNull(updateMonitorResponse)
         indexDoc(index, "2", testDoc)
-        if (updateMonitorResponse != null) {
-            executeMonitorResponse = executeMonitor(updateMonitorResponse.monitor, monitorId, false)
-        }
+        executeMonitorResponse = executeMonitor(updateMonitorResponse!!.monitor, monitorId, false)
+        Assert.assertTrue(client().admin().cluster().state(ClusterStateRequest()).get().state.routingTable.hasIndex(customQueryIndex))
         val findings = searchFindings(monitorId, customFindingsIndex)
         assertEquals("Findings saved for test monitor", 1, findings.size)
         assertTrue("Findings saved for test monitor", findings[0].relatedDocIds.contains("2"))