Skip to content
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.

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

[BACKPORT 2.x] remove job scheduler (#1560) #1563

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 0 additions & 27 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ buildscript {
}
common_utils_version = System.getProperty("common_utils.version", opensearch_build)
kotlin_version = System.getProperty("kotlin.version", "1.6.0")
job_scheduler_version = System.getProperty("job_scheduler.version", opensearch_build)
jackson_version = "2.14.1"
}

Expand Down Expand Up @@ -67,7 +66,6 @@ opensearchplugin {
name 'opensearch-observability'
description 'OpenSearch Plugin for OpenSearch Dashboards Observability'
classname "org.opensearch.observability.ObservabilityPlugin"
extendedPlugins = ['opensearch-job-scheduler']
}

publishing {
Expand Down Expand Up @@ -188,7 +186,6 @@ allprojects {
}

dependencies {
zipArchive group: 'org.opensearch.plugin', name:'opensearch-job-scheduler', version: "${opensearch_build}"
implementation "org.opensearch:opensearch:${opensearch_version}"
implementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"
implementation "org.jetbrains.kotlin:kotlin-stdlib-common:${kotlin_version}"
Expand All @@ -202,7 +199,6 @@ dependencies {
implementation group: 'com.github.wnameless.json', name: 'json-base', version: '2.2.1'
implementation "com.fasterxml.jackson.core:jackson-databind:${jackson_version}"
implementation "com.fasterxml.jackson.core:jackson-annotations:${jackson_version}"
compileOnly "${group}:opensearch-job-scheduler-spi:${job_scheduler_version}"
testImplementation(
'org.assertj:assertj-core:3.16.1',
'org.junit.jupiter:junit-jupiter-api:5.6.2'
Expand Down Expand Up @@ -317,18 +313,6 @@ integTest.getClusters().forEach { c -> c.plugin(project.getObjects().filePropert

testClusters.integTest {
testDistribution = "INTEG_TEST"
// need to install job-scheduler first, need to assemble job-scheduler first
plugin(provider(new Callable<RegularFile>(){
@Override
RegularFile call() throws Exception {
return new RegularFile() {
@Override
File getAsFile() {
return configurations.zipArchive.asFileTree.getSingleFile()
}
}
}
}))

// Cluster shrink exception thrown if we try to set numberOfNodes to 1, so only apply if > 1
if (_numNodes > 1) numberOfNodes = _numNodes
Expand Down Expand Up @@ -422,17 +406,6 @@ task prepareBwcTests {
dependsOn bundle
doLast {
plugins = [
provider(new Callable<RegularFile>(){
@Override
RegularFile call() throws Exception {
return new RegularFile() {
@Override
File getAsFile() {
return configurations.zipArchive.asFileTree.getSingleFile()
}
}
}
}),
project.getObjects().fileProperty().value(bundle.getArchiveFile())
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ import org.opensearch.common.settings.SettingsFilter
import org.opensearch.core.xcontent.NamedXContentRegistry
import org.opensearch.env.Environment
import org.opensearch.env.NodeEnvironment
import org.opensearch.jobscheduler.spi.JobSchedulerExtension
import org.opensearch.jobscheduler.spi.ScheduledJobParser
import org.opensearch.jobscheduler.spi.ScheduledJobRunner
import org.opensearch.observability.action.CreateObservabilityObjectAction
import org.opensearch.observability.action.DeleteObservabilityObjectAction
import org.opensearch.observability.action.GetObservabilityObjectAction
Expand All @@ -31,9 +28,6 @@ import org.opensearch.observability.index.ObservabilityMetricsIndex
import org.opensearch.observability.index.ObservabilityTracesIndex
import org.opensearch.observability.resthandler.ObservabilityRestHandler
import org.opensearch.observability.resthandler.ObservabilityStatsRestHandler
import org.opensearch.observability.resthandler.SchedulerRestHandler
import org.opensearch.observability.scheduler.ObservabilityJobParser
import org.opensearch.observability.scheduler.ObservabilityJobRunner
import org.opensearch.observability.settings.PluginSettings
import org.opensearch.plugins.ActionPlugin
import org.opensearch.plugins.ClusterPlugin
Expand All @@ -51,7 +45,7 @@ import java.util.function.Supplier
* This class initializes the rest handlers.
*/
@Suppress("TooManyFunctions")
class ObservabilityPlugin : Plugin(), ActionPlugin, ClusterPlugin, JobSchedulerExtension {
class ObservabilityPlugin : Plugin(), ActionPlugin, ClusterPlugin {

companion object {
const val PLUGIN_NAME = "opensearch-observability"
Expand Down Expand Up @@ -111,7 +105,6 @@ class ObservabilityPlugin : Plugin(), ActionPlugin, ClusterPlugin, JobSchedulerE
return listOf(
ObservabilityRestHandler(),
ObservabilityStatsRestHandler(),
SchedulerRestHandler() // TODO: tmp rest handler only for POC purpose
)
}

Expand All @@ -138,20 +131,4 @@ class ObservabilityPlugin : Plugin(), ActionPlugin, ClusterPlugin, JobSchedulerE
)
)
}

override fun getJobType(): String {
return "observability"
}

override fun getJobIndex(): String {
return SchedulerRestHandler.SCHEDULED_JOB_INDEX
}

override fun getJobRunner(): ScheduledJobRunner {
return ObservabilityJobRunner
}

override fun getJobParser(): ScheduledJobParser {
return ObservabilityJobParser
}
}
4 changes: 0 additions & 4 deletions src/main/kotlin/org/opensearch/observability/model/RestTag.kt
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@ internal object RestTag {
const val OPERATIONAL_PANEL_FIELD = "operationalPanel"
const val APPLICATION_FIELD = "application"
const val TIMESTAMP_FIELD = "timestamp"
const val SCHEDULE_INFO_TAG = "schedule"
const val SCHEDULED_JOB_TYPE_TAG = "jobType"
const val ID_FIELD = "id"
const val IS_ENABLED_TAG = "isEnabled"
private val INCLUDE_ID = Pair(OBJECT_ID_FIELD, "true")
private val EXCLUDE_ACCESS = Pair(ACCESS_LIST_FIELD, "false")
val REST_OUTPUT_PARAMS: Params = ToXContent.MapParams(mapOf(INCLUDE_ID))
Expand Down
171 changes: 0 additions & 171 deletions src/main/kotlin/org/opensearch/observability/model/ScheduledJobDoc.kt

This file was deleted.

Loading
Loading