changes to cleanup the pr

Signed-off-by: Subhobrata Dey <[email protected]>
sbcd90 · May 28, 2024 · 70f165f · 70f165f
1 parent 0181b85
commit 70f165f
Show file tree

Hide file tree

Showing 5 changed files with 77 additions and 5 deletions.
diff --git a/alerting/src/main/kotlin/org/opensearch/alerting/remote/monitors/RemoteMonitorRegistry.kt b/alerting/src/main/kotlin/org/opensearch/alerting/remote/monitors/RemoteMonitorRegistry.kt
@@ -7,4 +7,7 @@ package org.opensearch.alerting.remote.monitors
 
 import org.opensearch.alerting.spi.RemoteMonitorRunner
 
+/**
+ * Class to store monitorType to monitorRunner tuples.
+ */
 class RemoteMonitorRegistry(val monitorType: String, val monitorRunner: RemoteMonitorRunner)
diff --git a/alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportExecuteMonitorAction.kt b/alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportExecuteMonitorAction.kt
@@ -43,7 +43,7 @@ import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.tasks.Task
 import org.opensearch.transport.TransportService
 import java.time.Instant
-import java.util.*
+import java.util.Locale
 
 private val log = LogManager.getLogger(TransportExecuteMonitorAction::class.java)
 private val scope: CoroutineScope = CoroutineScope(Dispatchers.IO)

diff --git a/alerting/src/test/kotlin/org/opensearch/alerting/MonitorDataSourcesIT.kt b/alerting/src/test/kotlin/org/opensearch/alerting/MonitorDataSourcesIT.kt
@@ -34,11 +34,34 @@ import org.opensearch.common.settings.Settings
 import org.opensearch.common.xcontent.LoggingDeprecationHandler
 import org.opensearch.common.xcontent.XContentHelper
 import org.opensearch.common.xcontent.XContentType
-import org.opensearch.commons.alerting.action.*
+import org.opensearch.commons.alerting.action.AcknowledgeAlertRequest
+import org.opensearch.commons.alerting.action.AcknowledgeAlertResponse
+import org.opensearch.commons.alerting.action.AcknowledgeChainedAlertRequest
+import org.opensearch.commons.alerting.action.AlertingActions
+import org.opensearch.commons.alerting.action.DeleteMonitorRequest
+import org.opensearch.commons.alerting.action.GetAlertsRequest
+import org.opensearch.commons.alerting.action.GetAlertsResponse
+import org.opensearch.commons.alerting.action.IndexMonitorResponse
+import org.opensearch.commons.alerting.action.SearchMonitorRequest
 import org.opensearch.commons.alerting.aggregation.bucketselectorext.BucketSelectorExtAggregationBuilder
-import org.opensearch.commons.alerting.model.*
+import org.opensearch.commons.alerting.model.Alert
+import org.opensearch.commons.alerting.model.ChainedAlertTrigger
+import org.opensearch.commons.alerting.model.ChainedMonitorFindings
+import org.opensearch.commons.alerting.model.CompositeInput
+import org.opensearch.commons.alerting.model.DataSources
+import org.opensearch.commons.alerting.model.Delegate
+import org.opensearch.commons.alerting.model.DocLevelMonitorInput
+import org.opensearch.commons.alerting.model.DocLevelQuery
+import org.opensearch.commons.alerting.model.DocumentLevelTriggerRunResult
+import org.opensearch.commons.alerting.model.IntervalSchedule
+import org.opensearch.commons.alerting.model.Monitor
+import org.opensearch.commons.alerting.model.ScheduledJob
 import org.opensearch.commons.alerting.model.ScheduledJob.Companion.DOC_LEVEL_QUERIES_INDEX
 import org.opensearch.commons.alerting.model.ScheduledJob.Companion.SCHEDULED_JOBS_INDEX
