cleaning up build.gradle

Author: toepkerd-zz

alerting/build.gradle

@@ -21,24 +21,6 @@ import org.opensearch.gradle.test.RestIntegTestTask
 import org.opensearch.gradle.testclusters.OpenSearchCluster
 import org.opensearch.gradle.testclusters.StandaloneRestIntegTestTask
 
-buildscript {
-    ext {
-        opensearch_group = "org.opensearch"
-        opensearch_version = System.getProperty("opensearch.version", "3.1.0-SNAPSHOT")
-        isSnapshot = "true" == System.getProperty("build.snapshot", "true")
-        buildVersionQualifier = System.getProperty("build.version_qualifier", "")
-        kotlin_version = System.getProperty("kotlin.version", "1.9.25")
-        version_tokens = opensearch_version.tokenize('-')
-        opensearch_build = version_tokens[0] + '.0'
-        if (buildVersionQualifier) {
-            opensearch_build += "-${buildVersionQualifier}"
-        }
-        if (isSnapshot) {
-            opensearch_build += "-SNAPSHOT"
-        }
-    }
-}
-
 apply plugin: 'java'
 apply plugin: 'idea'
 apply plugin: 'org.jetbrains.kotlin.jvm'
@@ -99,7 +81,6 @@ publishing {
     }
 
     repositories {
-        mavenLocal()
         maven {
             name = "Snapshots"
             url = "https://aws.oss.sonatype.org/content/repositories/snapshots"
@@ -165,18 +146,6 @@ def bwcVersion = bwcVersionShort + ".0"
 def bwcOpenSearchVersion = bwcVersionShort + "-SNAPSHOT"
 def bwcPluginVersion = bwcVersion + "-SNAPSHOT"
 
-def sqlJarDirectory = "$buildDir/dependencies/opensearch-sql-plugin"
-
-task addJarsToClasspath(type: Copy) {
-    from(fileTree(dir: sqlJarDirectory)) {
-        include "opensearch-sql-${opensearch_build}.jar"
-        include "ppl-${opensearch_build}.jar"
-        include "protocol-${opensearch_build}.jar"
-        include "core-${opensearch_build}.jar"
-    }
-    into("$buildDir/classes")
-}
-
 dependencies {
     // Needed for integ tests
     zipArchive group: 'org.opensearch.plugin', name:'opensearch-notifications-core', version: "${opensearch_build}"
@@ -200,10 +169,8 @@ dependencies {
 
     // SQL/PPL plugin dependencies
     implementation 'org.json:json:20240303'
-//    implementation fileTree(dir: sqlJarDirectory, include: ["opensearch-sql-thin-${opensearch_build}.jar", "ppl-${opensearch_build}.jar", "protocol-${opensearch_build}.jar", "core-${opensearch_build}.jar"])
-//    zipArchive group: 'org.opensearch.plugin', name:'opensearch-sql-plugin', version: "${opensearch_build}"
-
     api project(":alerting-core")
+
     implementation "com.github.seancfoley:ipaddress:5.4.1"
     implementation project(path: ":alerting-spi", configuration: 'shadow')
 
@@ -216,29 +183,6 @@ dependencies {
     testImplementation "org.opensearch.plugin:lang-mustache-client:${opensearch_version}"
 }
 
-task extractSqlJar(type: Copy) {
-    mustRunAfter()
-    from(zipTree(configurations.zipArchive.find { it.name.startsWith("opensearch-sql-plugin") }))
-    into sqlJarDirectory
-}
-
-task extractSqlClass(type: Copy, dependsOn: [extractSqlJar]) {
-    from zipTree("${sqlJarDirectory}/opensearch-sql-${opensearch_build}.jar")
-    into("$buildDir/opensearch-sql")
-    include 'org/opensearch/sql/**'
-}
-
-task replaceSqlJar(type: Jar, dependsOn: [extractSqlClass]) {
-    from("$buildDir/opensearch-sql")
-    archiveFileName = "opensearch-sql-thin-${opensearch_build}.jar"
-    destinationDirectory = file(sqlJarDirectory)
-    doLast {
-        file("${sqlJarDirectory}/opensearch-sql-${opensearch_build}.jar").delete()
-    }
-}
-
-tasks.addJarsToClasspath.dependsOn(replaceSqlJar)
-
 javadoc.enabled = false // turn off javadoc as it barfs on Kotlin code
 licenseHeaders.enabled = true
 dependencyLicenses.enabled = false
@@ -570,6 +514,8 @@ task bwcTestSuite(type: StandaloneRestIntegTestTask) {
 
 run {
     doFirst {
+        dependsOn addJarsToClasspath
+
         // There seems to be an issue when running multi node run or integ tasks with unicast_hosts
         // not being written, the waitForAllConditions ensures it's written
         getClusters().forEach { cluster ->
@@ -714,11 +660,3 @@ def waitForClusterSetup(OpenSearchCluster cluster, Boolean securityEnabled) {
 }
 
 apply from: '../build-tools/pkgbuild.gradle'
-
-//compileJava {
-//    dependsOn addJarsToClasspath
-//}
-//
-//compileKotlin {
-//    dependsOn addJarsToClasspath
-//}

alerting/src/main/resources/org/opensearch/alerting/alertsv2/alert_v2_mapping.json

@@ -0,0 +1,114 @@
+{
+  "dynamic": "strict",
+  "_routing": {
+    "required": true
+  },
+  "_meta" : {
+    "schema_version": 5
+  },
+  "properties": {
+    "schema_version": {
+      "type": "integer"
+    },
+    "monitor_id": {
+      "type": "keyword"
+    },
+    "monitor_version": {
+      "type": "long"
+    },
+    "id": {
+      "type": "keyword"
+    },
+    "version": {
+      "type": "long"
+    },
+    "severity": {
+      "type": "keyword"
+    },
+    "monitor_name": {
+      "type": "text",
+      "fields": {
+        "keyword": {
+          "type": "keyword",
+          "ignore_above": 256
+        }
+      }
+    },
+    "monitor_user": {
+      "properties": {
+        "name": {
+          "type": "text",
+          "fields": {
+            "keyword": {
+              "type": "keyword",
+              "ignore_above": 256
+            }
+          }
+        },
+        "backend_roles": {
+          "type" : "text",
+          "fields" : {
+            "keyword" : {
+              "type" : "keyword"
+            }
+          }
+        },
+        "roles": {
+          "type" : "text",
+          "fields" : {
+            "keyword" : {
+              "type" : "keyword"
+            }
+          }
+        },
+        "custom_attribute_names": {
+          "type" : "text",
+          "fields" : {
+            "keyword" : {
+              "type" : "keyword"
+            }
+          }
+        }
+      }
+    },
+    "execution_id": {
+      "type": "keyword"
+    },
+    "trigger_id": {
+      "type": "keyword"
+    },
+    "trigger_name": {
+      "type": "text",
+      "fields": {
+        "keyword": {
+          "type": "keyword",
+          "ignore_above": 256
+        }
+      }
+    },
+    "triggered_time": {
+      "type": "date"
+    },
+    "expiration_time": {
+      "type": "date"
+    },
+    "error_message": {
+      "type": "text"
+    },
+    "query_results": {
+      "type": "nested",
+      "properties": {
+        "schema": {
+          "type": "nested",
+          "dynamic": true
+        },
+        "datarows": {
+          "type": "text"
+        },
+        "total": {
+          "type": "integer"
+        }
+      }
+    }
+  }
+}