temp: upload custom built common utils jar

Signed-off-by: Surya Sashank Nistala <[email protected]>
opensearch-project · Jul 9, 2023 · db21ba2 · db21ba2
1 parent 51d3a73
commit db21ba2
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/alerting/src/main/kotlin/org/opensearch/alerting/workflow/CompositeWorkflowRunner.kt b/alerting/src/main/kotlin/org/opensearch/alerting/workflow/CompositeWorkflowRunner.kt
@@ -116,7 +116,7 @@ object CompositeWorkflowRunner : WorkflowRunner() {
                 chainedMonitorId = delegate.chainedMonitorFindings?.monitorId,
                 executionId = executionId,
                 matchingDocIdsPerIndex = indexToDocIds,
-                auditDelegateMonitorAlerts = workflow.auditDelegateMonitorAlerts ?: true
+                auditDelegateMonitorAlerts = if (workflow.auditDelegateMonitorAlerts == null) true else workflow.auditDelegateMonitorAlerts!!
             )
             try {
                 dataSources = delegateMonitor.dataSources

diff --git a/alerting/src/test/kotlin/org/opensearch/alerting/MonitorDataSourcesIT.kt b/alerting/src/test/kotlin/org/opensearch/alerting/MonitorDataSourcesIT.kt
@@ -2455,7 +2455,8 @@ class MonitorDataSourcesIT : AlertingSingleNodeTestCase() {
                 bucketLevelMonitorResponse.id,
                 docLevelMonitorResponse1.id,
                 queryMonitorResponse.id
-            )
+            ),
+            auditDelegateMonitorAlerts = false
         )
         val workflowResponse = upsertWorkflow(workflow)!!
         val workflowById = searchWorkflow(workflowResponse.id)
@@ -2636,7 +2637,7 @@ class MonitorDataSourcesIT : AlertingSingleNodeTestCase() {
         val monitorResponse2 = createMonitor(monitor2)!!
 
         var workflow = randomWorkflow(
-            monitorIds = listOf(monitorResponse.id, monitorResponse2.id)
+            monitorIds = listOf(monitorResponse.id, monitorResponse2.id), auditDelegateMonitorAlerts = false
         )
         val workflowResponse = upsertWorkflow(workflow)!!
         val workflowById = searchWorkflow(workflowResponse.id)
@@ -2711,14 +2712,16 @@ class MonitorDataSourcesIT : AlertingSingleNodeTestCase() {
         val monitorResponse = createMonitor(monitor)!!
 
         var workflow = randomWorkflow(
-            monitorIds = listOf(monitorResponse.id)
+            monitorIds = listOf(monitorResponse.id),
+            auditDelegateMonitorAlerts = false
         )
         val workflowResponse = upsertWorkflow(workflow)!!
         val workflowById = searchWorkflow(workflowResponse.id)
         assertNotNull(workflowById)
 
         var workflow1 = randomWorkflow(
-            monitorIds = listOf(monitorResponse.id)
+            monitorIds = listOf(monitorResponse.id),
+            auditDelegateMonitorAlerts = false
         )
         val workflowResponse1 = upsertWorkflow(workflow1)!!
         val workflowById1 = searchWorkflow(workflowResponse1.id)
@@ -2813,7 +2816,7 @@ class MonitorDataSourcesIT : AlertingSingleNodeTestCase() {
         assertNotNull(workflowById)
 
         val workflow1 = randomWorkflow(
-            monitorIds = listOf(monitorResponse.id)
+            monitorIds = listOf(monitorResponse.id), auditDelegateMonitorAlerts = false
         )
         val workflowResponse1 = upsertWorkflow(workflow1)!!
         val workflowById1 = searchWorkflow(workflowResponse1.id)
@@ -3240,7 +3243,8 @@ class MonitorDataSourcesIT : AlertingSingleNodeTestCase() {
                 bucketLevelMonitorResponse.id,
                 docLevelMonitorResponse1.id,
                 queryMonitorResponse.id
-            )
+            ),
+            auditDelegateMonitorAlerts = false
         )
         val workflowResponse = upsertWorkflow(workflow)!!
         val workflowById = searchWorkflow(workflowResponse.id)
@@ -3377,7 +3381,7 @@ class MonitorDataSourcesIT : AlertingSingleNodeTestCase() {
 
         val monitorResponse = createMonitor(monitor)!!
         var workflow = randomWorkflow(
-            monitorIds = listOf(monitorResponse.id)
+            monitorIds = listOf(monitorResponse.id), auditDelegateMonitorAlerts = false
         )
         val workflowResponse = upsertWorkflow(workflow)!!
         val workflowById = searchWorkflow(workflowResponse.id)

diff --git a/alerting/src/test/kotlin/org/opensearch/alerting/TestHelpers.kt b/alerting/src/test/kotlin/org/opensearch/alerting/TestHelpers.kt
@@ -233,7 +233,8 @@ fun randomWorkflow(
     enabled: Boolean = randomBoolean(),
     enabledTime: Instant? = if (enabled) Instant.now().truncatedTo(ChronoUnit.MILLIS) else null,
     lastUpdateTime: Instant = Instant.now().truncatedTo(ChronoUnit.MILLIS),
-    triggers: List<Trigger> = emptyList()
+    triggers: List<Trigger> = emptyList(),
+    auditDelegateMonitorAlerts: Boolean? = true
 ): Workflow {
     val delegates = mutableListOf<Delegate>()
     if (!monitorIds.isNullOrEmpty()) {
@@ -257,6 +258,7 @@ fun randomWorkflow(
         version = -1L,
         schemaVersion = 0,
         triggers = triggers,
+        auditDelegateMonitorAlerts = auditDelegateMonitorAlerts
     )
 }
 

diff --git a/core/build.gradle b/core/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     implementation "com.cronutils:cron-utils:9.1.6"
     api "org.opensearch.client:opensearch-rest-client:${opensearch_version}"
     implementation 'com.google.googlejavaformat:google-java-format:1.10.0'
-    api files("/Users/snistala/Documents/opensearch/common-utils/build/libs/common-utils-3.0.0.0-SNAPSHOT.jar")
+    api files("libs/common-utils-3.0.0.0-SNAPSHOT.jar")
     implementation 'commons-validator:commons-validator:1.7'
 
     testImplementation "org.opensearch.test:framework:${opensearch_version}"

diff --git a/core/libs/common-utils-3.0.0.0-SNAPSHOT.jar b/core/libs/common-utils-3.0.0.0-SNAPSHOT.jar