+import org.opensearch.commons.alerting.model.SearchInput
+import org.opensearch.commons.alerting.model.Table
+import org.opensearch.commons.alerting.model.Workflow
+import org.opensearch.commons.alerting.model.WorkflowMetadata
 import org.opensearch.commons.alerting.util.AlertingException
 import org.opensearch.core.rest.RestStatus
 import org.opensearch.core.xcontent.XContentParser
@@ -58,8 +81,9 @@ import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
 import java.time.temporal.ChronoUnit
 import java.time.temporal.ChronoUnit.MILLIS
-import java.util.*
+import java.util.Collections
 import java.util.Map
+import java.util.UUID
 import java.util.concurrent.ExecutionException
 import java.util.concurrent.TimeUnit
 import java.util.stream.Collectors
@@ -1574,6 +1598,26 @@ class MonitorDataSourcesIT : AlertingSingleNodeTestCase() {
         """.trimIndent()
         val monitorId = "abc"
         indexDoc(SCHEDULED_JOBS_INDEX, monitorId, monitorStringWithoutName)
+
+        val monitorMetadata = """
+            {
+                    "metadata": {
+                        "monitor_id": "$monitorId",
+                        "last_action_execution_times": [],
+                        "last_run_context": {
+                            "$index": {
+                                "0": -1,
+                                "index": "$index",
+                                "shards_count": 1
+                            }
+                        },
+                        "source_to_query_index_mapping": {
+                            "$index$monitorId": ".opensearch-alerting-queries-000001"
+                        }
+                    }
+                }
+        """.trimIndent()
+        indexDoc(SCHEDULED_JOBS_INDEX, "$monitorId-metadata", monitorMetadata)
         val getMonitorResponse = getMonitorResponse(monitorId)
         Assert.assertNotNull(getMonitorResponse)
         Assert.assertNotNull(getMonitorResponse.monitor)
@@ -1690,6 +1734,26 @@ class MonitorDataSourcesIT : AlertingSingleNodeTestCase() {
         """.trimIndent()
         val monitorId = "abc"
         indexDoc(SCHEDULED_JOBS_INDEX, monitorId, monitorStringWithoutName)
+
+        val monitorMetadata = """
+            {
+                    "metadata": {
+                        "monitor_id": "$monitorId",
+                        "last_action_execution_times": [],
+                        "last_run_context": {
+                            "$index": {
+                                "0": -1,
+                                "index": "$index",
+                                "shards_count": 1
+                            }
+                        },
+                        "source_to_query_index_mapping": {
+                            "$index$monitorId": ".opensearch-alerting-queries-000001"
+                        }
+                    }
+                }
+        """.trimIndent()
+        indexDoc(SCHEDULED_JOBS_INDEX, "$monitorId-metadata", monitorMetadata)
         val getMonitorResponse = getMonitorResponse(monitorId)
         Assert.assertNotNull(getMonitorResponse)
         Assert.assertNotNull(getMonitorResponse.monitor)

diff --git a/alerting/src/test/resources/bwc/alerting/1.1.0.0/opensearch-alerting-1.1.0.0.zip b/alerting/src/test/resources/bwc/alerting/1.1.0.0/opensearch-alerting-1.1.0.0.zip
diff --git a/spi/src/main/kotlin/org/opensearch/alerting/spi/RemoteMonitorRunner.kt b/spi/src/main/kotlin/org/opensearch/alerting/spi/RemoteMonitorRunner.kt
@@ -19,7 +19,12 @@ import org.opensearch.core.common.breaker.CircuitBreakingException
 import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.index.shard.ShardId
 import org.opensearch.node.NodeClosedException
-import org.opensearch.transport.*
+import org.opensearch.transport.ActionNotFoundTransportException
+import org.opensearch.transport.ConnectTransportException
+import org.opensearch.transport.RemoteTransportException
+import org.opensearch.transport.TransportException
+import org.opensearch.transport.TransportRequestOptions
+import org.opensearch.transport.TransportService
 import java.time.Instant
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException