Merge conflicts

Signed-off-by: Megha Goyal <[email protected]>
goyamegh · Mar 15, 2024 · 40a1c4b · 40a1c4b
1 parent 65c5f51
commit 40a1c4b
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 35 deletions.
diff --git a/alerting/src/main/kotlin/org/opensearch/alerting/DocumentLevelMonitorRunner.kt b/alerting/src/main/kotlin/org/opensearch/alerting/DocumentLevelMonitorRunner.kt
@@ -140,32 +140,29 @@ object DocumentLevelMonitorRunner : MonitorRunner() {
                 }
             }
 
-            indices.forEach { indexName ->
-                // Prepare lastRunContext for each index
-                val indexLastRunContext = lastRunContext.getOrPut(indexName) {
-                    val isIndexCreatedRecently = createdRecently(
-                        monitor,
-                        periodStart,
-                        periodEnd,
-                        monitorCtx.clusterService!!.state().metadata.index(indexName)
-                    )
-                    val updatedIndexName = indexName.replace("*", "_")
-                    val conflictingFields = monitorCtx.docLevelMonitorQueries!!.getAllConflictingFields(
-                        monitorCtx.clusterService!!.state(),
-                        concreteIndices
-                    )
+            docLevelMonitorInput.indices.forEach { indexName ->
+                val concreteIndices = IndexUtils.resolveAllIndices(
+                    listOf(indexName),
+                    monitorCtx.clusterService!!,
+                    monitorCtx.indexNameExpressionResolver!!
+                )
+                val updatedIndexName = indexName.replace("*", "_")
+                val conflictingFields = monitorCtx.docLevelMonitorQueries!!.getAllConflictingFields(
+                    monitorCtx.clusterService!!.state(),
+                    concreteIndices
+                )
 
-                    concreteIndices.forEach { concreteIndexName ->
-                        // Prepare lastRunContext for each index
-                        val indexLastRunContext = lastRunContext.getOrPut(concreteIndexName) {
-                            val isIndexCreatedRecently = createdRecently(
-                                monitor,
-                                periodStart,
-                                periodEnd,
-                                monitorCtx.clusterService!!.state().metadata.index(concreteIndexName)
-                            )
-                            MonitorMetadataService.createRunContextForIndex(concreteIndexName, isIndexCreatedRecently)
-                        }
+                concreteIndices.forEach { concreteIndexName ->
+                    // Prepare lastRunContext for each index
+                    val indexLastRunContext = lastRunContext.getOrPut(concreteIndexName) {
+                        val isIndexCreatedRecently = createdRecently(
+                            monitor,
+                            periodStart,
+                            periodEnd,
+                            monitorCtx.clusterService!!.state().metadata.index(concreteIndexName)
+                        )
+                        MonitorMetadataService.createRunContextForIndex(concreteIndexName, isIndexCreatedRecently)
+                    }
 
                     // Prepare updatedLastRunContext for each index
                     val indexUpdatedRunContext = updateLastRunContext(
@@ -189,15 +186,14 @@ object DocumentLevelMonitorRunner : MonitorRunner() {
                     // Prepare DocumentExecutionContext for each index
                     val docExecutionContext = DocumentExecutionContext(queries, indexLastRunContext, indexUpdatedRunContext)
 
-                val matchingDocs = getMatchingDocs(
-                    monitor,
-                    monitorCtx,
-                    docExecutionContext,
-                    indexName,
-                    updatedIndexName,
-                    concreteIndexName,
-                    conflictingFields.toList()
-                )
+                    val matchingDocs = getMatchingDocs(
+                        monitor,
+                        monitorCtx,
+                        docExecutionContext,
+                        updatedIndexName,
+                        concreteIndexName,
+                        conflictingFields.toList()
+                    )
 
                     if (matchingDocs.isNotEmpty()) {
                         val matchedQueriesForDocs = getMatchedQueries(

diff --git a/alerting/src/test/kotlin/org/opensearch/alerting/DocumentMonitorRunnerIT.kt b/alerting/src/test/kotlin/org/opensearch/alerting/DocumentMonitorRunnerIT.kt
@@ -21,7 +21,7 @@ import org.opensearch.commons.alerting.model.action.ActionExecutionPolicy
 import org.opensearch.commons.alerting.model.action.AlertCategory
 import org.opensearch.commons.alerting.model.action.PerAlertActionScope
 import org.opensearch.commons.alerting.model.action.PerExecutionActionScope
-import org.opensearch.core.rest.RestStatus
+import org.opensearch.rest.RestStatus
 import org.opensearch.script.Script
 import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter