diff --git a/src/main/java/org/opensearch/ad/transport/ADCancelTaskTransportAction.java b/src/main/java/org/opensearch/ad/transport/ADCancelTaskTransportAction.java index 699a3ab64..e0421c175 100644 --- a/src/main/java/org/opensearch/ad/transport/ADCancelTaskTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/ADCancelTaskTransportAction.java @@ -26,7 +26,6 @@ import org.opensearch.ad.task.ADTaskCancellationState; import org.opensearch.ad.task.ADTaskManager; import org.opensearch.cluster.ClusterName; -import org.opensearch.common.settings.Settings; import org.opensearch.sdk.ExtensionsRunner; import org.opensearch.sdk.SDKClusterService; import org.opensearch.tasks.Task; @@ -38,7 +37,7 @@ public class ADCancelTaskTransportAction extends TransportAction responses, List failures ) { - return new ADCancelTaskResponse(new ClusterName(settings.get("cluster.name")), responses, failures); + return new ADCancelTaskResponse( + new ClusterName(extensionsRunner.getEnvironmentSettings().get("cluster.name")), + responses, + failures + ); } @Override diff --git a/src/main/java/org/opensearch/ad/transport/ADStatsNodesTransportAction.java b/src/main/java/org/opensearch/ad/transport/ADStatsNodesTransportAction.java index 1673f47ce..b3238870a 100644 --- a/src/main/java/org/opensearch/ad/transport/ADStatsNodesTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/ADStatsNodesTransportAction.java @@ -27,7 +27,6 @@ import org.opensearch.ad.task.ADTaskManager; import org.opensearch.cluster.ClusterName; import org.opensearch.common.io.stream.StreamInput; -import org.opensearch.common.settings.Settings; import org.opensearch.monitor.jvm.JvmService; import org.opensearch.sdk.ExtensionsRunner; import org.opensearch.sdk.SDKClusterService; @@ -48,7 +47,7 @@ public class ADStatsNodesTransportAction extends TransportAction responses, List failures ) { - return new ADStatsNodesResponse(new ClusterName(settings.get("cluster.name")), responses, failures); + return new ADStatsNodesResponse( + new ClusterName(extensionsRunner.getEnvironmentSettings().get("cluster.name")), + responses, + failures + ); } protected ADStatsNodeRequest newNodeRequest(ADStatsRequest request) { diff --git a/src/main/java/org/opensearch/ad/transport/ADTaskProfileTransportAction.java b/src/main/java/org/opensearch/ad/transport/ADTaskProfileTransportAction.java index 51f6c24ce..bcf37c2c5 100644 --- a/src/main/java/org/opensearch/ad/transport/ADTaskProfileTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/ADTaskProfileTransportAction.java @@ -24,7 +24,6 @@ import org.opensearch.ad.task.ADTaskManager; import org.opensearch.cluster.ClusterName; import org.opensearch.common.io.stream.StreamInput; -import org.opensearch.common.settings.Settings; import org.opensearch.sdk.ExtensionsRunner; import org.opensearch.sdk.SDKClusterService; import org.opensearch.tasks.Task; @@ -44,7 +43,7 @@ public class ADTaskProfileTransportAction extends TransportAction responses, List failures ) { - return new ADTaskProfileResponse(new ClusterName(settings.get("cluster.name")), responses, failures); + return new ADTaskProfileResponse( + new ClusterName(extensionsRunner.getEnvironmentSettings().get("cluster.name")), + responses, + failures + ); } protected ADTaskProfileNodeRequest newNodeRequest(ADTaskProfileRequest request) { diff --git a/src/main/java/org/opensearch/ad/transport/DeleteModelTransportAction.java b/src/main/java/org/opensearch/ad/transport/DeleteModelTransportAction.java index dcfa95540..f217c8fe9 100644 --- a/src/main/java/org/opensearch/ad/transport/DeleteModelTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/DeleteModelTransportAction.java @@ -27,7 +27,6 @@ import org.opensearch.ad.ml.ModelManager; import org.opensearch.ad.task.ADTaskCacheManager; import org.opensearch.cluster.ClusterName; -import org.opensearch.common.settings.Settings; import org.opensearch.sdk.ExtensionsRunner; import org.opensearch.sdk.SDKClusterService; import org.opensearch.tasks.Task; @@ -45,7 +44,7 @@ public class DeleteModelTransportAction extends TransportAction responses, List failures ) { - return new DeleteModelResponse(new ClusterName(settings.get("cluster.name")), responses, failures); + return new DeleteModelResponse(new ClusterName(extensionsRunner.getEnvironmentSettings().get("cluster.name")), responses, failures); } } diff --git a/src/main/java/org/opensearch/ad/transport/ProfileTransportAction.java b/src/main/java/org/opensearch/ad/transport/ProfileTransportAction.java index 8bf8412c1..dd82c4b78 100644 --- a/src/main/java/org/opensearch/ad/transport/ProfileTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/ProfileTransportAction.java @@ -30,7 +30,6 @@ import org.opensearch.ad.model.DetectorProfileName; import org.opensearch.ad.model.ModelProfile; import org.opensearch.cluster.ClusterName; -import org.opensearch.common.settings.Settings; import org.opensearch.sdk.ExtensionsRunner; import org.opensearch.sdk.SDKClusterService; import org.opensearch.tasks.Task; @@ -49,7 +48,7 @@ public class ProfileTransportAction extends TransportAction this.numModelsToReturn = it); } private ProfileResponse newResponse(ProfileRequest request, List responses, List failures) { - return new ProfileResponse(new ClusterName(settings.get("cluster.name")), responses, failures); + return new ProfileResponse(new ClusterName(extensionsRunner.getEnvironmentSettings().get("cluster.name")), responses, failures); } @Override