From d9b4c46055cc35428c1255eefe5464a98f29fcf4 Mon Sep 17 00:00:00 2001 From: toepkerd <120457569+toepkerd@users.noreply.github.com> Date: Fri, 1 May 2026 13:21:35 -0700 Subject: [PATCH 1/2] =?UTF-8?q?small=20fix=20to=20keep=20alerting=20builds?= =?UTF-8?q?=20stable=20post=20ppl=20alerting=20common=20uti=E2=80=A6=20(#2?= =?UTF-8?q?111)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * small fix to keep alerting builds stable post ppl alerting common utils PR Signed-off-by: Dennis Toepker * including alerting version bump and other needed changes Signed-off-by: Dennis Toepker --------- Signed-off-by: Dennis Toepker Co-authored-by: Dennis Toepker --- .../alerting/resthandler/RestIndexMonitorAction.kt | 10 +++++++++- build.gradle | 5 ++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/alerting/src/main/kotlin/org/opensearch/alerting/resthandler/RestIndexMonitorAction.kt b/alerting/src/main/kotlin/org/opensearch/alerting/resthandler/RestIndexMonitorAction.kt index 5f753edd1..b903930f4 100644 --- a/alerting/src/main/kotlin/org/opensearch/alerting/resthandler/RestIndexMonitorAction.kt +++ b/alerting/src/main/kotlin/org/opensearch/alerting/resthandler/RestIndexMonitorAction.kt @@ -18,6 +18,7 @@ import org.opensearch.commons.alerting.model.BucketLevelTrigger import org.opensearch.commons.alerting.model.DocLevelMonitorInput import org.opensearch.commons.alerting.model.DocumentLevelTrigger import org.opensearch.commons.alerting.model.Monitor +import org.opensearch.commons.alerting.model.PPLTrigger import org.opensearch.commons.alerting.model.QueryLevelTrigger import org.opensearch.commons.alerting.model.ScheduledJob import org.opensearch.commons.alerting.util.AlertingException @@ -30,7 +31,6 @@ import org.opensearch.core.xcontent.XContentParser.Token import org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken import org.opensearch.index.seqno.SequenceNumbers import org.opensearch.rest.BaseRestHandler -import org.opensearch.rest.BaseRestHandler.RestChannelConsumer import org.opensearch.rest.BytesRestResponse import org.opensearch.rest.RestChannel import org.opensearch.rest.RestHandler.ReplacedRoute @@ -135,6 +135,14 @@ class RestIndexMonitorAction : BaseRestHandler() { } } } + + Monitor.MonitorType.PPL_MONITOR -> { + triggers.forEach { + if (it !is PPLTrigger) { + throw IllegalArgumentException("Illegal trigger type, ${it.javaClass.name}, for PPL monitor") + } + } + } } } } catch (e: Exception) { diff --git a/build.gradle b/build.gradle index ca13dade9..4432919d5 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { apply from: 'build-tools/repositories.gradle' ext { - opensearch_version = System.getProperty("opensearch.version", "3.5.0-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "3.5.1-SNAPSHOT") buildVersionQualifier = System.getProperty("build.version_qualifier", "") isSnapshot = "true" == System.getProperty("build.snapshot", "true") // 3.0.0-SNAPSHOT -> 3.0.0.0-SNAPSHOT @@ -125,6 +125,9 @@ allprojects { force "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlin_version}" force "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlin_version}" force "org.jetbrains.kotlin:kotlin-reflect:${kotlin_version}" + force "org.apache.logging.log4j:log4j-api:2.25.4" + force "org.apache.logging.log4j:log4j-core:2.25.4" + force "org.apache.httpcomponents.client5:httpclient5:5.6.1" } } From 427fb82dd1acd4fa2c2c1748374206fc01b2077c Mon Sep 17 00:00:00 2001 From: Dennis Toepker Date: Tue, 12 May 2026 12:12:01 -0700 Subject: [PATCH 2/2] temp commit: comment out forced resolutions Signed-off-by: Dennis Toepker --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 4432919d5..8790e3d7d 100644 --- a/build.gradle +++ b/build.gradle @@ -125,9 +125,9 @@ allprojects { force "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlin_version}" force "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlin_version}" force "org.jetbrains.kotlin:kotlin-reflect:${kotlin_version}" - force "org.apache.logging.log4j:log4j-api:2.25.4" - force "org.apache.logging.log4j:log4j-core:2.25.4" - force "org.apache.httpcomponents.client5:httpclient5:5.6.1" +// force "org.apache.logging.log4j:log4j-api:2.25.4" +// force "org.apache.logging.log4j:log4j-core:2.25.4" +// force "org.apache.httpcomponents.client5:httpclient5:5.6.1" } }