Remove notifications actions in reports scheduler (#221)

Signed-off-by: Joshua Li <joshuali925@gmail.com>
opensearch-project · Nov 8, 2021 · b941c82 · b941c82
1 parent b686df8
commit b941c82
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 235 deletions.
diff --git a/reports-scheduler/src/main/java/org/opensearch/reportsscheduler/metrics/Metrics.java b/reports-scheduler/src/main/java/org/opensearch/reportsscheduler/metrics/Metrics.java
@@ -156,11 +156,6 @@ public enum Metrics {
     REPORT_FROM_DEFINITION_ID_SYSTEM_ERROR("on_demand_from_definition.create.system_error", new RollingCounter()),
 
 
-    // Notifications: POST _plugins/_reports/on_demand/{reportDefinitionId} and scheduled jobs
-    REPORT_NOTIFICATIONS_TOTAL("report_notifications.send.total", new BasicCounter()),
-    REPORT_NOTIFICATIONS_ERROR("report_notifications.send.error", new RollingCounter()),
-
-
     REPORT_SECURITY_PERMISSION_ERROR("es_security_permission_error",  new RollingCounter()),
     REPORT_PERMISSION_USER_ERROR("permission_user_error",  new RollingCounter());
 

diff --git a/reports-scheduler/src/main/kotlin/org/opensearch/reportsscheduler/ReportsSchedulerPlugin.kt b/reports-scheduler/src/main/kotlin/org/opensearch/reportsscheduler/ReportsSchedulerPlugin.kt
@@ -26,7 +26,6 @@
  */
 package org.opensearch.reportsscheduler
 
-import org.opensearch.OpenSearchStatusException
 import org.opensearch.jobscheduler.spi.JobSchedulerExtension
 import org.opensearch.jobscheduler.spi.ScheduledJobParser
 import org.opensearch.jobscheduler.spi.ScheduledJobRunner
@@ -56,7 +55,6 @@ import org.opensearch.reportsscheduler.settings.PluginSettings
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.ActionResponse
 import org.opensearch.client.Client
-import org.opensearch.client.node.NodeClient
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver
 import org.opensearch.cluster.node.DiscoveryNodes
 import org.opensearch.cluster.service.ClusterService
@@ -71,11 +69,9 @@ import org.opensearch.env.Environment
 import org.opensearch.env.NodeEnvironment
 import org.opensearch.plugins.ActionPlugin
 import org.opensearch.plugins.Plugin
-import org.opensearch.reportsscheduler.notifications.NotificationsActions
 import org.opensearch.repositories.RepositoriesService
 import org.opensearch.rest.RestController
 import org.opensearch.rest.RestHandler
-import org.opensearch.rest.RestStatus
 import org.opensearch.script.ScriptService
 import org.opensearch.threadpool.ThreadPool
 import org.opensearch.watcher.ResourceWatcherService
@@ -122,12 +118,6 @@ class ReportsSchedulerPlugin : Plugin(), ActionPlugin, JobSchedulerExtension {
         PluginSettings.addSettingsUpdateConsumer(clusterService)
         ReportDefinitionsIndex.initialize(client, clusterService)
         ReportInstancesIndex.initialize(client, clusterService)
-        (client as? NodeClient)?.let { NotificationsActions.initialize(it) } ?: run {
-            throw OpenSearchStatusException(
-                "Unable to cast client to NodeClient for Notifications call",
-                RestStatus.INTERNAL_SERVER_ERROR
-            )
-        }
         return emptyList()
     }
 

diff --git a/...scheduler/src/main/kotlin/org/opensearch/reportsscheduler/notifications/MessageBuilder.kt b/...scheduler/src/main/kotlin/org/opensearch/reportsscheduler/notifications/MessageBuilder.kt
diff --git a/...ler/src/main/kotlin/org/opensearch/reportsscheduler/notifications/NotificationsActions.kt b/...ler/src/main/kotlin/org/opensearch/reportsscheduler/notifications/NotificationsActions.kt