sending core changes for review

Signed-off-by: Dennis Toepker <[email protected]>

Author: toepkerd-zz

core/build.gradle

@@ -8,7 +8,8 @@ apply plugin: 'opensearch.java-rest-test'
 apply plugin: 'org.jetbrains.kotlin.jvm'
 apply plugin: 'jacoco'
 
-configurations{
+configurations {
+    zipArchive
     all {
         resolutionStrategy {
             // force commons-beanutils to a non-vulnerable version
@@ -17,6 +18,18 @@ configurations{
     }
 }
 
+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}"
@@ -26,8 +39,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
+}

core/src/main/kotlin/org/opensearch/alerting/core/action/node/ScheduledJobStats.kt

@@ -7,7 +7,8 @@ package org.opensearch.alerting.core.action.node
 
 import org.opensearch.action.support.nodes.BaseNodeResponse
 import org.opensearch.alerting.core.JobSweeperMetrics
-import org.opensearch.alerting.core.resthandler.RestScheduledJobStatsHandler
+import org.opensearch.alerting.core.resthandler.StatsRequestUtils.JOBS_INFO
+import org.opensearch.alerting.core.resthandler.StatsRequestUtils.JOB_SCHEDULING_METRICS
 import org.opensearch.alerting.core.schedule.JobSchedulerMetrics
 import org.opensearch.cluster.node.DiscoveryNode
 import org.opensearch.core.common.io.stream.StreamInput
@@ -69,13 +70,13 @@ class ScheduledJobStats : BaseNodeResponse, ToXContentFragment {
         builder.field("schedule_status", status)
         builder.field("roles", node.roles.map { it.roleName().uppercase(Locale.getDefault()) })
         if (jobSweeperMetrics != null) {
-            builder.startObject(RestScheduledJobStatsHandler.JOB_SCHEDULING_METRICS)
+            builder.startObject(JOB_SCHEDULING_METRICS)
             jobSweeperMetrics!!.toXContent(builder, params)
             builder.endObject()
         }
 
         if (jobInfos != null) {
-            builder.startObject(RestScheduledJobStatsHandler.JOBS_INFO)
+            builder.startObject(JOBS_INFO)
             for (job in jobInfos!!) {
                 builder.startObject(job.scheduledJobId)
                 job.toXContent(builder, params)

core/src/main/kotlin/org/opensearch/alerting/core/action/node/ScheduledJobsStatsRequest.kt

@@ -17,18 +17,24 @@ import java.io.IOException
 class ScheduledJobsStatsRequest : BaseNodesRequest<ScheduledJobsStatsRequest> {
     var jobSchedulingMetrics: Boolean = true
     var jobsInfo: Boolean = true
+    var showAlertingV2ScheduledJobs: Boolean = false // show Alerting V2 scheduled jobs if true, Alerting V1 scheduled jobs if false
 
     constructor(si: StreamInput) : super(si) {
         jobSchedulingMetrics = si.readBoolean()
         jobsInfo = si.readBoolean()
+        showAlertingV2ScheduledJobs = si.readBoolean()
+    }
+
+    constructor(nodeIds: Array<String>, showAlertingV2ScheduledJobs: Boolean) : super(*nodeIds) {
+        this.showAlertingV2ScheduledJobs = showAlertingV2ScheduledJobs
     }
-    constructor(nodeIds: Array<String>) : super(*nodeIds)
 
     @Throws(IOException::class)
     override fun writeTo(out: StreamOutput) {
         super.writeTo(out)
         out.writeBoolean(jobSchedulingMetrics)
         out.writeBoolean(jobsInfo)
+        out.writeBoolean(showAlertingV2ScheduledJobs)
     }
 
     fun all(): ScheduledJobsStatsRequest {

core/src/main/kotlin/org/opensearch/alerting/core/action/node/ScheduledJobsStatsTransportAction.kt

@@ -93,7 +93,12 @@ class ScheduledJobsStatsTransportAction : TransportNodesAction<ScheduledJobsStat
         scheduledJobsStatusRequest: ScheduledJobsStatsRequest
     ): ScheduledJobStats {
         val jobSweeperMetrics = jobSweeper.getJobSweeperMetrics()
-        val jobSchedulerMetrics = jobScheduler.getJobSchedulerMetric()
+
+        val jobSchedulerMetrics = if (scheduledJobsStatusRequest.showAlertingV2ScheduledJobs) { // show V2 scheduled jobs
+            jobScheduler.getJobSchedulerV2Metric()
+        } else { // show V1 scheduled jobs
+            jobScheduler.getJobSchedulerMetric()
+        }
 
         val status: ScheduledJobStats.ScheduleStatus = evaluateStatus(jobSchedulerMetrics, jobSweeperMetrics)
         return ScheduledJobStats(