initial commit for remote monitor support #1547
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,6 @@ | |
| package org.opensearch.alerting | ||
|
|
||
| import org.opensearch.action.ActionRequest | ||
| import org.opensearch.alerting.action.ExecuteMonitorAction | ||
| import org.opensearch.alerting.action.ExecuteWorkflowAction | ||
| import org.opensearch.alerting.action.GetDestinationsAction | ||
|
|
@@ -25,6 +24,7 @@ import org.opensearch.alerting.core.resthandler.RestScheduledJobStatsHandler | |
| import org.opensearch.alerting.core.schedule.JobScheduler | ||
| import org.opensearch.alerting.core.settings.LegacyOpenDistroScheduledJobSettings | ||
| import org.opensearch.alerting.core.settings.ScheduledJobSettings | ||
| import org.opensearch.alerting.remote.monitors.RemoteMonitorRegistry | ||
| import org.opensearch.alerting.resthandler.RestAcknowledgeAlertAction | ||
| import org.opensearch.alerting.resthandler.RestAcknowledgeChainedAlertAction | ||
| import org.opensearch.alerting.resthandler.RestDeleteMonitorAction | ||
|
|
@@ -52,6 +52,7 @@ import org.opensearch.alerting.settings.AlertingSettings.Companion.DOC_LEVEL_MON | |
| import org.opensearch.alerting.settings.DestinationSettings | ||
| import org.opensearch.alerting.settings.LegacyOpenDistroAlertingSettings | ||
| import org.opensearch.alerting.settings.LegacyOpenDistroDestinationSettings | ||
| import org.opensearch.alerting.spi.RemoteMonitorRunnerExtension | ||
| import org.opensearch.alerting.transport.TransportAcknowledgeAlertAction | ||
| import org.opensearch.alerting.transport.TransportAcknowledgeChainedAlertAction | ||
| import org.opensearch.alerting.transport.TransportDeleteMonitorAction | ||
|
|
@@ -85,6 +86,7 @@ import org.opensearch.common.settings.Setting | |
| import org.opensearch.common.settings.Settings | ||
| import org.opensearch.common.settings.SettingsFilter | ||
| import org.opensearch.commons.alerting.action.AlertingActions | ||
| import org.opensearch.commons.alerting.action.DocLevelMonitorFanOutAction | ||
| import org.opensearch.commons.alerting.aggregation.bucketselectorext.BucketSelectorExtAggregationBuilder | ||
| import org.opensearch.commons.alerting.model.BucketLevelTrigger | ||
| import org.opensearch.commons.alerting.model.ChainedAlertTrigger | ||
|
|
@@ -96,6 +98,7 @@ import org.opensearch.commons.alerting.model.QueryLevelTrigger | |
| import org.opensearch.commons.alerting.model.ScheduledJob | ||
| import org.opensearch.commons.alerting.model.SearchInput | ||
| import org.opensearch.commons.alerting.model.Workflow | ||
| import org.opensearch.commons.alerting.model.remote.monitors.RemoteMonitorTrigger | ||
| import org.opensearch.core.action.ActionResponse | ||
| import org.opensearch.core.common.io.stream.NamedWriteableRegistry | ||
| import org.opensearch.core.common.io.stream.StreamInput | ||
|
|
@@ -110,6 +113,7 @@ import org.opensearch.painless.spi.AllowlistLoader | |
| import org.opensearch.painless.spi.PainlessExtension | ||
| import org.opensearch.percolator.PercolatorPluginExt | ||
| import org.opensearch.plugins.ActionPlugin | ||
| import org.opensearch.plugins.ExtensiblePlugin | ||
| import org.opensearch.plugins.ReloadablePlugin | ||
| import org.opensearch.plugins.ScriptPlugin | ||
| import org.opensearch.plugins.SearchPlugin | ||
|
|
@@ -162,6 +166,7 @@ internal class AlertingPlugin : PainlessExtension, ActionPlugin, ScriptPlugin, R | |
| lateinit var alertIndices: AlertIndices | ||
| lateinit var clusterService: ClusterService | ||
| lateinit var destinationMigrationCoordinator: DestinationMigrationCoordinator | ||
| var monitorTypeToMonitorRunners: MutableMap<String, RemoteMonitorRegistry> = mutableMapOf() | ||
|
|
||
| override fun getRestHandlers( | ||
| settings: Settings, | ||
|
|
@@ -236,6 +241,7 @@ internal class AlertingPlugin : PainlessExtension, ActionPlugin, ScriptPlugin, R | |
| ClusterMetricsInput.XCONTENT_REGISTRY, | ||
| DocumentLevelTrigger.XCONTENT_REGISTRY, | ||
| ChainedAlertTrigger.XCONTENT_REGISTRY, | ||
| RemoteMonitorTrigger.XCONTENT_REGISTRY, | ||
|
There was a problem hiding this comment. do we also need RemoteMonitorInput xcontent registry? if yes, can you add appropriate tests to serialize There was a problem hiding this comment. we dont need |
||
| Workflow.XCONTENT_REGISTRY | ||
| ) | ||
| } | ||
|
|
@@ -277,6 +283,7 @@ internal class AlertingPlugin : PainlessExtension, ActionPlugin, ScriptPlugin, R | |
| .registerLockService(lockService) | ||
| .registerConsumers() | ||
| .registerDestinationSettings() | ||
| .registerRemoteMonitors(monitorTypeToMonitorRunners) | ||
| scheduledJobIndices = ScheduledJobIndices(client.admin(), clusterService) | ||
| docLevelMonitorQueries = DocLevelMonitorQueries(client, clusterService) | ||
| scheduler = JobScheduler(threadPool, runner) | ||
|
|
@@ -409,4 +416,20 @@ internal class AlertingPlugin : PainlessExtension, ActionPlugin, ScriptPlugin, R | |
| ) | ||
| ) | ||
| } | ||
|
|
||
| override fun loadExtensions(loader: ExtensiblePlugin.ExtensionLoader) { | ||
| for (monitorExtension in loader.loadExtensions(RemoteMonitorRunnerExtension::class.java)) { | ||
| val monitorTypesToMonitorRunners = monitorExtension.getMonitorTypesToMonitorRunners() | ||
|
|
||
| for (monitorTypeToMonitorRunner in monitorTypesToMonitorRunners) { | ||
| val monitorType = monitorTypeToMonitorRunner.key | ||
| val monitorRunner = monitorTypeToMonitorRunner.value | ||
|
|
||
| if (!this.monitorTypeToMonitorRunners.containsKey(monitorType)) { | ||
| val monitorRegistry = RemoteMonitorRegistry(monitorType, monitorRunner) | ||
| this.monitorTypeToMonitorRunners[monitorType] = monitorRegistry | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is this the same dependency used by jobscheduler or notification for shadow plugin?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes.