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..8790e3d7d 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" } }