From 24243743ba1b67864ddfd23854c022ab1601051e Mon Sep 17 00:00:00 2001 From: Yaliang Wu Date: Wed, 8 Jan 2020 16:44:36 -0800 Subject: [PATCH 1/2] fix stop detector api to use correct request --- .../rest/RestDeleteAnomalyDetectorAction.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestDeleteAnomalyDetectorAction.java b/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestDeleteAnomalyDetectorAction.java index 0642a552..aa5f7217 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestDeleteAnomalyDetectorAction.java +++ b/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestDeleteAnomalyDetectorAction.java @@ -17,15 +17,15 @@ import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; import com.amazon.opendistroforelasticsearch.ad.rest.handler.AnomalyDetectorActionHandler; -import com.amazon.opendistroforelasticsearch.ad.transport.DeleteDetectorAction; -import com.amazon.opendistroforelasticsearch.ad.transport.DeleteDetectorRequest; +import com.amazon.opendistroforelasticsearch.ad.transport.StopDetectorAction; +import com.amazon.opendistroforelasticsearch.ad.transport.StopDetectorRequest; +import com.amazon.opendistroforelasticsearch.ad.transport.StopDetectorResponse; import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.support.WriteRequest; -import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.settings.Settings; @@ -82,8 +82,8 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli return channel -> { if (channel.request().method() == RestRequest.Method.POST) { logger.info("Stop anomaly detector {}", detectorId); - DeleteDetectorRequest deleteDetectorRequest = new DeleteDetectorRequest().adID(detectorId); - client.execute(DeleteDetectorAction.INSTANCE, deleteDetectorRequest, stopAdDetectorListener(channel, detectorId)); + StopDetectorRequest stopDetectorRequest = new StopDetectorRequest(detectorId); + client.execute(StopDetectorAction.INSTANCE, stopDetectorRequest, stopAdDetectorListener(channel, detectorId)); } else if (channel.request().method() == RestRequest.Method.DELETE) { logger.info("Delete anomaly detector {}", detectorId); handler.getMonitorUsingDetector(clusterService, client, detectorId, @@ -101,11 +101,11 @@ private void deleteAnomalyDetectorDoc(NodeClient client, String detectorId, Rest client.delete(deleteRequest, new RestStatusToXContentListener<>(channel)); } - private ActionListener stopAdDetectorListener(RestChannel channel, String detectorId) { - return new ActionListener() { + private ActionListener stopAdDetectorListener(RestChannel channel, String detectorId) { + return new ActionListener() { @Override - public void onResponse(AcknowledgedResponse deleteDetectorResponse) { - if (deleteDetectorResponse.isAcknowledged()) { + public void onResponse(StopDetectorResponse stopDetectorResponse) { + if (stopDetectorResponse.success()) { logger.info("AD model deleted successfully for detector {}", detectorId); channel.sendResponse(new BytesRestResponse(RestStatus.OK, "AD model deleted successfully")); } else { From e7429ed9c83422ef4f5f79e061621ac1521a375b Mon Sep 17 00:00:00 2001 From: Yaliang Wu Date: Thu, 9 Jan 2020 11:30:55 -0800 Subject: [PATCH 2/2] change AD setting name --- .../ad/settings/AnomalyDetectorSettings.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/settings/AnomalyDetectorSettings.java b/src/main/java/com/amazon/opendistroforelasticsearch/ad/settings/AnomalyDetectorSettings.java index 23f5da77..72e64480 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/settings/AnomalyDetectorSettings.java +++ b/src/main/java/com/amazon/opendistroforelasticsearch/ad/settings/AnomalyDetectorSettings.java @@ -30,71 +30,71 @@ private AnomalyDetectorSettings() { } public static final Setting MAX_ANOMALY_DETECTORS = Setting.intSetting( - "ml.anomaly_detectors.max_anomaly_detectors", + "opendistro.anomaly_detection.max_anomaly_detectors", 1000, Setting.Property.NodeScope, Setting.Property.Dynamic); public static final Setting MAX_ANOMALY_FEATURES = Setting.intSetting( - "ml.anomaly_detectors.max_anomaly_features", + "opendistro.anomaly_detection.max_anomaly_features", 5, Setting.Property.NodeScope, Setting.Property.Dynamic); public static final Setting REQUEST_TIMEOUT = Setting.positiveTimeSetting( - "ml.anomaly_detectors.request_timeout", + "opendistro.anomaly_detection.request_timeout", TimeValue.timeValueSeconds(10), Setting.Property.NodeScope, Setting.Property.Dynamic); public static final Setting DETECTION_INTERVAL = Setting.positiveTimeSetting( - "ml.anomaly_detectors.detection_interval", + "opendistro.anomaly_detection.detection_interval", TimeValue.timeValueMinutes(10), Setting.Property.NodeScope, Setting.Property.Dynamic); public static final Setting DETECTION_WINDOW_DELAY = Setting.positiveTimeSetting( - "ml.anomaly_detectors.detection_window_delay", + "opendistro.anomaly_detection.detection_window_delay", TimeValue.timeValueSeconds(30), Setting.Property.NodeScope, Setting.Property.Dynamic); public static final Setting AD_RESULT_ROLLOVER_PERIOD = Setting.positiveTimeSetting( - "ml.anomaly_detectors.ad_result_rollover_period", + "opendistro.anomaly_detection.ad_result_rollover_period", TimeValue.timeValueHours(12), Setting.Property.NodeScope, Setting.Property.Dynamic); public static final Setting AD_RESULT_HISTORY_ROLLOVER_PERIOD = Setting.positiveTimeSetting( - "ml.anomaly_detectors.ad_result_history_rollover_period", + "opendistro.anomaly_detection.ad_result_history_rollover_period", TimeValue.timeValueHours(12), Setting.Property.NodeScope, Setting.Property.Dynamic); public static final Setting AD_RESULT_HISTORY_INDEX_MAX_AGE = Setting.positiveTimeSetting( - "ml.anomaly_detectors.ad_result_history_max_age", + "opendistro.anomaly_detection.ad_result_history_max_age", TimeValue.timeValueHours(24), Setting.Property.NodeScope, Setting.Property.Dynamic); public static final Setting AD_RESULT_HISTORY_MAX_DOCS = Setting.longSetting( - "ml.anomaly_detectors.ad_result_history_max_docs", + "opendistro.anomaly_detection.ad_result_history_max_docs", 10000L, 0L, Setting.Property.NodeScope, Setting.Property.Dynamic); public static final Setting MAX_RETRY_FOR_UNRESPONSIVE_NODE = Setting.intSetting( - "ml.anomaly_detectors.max_retry_for_unresponsive_node", + "opendistro.anomaly_detection.max_retry_for_unresponsive_node", 5, 0, Setting.Property.NodeScope, Setting.Property.Dynamic); public static final Setting COOLDOWN_MINUTES = Setting.positiveTimeSetting( - "ml.anomaly_detectors.cooldown_minutes", TimeValue.timeValueMinutes(5), + "opendistro.anomaly_detection.cooldown_minutes", TimeValue.timeValueMinutes(5), Setting.Property.NodeScope, Setting.Property.Dynamic); public static final Setting BACKOFF_MINUTES = Setting.positiveTimeSetting( - "ml.anomaly_detectors.backoff_minutes", TimeValue.timeValueMinutes(15), + "opendistro.anomaly_detection.backoff_minutes", TimeValue.timeValueMinutes(15), Setting.Property.NodeScope, Setting.Property.Dynamic); public static final Setting BACKOFF_INITIAL_DELAY = Setting.positiveTimeSetting( - "ml.anomaly_detectors.backoff_initial_delay", TimeValue.timeValueMillis(1000), + "opendistro.anomaly_detection.backoff_initial_delay", TimeValue.timeValueMillis(1000), Setting.Property.NodeScope, Setting.Property.Dynamic); public static final Setting MAX_RETRY_FOR_BACKOFF = Setting.intSetting( - "ml.anomaly_detectors.max_retry_for_backoff", + "opendistro.anomaly_detection.max_retry_for_backoff", 3, 0, Setting.Property.NodeScope, Setting.Property.Dynamic);