Skip to content

Monitor, Trigger, Alert Models and Dependencies #1933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
toepkerd wants to merge 1 commit into
base: 3.1
Choose a base branch
from
Open

Monitor, Trigger, Alert Models and Dependencies #1933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 67 additions & 0 deletions alerting/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,24 @@ 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'
Expand Down Expand Up @@ -81,6 +99,7 @@ publishing {
}

repositories {
mavenLocal()
maven {
name = "Snapshots"
url = "https://aws.oss.sonatype.org/content/repositories/snapshots"
Expand Down Expand Up @@ -146,6 +165,18 @@ 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}"
Expand All @@ -167,6 +198,11 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-common:${kotlin_version}"
implementation "org.jetbrains:annotations:13.0"

// 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')
Expand All @@ -180,6 +216,29 @@ 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
Expand Down Expand Up @@ -655,3 +714,11 @@ def waitForClusterSetup(OpenSearchCluster cluster, Boolean securityEnabled) {
}

apply from: '../build-tools/pkgbuild.gradle'

//compileJava {
// dependsOn addJarsToClasspath
//}
//
//compileKotlin {
// dependsOn addJarsToClasspath
//}
70 changes: 70 additions & 0 deletions core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,45 @@
* SPDX-License-Identifier: Apache-2.0
*/

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: 'opensearch.java-rest-test'
apply plugin: 'org.jetbrains.kotlin.jvm'
apply plugin: 'jacoco'

configurations {
zipArchive
}

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 {
compileOnly "org.opensearch:opensearch:${opensearch_version}"
implementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"
Expand All @@ -17,8 +51,44 @@ dependencies {
api "org.opensearch.client:opensearch-rest-client:${opensearch_version}"
api "org.opensearch:common-utils:${common_utils_version}@jar"
implementation 'commons-validator:commons-validator:1.7'
implementation 'org.json:json:20240303'

api 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}"

testImplementation "org.opensearch.test:framework:${opensearch_version}"
testImplementation "org.jetbrains.kotlin:kotlin-test:${kotlin_version}"
testImplementation "org.jetbrains.kotlin:kotlin-test-junit:${kotlin_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)

compileJava {
dependsOn addJarsToClasspath
}

compileKotlin {
dependsOn addJarsToClasspath
}
Loading
Loading