From 665d4aa7b5ca977994729841a0607f37c93394f9 Mon Sep 17 00:00:00 2001 From: David Roberts Date: Fri, 7 Dec 2018 15:49:45 +0000 Subject: [PATCH] [ML] Option to use endpoints starting _ml instead of _xpack/ml In #36315 ML's _xpack/ml endpoints are deprecated, with the recommended form becoming _ml. This change allows use of the new form in 6.x to facilitate operation of a mixed version 6.last/7.x cluster without suffering from deprecation warnings. The new endpoints remain undocumented in 6.x but are documented in the 7.0 PR #36315. --- .../org/elasticsearch/xpack/ml/MachineLearning.java | 1 + .../xpack/ml/rest/RestDeleteExpiredDataAction.java | 1 + .../xpack/ml/rest/RestFindFileStructureAction.java | 1 + .../elasticsearch/xpack/ml/rest/RestMlInfoAction.java | 1 + .../ml/rest/calendar/RestDeleteCalendarAction.java | 2 ++ .../rest/calendar/RestDeleteCalendarEventAction.java | 3 +++ .../ml/rest/calendar/RestDeleteCalendarJobAction.java | 3 +++ .../ml/rest/calendar/RestGetCalendarEventsAction.java | 2 ++ .../xpack/ml/rest/calendar/RestGetCalendarsAction.java | 6 ++++++ .../ml/rest/calendar/RestPostCalendarEventAction.java | 2 ++ .../xpack/ml/rest/calendar/RestPutCalendarAction.java | 2 ++ .../ml/rest/calendar/RestPutCalendarJobAction.java | 3 +++ .../ml/rest/datafeeds/RestDeleteDatafeedAction.java | 2 ++ .../ml/rest/datafeeds/RestGetDatafeedStatsAction.java | 4 ++++ .../ml/rest/datafeeds/RestGetDatafeedsAction.java | 4 ++++ .../ml/rest/datafeeds/RestPreviewDatafeedAction.java | 2 ++ .../xpack/ml/rest/datafeeds/RestPutDatafeedAction.java | 2 ++ .../ml/rest/datafeeds/RestStartDatafeedAction.java | 2 ++ .../ml/rest/datafeeds/RestStopDatafeedAction.java | 2 ++ .../ml/rest/datafeeds/RestUpdateDatafeedAction.java | 2 ++ .../xpack/ml/rest/filter/RestDeleteFilterAction.java | 2 ++ .../xpack/ml/rest/filter/RestGetFiltersAction.java | 7 +++++-- .../xpack/ml/rest/filter/RestPutFilterAction.java | 2 ++ .../xpack/ml/rest/filter/RestUpdateFilterAction.java | 2 ++ .../xpack/ml/rest/job/RestCloseJobAction.java | 2 ++ .../xpack/ml/rest/job/RestDeleteForecastAction.java | 5 +++++ .../xpack/ml/rest/job/RestDeleteJobAction.java | 2 ++ .../xpack/ml/rest/job/RestFlushJobAction.java | 2 ++ .../xpack/ml/rest/job/RestForecastJobAction.java | 2 ++ .../xpack/ml/rest/job/RestGetJobStatsAction.java | 4 ++++ .../xpack/ml/rest/job/RestGetJobsAction.java | 4 ++++ .../xpack/ml/rest/job/RestOpenJobAction.java | 2 ++ .../xpack/ml/rest/job/RestPostDataAction.java | 4 +++- .../xpack/ml/rest/job/RestPostJobUpdateAction.java | 2 ++ .../xpack/ml/rest/job/RestPutJobAction.java | 2 ++ .../modelsnapshots/RestDeleteModelSnapshotAction.java | 2 ++ .../modelsnapshots/RestGetModelSnapshotsAction.java | 8 ++++++++ .../modelsnapshots/RestRevertModelSnapshotAction.java | 3 +++ .../modelsnapshots/RestUpdateModelSnapshotAction.java | 3 +++ .../xpack/ml/rest/results/RestGetBucketsAction.java | 10 ++++++++++ .../xpack/ml/rest/results/RestGetCategoriesAction.java | 10 ++++++++++ .../ml/rest/results/RestGetInfluencersAction.java | 4 ++++ .../ml/rest/results/RestGetOverallBucketsAction.java | 4 ++++ .../xpack/ml/rest/results/RestGetRecordsAction.java | 4 ++++ .../ml/rest/validate/RestValidateDetectorAction.java | 1 + .../ml/rest/validate/RestValidateJobConfigAction.java | 1 + 46 files changed, 138 insertions(+), 3 deletions(-) diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearning.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearning.java index 2fe1093aa6ce2..7dade540fba30 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearning.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearning.java @@ -245,6 +245,7 @@ public class MachineLearning extends Plugin implements ActionPlugin, AnalysisPlugin, PersistentTaskPlugin { public static final String NAME = "ml"; + public static final String V7_BASE_PATH = "/_ml/"; public static final String BASE_PATH = "/_xpack/ml/"; public static final String DATAFEED_THREAD_POOL_NAME = NAME + "_datafeed"; public static final String AUTODETECT_THREAD_POOL_NAME = NAME + "_autodetect"; diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/RestDeleteExpiredDataAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/RestDeleteExpiredDataAction.java index 3939efed54001..31765a2f971e0 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/RestDeleteExpiredDataAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/RestDeleteExpiredDataAction.java @@ -21,6 +21,7 @@ public class RestDeleteExpiredDataAction extends BaseRestHandler { public RestDeleteExpiredDataAction(Settings settings, RestController controller) { super(settings); controller.registerHandler(RestRequest.Method.DELETE, MachineLearning.BASE_PATH + "_delete_expired_data", this); + controller.registerHandler(RestRequest.Method.DELETE, MachineLearning.V7_BASE_PATH + "_delete_expired_data", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/RestFindFileStructureAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/RestFindFileStructureAction.java index 0528c30e059c2..df68ad8b5dedf 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/RestFindFileStructureAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/RestFindFileStructureAction.java @@ -30,6 +30,7 @@ public class RestFindFileStructureAction extends BaseRestHandler { public RestFindFileStructureAction(Settings settings, RestController controller) { super(settings); controller.registerHandler(RestRequest.Method.POST, MachineLearning.BASE_PATH + "find_file_structure", this); + controller.registerHandler(RestRequest.Method.POST, MachineLearning.V7_BASE_PATH + "find_file_structure", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/RestMlInfoAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/RestMlInfoAction.java index ddb15086e2a90..67544638414a6 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/RestMlInfoAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/RestMlInfoAction.java @@ -21,6 +21,7 @@ public class RestMlInfoAction extends BaseRestHandler { public RestMlInfoAction(Settings settings, RestController controller) { super(settings); controller.registerHandler(RestRequest.Method.GET, MachineLearning.BASE_PATH + "info", this); + controller.registerHandler(RestRequest.Method.GET, MachineLearning.V7_BASE_PATH + "info", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestDeleteCalendarAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestDeleteCalendarAction.java index 58b6e4adc10e9..0c473e7cb5943 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestDeleteCalendarAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestDeleteCalendarAction.java @@ -23,6 +23,8 @@ public RestDeleteCalendarAction(Settings settings, RestController controller) { super(settings); controller.registerHandler(RestRequest.Method.DELETE, MachineLearning.BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}", this); + controller.registerHandler(RestRequest.Method.DELETE, + MachineLearning.V7_BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestDeleteCalendarEventAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestDeleteCalendarEventAction.java index 9b89aadec2583..5dde85ad663ec 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestDeleteCalendarEventAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestDeleteCalendarEventAction.java @@ -25,6 +25,9 @@ public RestDeleteCalendarEventAction(Settings settings, RestController controlle controller.registerHandler(RestRequest.Method.DELETE, MachineLearning.BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}/events/{" + ScheduledEvent.EVENT_ID.getPreferredName() + "}", this); + controller.registerHandler(RestRequest.Method.DELETE, + MachineLearning.V7_BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}/events/{" + + ScheduledEvent.EVENT_ID.getPreferredName() + "}", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestDeleteCalendarJobAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestDeleteCalendarJobAction.java index ee3c797216e61..ce857953f1612 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestDeleteCalendarJobAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestDeleteCalendarJobAction.java @@ -25,6 +25,9 @@ public RestDeleteCalendarJobAction(Settings settings, RestController controller) controller.registerHandler(RestRequest.Method.DELETE, MachineLearning.BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}/jobs/{" + Job.ID.getPreferredName() + "}", this); + controller.registerHandler(RestRequest.Method.DELETE, + MachineLearning.V7_BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}/jobs/{" + + Job.ID.getPreferredName() + "}", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestGetCalendarEventsAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestGetCalendarEventsAction.java index 185164ad09488..e4e7a49cdc905 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestGetCalendarEventsAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestGetCalendarEventsAction.java @@ -25,6 +25,8 @@ public RestGetCalendarEventsAction(Settings settings, RestController controller) super(settings); controller.registerHandler(RestRequest.Method.GET, MachineLearning.BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}/events", this); + controller.registerHandler(RestRequest.Method.GET, + MachineLearning.V7_BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}/events", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestGetCalendarsAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestGetCalendarsAction.java index 80fb6b02eb7de..9a1117a53f3fe 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestGetCalendarsAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestGetCalendarsAction.java @@ -26,12 +26,18 @@ public RestGetCalendarsAction(Settings settings, RestController controller) { super(settings); controller.registerHandler(RestRequest.Method.GET, MachineLearning.BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}", this); + controller.registerHandler(RestRequest.Method.GET, MachineLearning.V7_BASE_PATH + "calendars/{" + + Calendar.ID.getPreferredName() + "}", this); controller.registerHandler(RestRequest.Method.GET, MachineLearning.BASE_PATH + "calendars/", this); + controller.registerHandler(RestRequest.Method.GET, MachineLearning.V7_BASE_PATH + "calendars/", this); // endpoints that support body parameters must also accept POST controller.registerHandler(RestRequest.Method.POST, MachineLearning.BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}", this); + controller.registerHandler(RestRequest.Method.POST, MachineLearning.V7_BASE_PATH + "calendars/{" + + Calendar.ID.getPreferredName() + "}", this); controller.registerHandler(RestRequest.Method.POST, MachineLearning.BASE_PATH + "calendars/", this); + controller.registerHandler(RestRequest.Method.POST, MachineLearning.V7_BASE_PATH + "calendars/", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestPostCalendarEventAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestPostCalendarEventAction.java index 5d0b8aa7f3d62..1df8177ff0ad2 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestPostCalendarEventAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestPostCalendarEventAction.java @@ -24,6 +24,8 @@ public RestPostCalendarEventAction(Settings settings, RestController controller) super(settings); controller.registerHandler(RestRequest.Method.POST, MachineLearning.BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}/events", this); + controller.registerHandler(RestRequest.Method.POST, + MachineLearning.V7_BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}/events", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestPutCalendarAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestPutCalendarAction.java index 4e86770fa92cd..e5868814d4cc8 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestPutCalendarAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestPutCalendarAction.java @@ -25,6 +25,8 @@ public RestPutCalendarAction(Settings settings, RestController controller) { super(settings); controller.registerHandler(RestRequest.Method.PUT, MachineLearning.BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}", this); + controller.registerHandler(RestRequest.Method.PUT, + MachineLearning.V7_BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestPutCalendarJobAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestPutCalendarJobAction.java index eea0197b2d88f..df098e7747f9c 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestPutCalendarJobAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestPutCalendarJobAction.java @@ -25,6 +25,9 @@ public RestPutCalendarJobAction(Settings settings, RestController controller) { controller.registerHandler(RestRequest.Method.PUT, MachineLearning.BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}/jobs/{" + Job.ID.getPreferredName() + "}", this); + controller.registerHandler(RestRequest.Method.PUT, + MachineLearning.V7_BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}/jobs/{" + + Job.ID.getPreferredName() + "}", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestDeleteDatafeedAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestDeleteDatafeedAction.java index ca275f0844148..cffb0fbe7d161 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestDeleteDatafeedAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestDeleteDatafeedAction.java @@ -24,6 +24,8 @@ public RestDeleteDatafeedAction(Settings settings, RestController controller) { super(settings); controller.registerHandler(RestRequest.Method.DELETE, MachineLearning.BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}", this); + controller.registerHandler(RestRequest.Method.DELETE, MachineLearning.V7_BASE_PATH + "datafeeds/{" + + DatafeedConfig.ID.getPreferredName() + "}", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestGetDatafeedStatsAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestGetDatafeedStatsAction.java index 0ec179be42f96..eee759d87887e 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestGetDatafeedStatsAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestGetDatafeedStatsAction.java @@ -24,8 +24,12 @@ public RestGetDatafeedStatsAction(Settings settings, RestController controller) super(settings); controller.registerHandler(RestRequest.Method.GET, MachineLearning.BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}/_stats", this); + controller.registerHandler(RestRequest.Method.GET, MachineLearning.V7_BASE_PATH + + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}/_stats", this); controller.registerHandler(RestRequest.Method.GET, MachineLearning.BASE_PATH + "datafeeds/_stats", this); + controller.registerHandler(RestRequest.Method.GET, MachineLearning.V7_BASE_PATH + + "datafeeds/_stats", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestGetDatafeedsAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestGetDatafeedsAction.java index 354731d21c62b..a040a6163314d 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestGetDatafeedsAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestGetDatafeedsAction.java @@ -23,8 +23,12 @@ public RestGetDatafeedsAction(Settings settings, RestController controller) { super(settings); controller.registerHandler(RestRequest.Method.GET, MachineLearning.BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}", this); + controller.registerHandler(RestRequest.Method.GET, MachineLearning.V7_BASE_PATH + + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}", this); controller.registerHandler(RestRequest.Method.GET, MachineLearning.BASE_PATH + "datafeeds", this); + controller.registerHandler(RestRequest.Method.GET, MachineLearning.V7_BASE_PATH + + "datafeeds", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestPreviewDatafeedAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestPreviewDatafeedAction.java index 8436d257ce8f2..43047a94b72e5 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestPreviewDatafeedAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestPreviewDatafeedAction.java @@ -23,6 +23,8 @@ public RestPreviewDatafeedAction(Settings settings, RestController controller) { super(settings); controller.registerHandler(RestRequest.Method.GET, MachineLearning.BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}/_preview", this); + controller.registerHandler(RestRequest.Method.GET, + MachineLearning.V7_BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}/_preview", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestPutDatafeedAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestPutDatafeedAction.java index 1bc8da7b57ef0..d870ab02d8c21 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestPutDatafeedAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestPutDatafeedAction.java @@ -24,6 +24,8 @@ public RestPutDatafeedAction(Settings settings, RestController controller) { super(settings); controller.registerHandler(RestRequest.Method.PUT, MachineLearning.BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}", this); + controller.registerHandler(RestRequest.Method.PUT, MachineLearning.V7_BASE_PATH + "datafeeds/{" + + DatafeedConfig.ID.getPreferredName() + "}", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestStartDatafeedAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestStartDatafeedAction.java index 07906a49c280f..83338269be428 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestStartDatafeedAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestStartDatafeedAction.java @@ -32,6 +32,8 @@ public RestStartDatafeedAction(Settings settings, RestController controller) { super(settings); controller.registerHandler(RestRequest.Method.POST, MachineLearning.BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}/_start", this); + controller.registerHandler(RestRequest.Method.POST, + MachineLearning.V7_BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}/_start", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestStopDatafeedAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestStopDatafeedAction.java index 5015df58e7972..ab9bb9229b45d 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestStopDatafeedAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestStopDatafeedAction.java @@ -30,6 +30,8 @@ public RestStopDatafeedAction(Settings settings, RestController controller) { super(settings); controller.registerHandler(RestRequest.Method.POST, MachineLearning.BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}/_stop", this); + controller.registerHandler(RestRequest.Method.POST, MachineLearning.V7_BASE_PATH + "datafeeds/{" + + DatafeedConfig.ID.getPreferredName() + "}/_stop", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestUpdateDatafeedAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestUpdateDatafeedAction.java index ae44f18e5d1fb..46f2cffd635e7 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestUpdateDatafeedAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestUpdateDatafeedAction.java @@ -24,6 +24,8 @@ public RestUpdateDatafeedAction(Settings settings, RestController controller) { super(settings); controller.registerHandler(RestRequest.Method.POST, MachineLearning.BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}/_update", this); + controller.registerHandler(RestRequest.Method.POST, MachineLearning.V7_BASE_PATH + "datafeeds/{" + + DatafeedConfig.ID.getPreferredName() + "}/_update", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestDeleteFilterAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestDeleteFilterAction.java index f3cfc6d1d6cc9..1f990bfa5a7c2 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestDeleteFilterAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestDeleteFilterAction.java @@ -23,6 +23,8 @@ public RestDeleteFilterAction(Settings settings, RestController controller) { super(settings); controller.registerHandler(RestRequest.Method.DELETE, MachineLearning.BASE_PATH + "filters/{" + Request.FILTER_ID.getPreferredName() + "}", this); + controller.registerHandler(RestRequest.Method.DELETE, + MachineLearning.V7_BASE_PATH + "filters/{" + Request.FILTER_ID.getPreferredName() + "}", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestGetFiltersAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestGetFiltersAction.java index c62b3258e6d3b..c0957939d27be 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestGetFiltersAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestGetFiltersAction.java @@ -23,9 +23,12 @@ public class RestGetFiltersAction extends BaseRestHandler { public RestGetFiltersAction(Settings settings, RestController controller) { super(settings); - controller.registerHandler(RestRequest.Method.GET, MachineLearning.BASE_PATH + "filters/{" + MlFilter.ID.getPreferredName() + "}", - this); + controller.registerHandler(RestRequest.Method.GET, + MachineLearning.BASE_PATH + "filters/{" + MlFilter.ID.getPreferredName() + "}", this); + controller.registerHandler(RestRequest.Method.GET, + MachineLearning.V7_BASE_PATH + "filters/{" + MlFilter.ID.getPreferredName() + "}", this); controller.registerHandler(RestRequest.Method.GET, MachineLearning.BASE_PATH + "filters/", this); + controller.registerHandler(RestRequest.Method.GET, MachineLearning.V7_BASE_PATH + "filters/", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestPutFilterAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestPutFilterAction.java index bbc756e279f27..68e5d425a456f 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestPutFilterAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestPutFilterAction.java @@ -24,6 +24,8 @@ public RestPutFilterAction(Settings settings, RestController controller) { super(settings); controller.registerHandler(RestRequest.Method.PUT, MachineLearning.BASE_PATH + "filters/{" + MlFilter.ID.getPreferredName() + "}", this); + controller.registerHandler(RestRequest.Method.PUT, + MachineLearning.V7_BASE_PATH + "filters/{" + MlFilter.ID.getPreferredName() + "}", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestUpdateFilterAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestUpdateFilterAction.java index 80acf3d7e4e35..94e388a9508b0 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestUpdateFilterAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestUpdateFilterAction.java @@ -24,6 +24,8 @@ public RestUpdateFilterAction(Settings settings, RestController controller) { super(settings); controller.registerHandler(RestRequest.Method.POST, MachineLearning.BASE_PATH + "filters/{" + MlFilter.ID.getPreferredName() + "}/_update", this); + controller.registerHandler(RestRequest.Method.POST, + MachineLearning.V7_BASE_PATH + "filters/{" + MlFilter.ID.getPreferredName() + "}/_update", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestCloseJobAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestCloseJobAction.java index ae6257d53850f..cc4ff87d639a1 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestCloseJobAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestCloseJobAction.java @@ -25,6 +25,8 @@ public RestCloseJobAction(Settings settings, RestController controller) { super(settings); controller.registerHandler(RestRequest.Method.POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_close", this); + controller.registerHandler(RestRequest.Method.POST, MachineLearning.V7_BASE_PATH + + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_close", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestDeleteForecastAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestDeleteForecastAction.java index e42a73204eb3c..9a6b69faccf51 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestDeleteForecastAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestDeleteForecastAction.java @@ -28,6 +28,11 @@ public RestDeleteForecastAction(Settings settings, RestController controller) { "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_forecast/{" + Forecast.FORECAST_ID.getPreferredName() + "}", this); + controller.registerHandler(RestRequest.Method.DELETE, + MachineLearning.V7_BASE_PATH + + "anomaly_detectors/{" + Job.ID.getPreferredName() + + "}/_forecast/{" + Forecast.FORECAST_ID.getPreferredName() + "}", + this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestDeleteJobAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestDeleteJobAction.java index 3a76b71980bec..26e1f7a86c04b 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestDeleteJobAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestDeleteJobAction.java @@ -29,6 +29,8 @@ public RestDeleteJobAction(Settings settings, RestController controller) { super(settings); controller.registerHandler(RestRequest.Method.DELETE, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}", this); + controller.registerHandler(RestRequest.Method.DELETE, MachineLearning.V7_BASE_PATH + + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestFlushJobAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestFlushJobAction.java index 11c51fffb3c61..fc3936f63cf77 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestFlushJobAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestFlushJobAction.java @@ -30,6 +30,8 @@ public RestFlushJobAction(Settings settings, RestController controller) { super(settings); controller.registerHandler(RestRequest.Method.POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_flush", this); + controller.registerHandler(RestRequest.Method.POST, MachineLearning.V7_BASE_PATH + + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_flush", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestForecastJobAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestForecastJobAction.java index a67f9f31aaed4..6c834d3fa8feb 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestForecastJobAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestForecastJobAction.java @@ -24,6 +24,8 @@ public RestForecastJobAction(Settings settings, RestController controller) { super(settings); controller.registerHandler(RestRequest.Method.POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_forecast", this); + controller.registerHandler(RestRequest.Method.POST, + MachineLearning.V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_forecast", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestGetJobStatsAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestGetJobStatsAction.java index b35629e72e7a4..47d2498778409 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestGetJobStatsAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestGetJobStatsAction.java @@ -25,8 +25,12 @@ public RestGetJobStatsAction(Settings settings, RestController controller) { super(settings); controller.registerHandler(RestRequest.Method.GET, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_stats", this); + controller.registerHandler(RestRequest.Method.GET, MachineLearning.V7_BASE_PATH + + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_stats", this); controller.registerHandler(RestRequest.Method.GET, MachineLearning.BASE_PATH + "anomaly_detectors/_stats", this); + controller.registerHandler(RestRequest.Method.GET, MachineLearning.V7_BASE_PATH + + "anomaly_detectors/_stats", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestGetJobsAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestGetJobsAction.java index ed6f20d989948..5faa241c9f4ac 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestGetJobsAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestGetJobsAction.java @@ -26,8 +26,12 @@ public RestGetJobsAction(Settings settings, RestController controller) { controller.registerHandler(RestRequest.Method.GET, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}", this); + controller.registerHandler(RestRequest.Method.GET, MachineLearning.V7_BASE_PATH + + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}", this); controller.registerHandler(RestRequest.Method.GET, MachineLearning.BASE_PATH + "anomaly_detectors", this); + controller.registerHandler(RestRequest.Method.GET, MachineLearning.V7_BASE_PATH + + "anomaly_detectors", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestOpenJobAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestOpenJobAction.java index 4da4e540307b3..5a997c3e803fd 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestOpenJobAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestOpenJobAction.java @@ -29,6 +29,8 @@ public RestOpenJobAction(Settings settings, RestController controller) { super(settings); controller.registerHandler(RestRequest.Method.POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_open", this); + controller.registerHandler(RestRequest.Method.POST, MachineLearning.V7_BASE_PATH + + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_open", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPostDataAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPostDataAction.java index b7095c6fbfcc0..684d3ab7a0782 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPostDataAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPostDataAction.java @@ -26,6 +26,8 @@ public RestPostDataAction(Settings settings, RestController controller) { super(settings); controller.registerHandler(RestRequest.Method.POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_data", this); + controller.registerHandler(RestRequest.Method.POST, MachineLearning.V7_BASE_PATH + + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_data", this); } @Override @@ -47,4 +49,4 @@ protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient public boolean supportsContentStream() { return true; } -} \ No newline at end of file +} diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPostJobUpdateAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPostJobUpdateAction.java index f0937bdae58a0..d0d9d1ff28c62 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPostJobUpdateAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPostJobUpdateAction.java @@ -23,6 +23,8 @@ public RestPostJobUpdateAction(Settings settings, RestController controller) { super(settings); controller.registerHandler(RestRequest.Method.POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_update", this); + controller.registerHandler(RestRequest.Method.POST, + MachineLearning.V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_update", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPutJobAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPutJobAction.java index 14b76bbe59954..d6d6211dc6c9f 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPutJobAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPutJobAction.java @@ -24,6 +24,8 @@ public RestPutJobAction(Settings settings, RestController controller) { super(settings); controller.registerHandler(RestRequest.Method.PUT, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}", this); + controller.registerHandler(RestRequest.Method.PUT, + MachineLearning.V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestDeleteModelSnapshotAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestDeleteModelSnapshotAction.java index 8e0a3f5b40bbd..b3a49910c1d0d 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestDeleteModelSnapshotAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestDeleteModelSnapshotAction.java @@ -24,6 +24,8 @@ public RestDeleteModelSnapshotAction(Settings settings, RestController controlle super(settings); controller.registerHandler(RestRequest.Method.DELETE, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/model_snapshots/{" + ModelSnapshotField.SNAPSHOT_ID.getPreferredName() + "}", this); + controller.registerHandler(RestRequest.Method.DELETE, MachineLearning.V7_BASE_PATH + "anomaly_detectors/{" + + Job.ID.getPreferredName() + "}/model_snapshots/{" + ModelSnapshotField.SNAPSHOT_ID.getPreferredName() + "}", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestGetModelSnapshotsAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestGetModelSnapshotsAction.java index ceeb55442e5dd..1c207a7f20c04 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestGetModelSnapshotsAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestGetModelSnapshotsAction.java @@ -37,15 +37,23 @@ public RestGetModelSnapshotsAction(Settings settings, RestController controller) super(settings); controller.registerHandler(RestRequest.Method.GET, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/model_snapshots/{" + Request.SNAPSHOT_ID.getPreferredName() + "}", this); + controller.registerHandler(RestRequest.Method.GET, MachineLearning.V7_BASE_PATH + "anomaly_detectors/{" + + Job.ID.getPreferredName() + "}/model_snapshots/{" + Request.SNAPSHOT_ID.getPreferredName() + "}", this); // endpoints that support body parameters must also accept POST controller.registerHandler(RestRequest.Method.POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/model_snapshots/{" + Request.SNAPSHOT_ID.getPreferredName() + "}", this); + controller.registerHandler(RestRequest.Method.POST, MachineLearning.V7_BASE_PATH + "anomaly_detectors/{" + + Job.ID.getPreferredName() + "}/model_snapshots/{" + Request.SNAPSHOT_ID.getPreferredName() + "}", this); controller.registerHandler(RestRequest.Method.GET, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/model_snapshots", this); + controller.registerHandler(RestRequest.Method.GET, MachineLearning.V7_BASE_PATH + "anomaly_detectors/{" + + Job.ID.getPreferredName() + "}/model_snapshots", this); // endpoints that support body parameters must also accept POST controller.registerHandler(RestRequest.Method.POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/model_snapshots", this); + controller.registerHandler(RestRequest.Method.POST, MachineLearning.V7_BASE_PATH + "anomaly_detectors/{" + + Job.ID.getPreferredName() + "}/model_snapshots", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestRevertModelSnapshotAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestRevertModelSnapshotAction.java index 3939991cf1572..6c19fe301aca5 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestRevertModelSnapshotAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestRevertModelSnapshotAction.java @@ -27,6 +27,9 @@ public RestRevertModelSnapshotAction(Settings settings, RestController controlle controller.registerHandler(RestRequest.Method.POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/model_snapshots/{" + RevertModelSnapshotAction.Request.SNAPSHOT_ID.getPreferredName() + "}/_revert", this); + controller.registerHandler(RestRequest.Method.POST, + MachineLearning.V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/model_snapshots/{" + + RevertModelSnapshotAction.Request.SNAPSHOT_ID.getPreferredName() + "}/_revert", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestUpdateModelSnapshotAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestUpdateModelSnapshotAction.java index b428f43b55ef6..303540e444876 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestUpdateModelSnapshotAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestUpdateModelSnapshotAction.java @@ -26,6 +26,9 @@ public RestUpdateModelSnapshotAction(Settings settings, RestController controlle controller.registerHandler(RestRequest.Method.POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/model_snapshots/{" + ModelSnapshotField.SNAPSHOT_ID +"}/_update", this); + controller.registerHandler(RestRequest.Method.POST, MachineLearning.V7_BASE_PATH + "anomaly_detectors/{" + + Job.ID.getPreferredName() + "}/model_snapshots/{" + ModelSnapshotField.SNAPSHOT_ID +"}/_update", + this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetBucketsAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetBucketsAction.java index 9783870acc43b..ded8127a9233f 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetBucketsAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetBucketsAction.java @@ -28,14 +28,24 @@ public RestGetBucketsAction(Settings settings, RestController controller) { controller.registerHandler(RestRequest.Method.GET, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/buckets/{" + Result.TIMESTAMP.getPreferredName() + "}", this); + controller.registerHandler(RestRequest.Method.GET, + MachineLearning.V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + + "}/results/buckets/{" + Result.TIMESTAMP.getPreferredName() + "}", this); controller.registerHandler(RestRequest.Method.POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/buckets/{" + Result.TIMESTAMP.getPreferredName() + "}", this); + controller.registerHandler(RestRequest.Method.POST, + MachineLearning.V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + + "}/results/buckets/{" + Result.TIMESTAMP.getPreferredName() + "}", this); controller.registerHandler(RestRequest.Method.GET, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/buckets", this); + controller.registerHandler(RestRequest.Method.GET, + MachineLearning.V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/buckets", this); controller.registerHandler(RestRequest.Method.POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/buckets", this); + controller.registerHandler(RestRequest.Method.POST, + MachineLearning.V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/buckets", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetCategoriesAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetCategoriesAction.java index e8a74575197b7..22adeeb23e5b1 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetCategoriesAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetCategoriesAction.java @@ -27,14 +27,24 @@ public RestGetCategoriesAction(Settings settings, RestController controller) { controller.registerHandler(RestRequest.Method.GET, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/categories/{" + Request.CATEGORY_ID.getPreferredName() + "}", this); + controller.registerHandler(RestRequest.Method.GET, + MachineLearning.V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/categories/{" + + Request.CATEGORY_ID.getPreferredName() + "}", this); controller.registerHandler(RestRequest.Method.GET, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/categories", this); + controller.registerHandler(RestRequest.Method.GET, + MachineLearning.V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/categories", this); controller.registerHandler(RestRequest.Method.POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/categories/{" + Request.CATEGORY_ID.getPreferredName() + "}", this); + controller.registerHandler(RestRequest.Method.POST, + MachineLearning.V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/categories/{" + + Request.CATEGORY_ID.getPreferredName() + "}", this); controller.registerHandler(RestRequest.Method.POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/categories", this); + controller.registerHandler(RestRequest.Method.POST, + MachineLearning.V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/categories", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetInfluencersAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetInfluencersAction.java index 53794c7a45b06..1e9dd3b92aced 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetInfluencersAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetInfluencersAction.java @@ -25,9 +25,13 @@ public RestGetInfluencersAction(Settings settings, RestController controller) { super(settings); controller.registerHandler(RestRequest.Method.GET, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/influencers", this); + controller.registerHandler(RestRequest.Method.GET, + MachineLearning.V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/influencers", this); // endpoints that support body parameters must also accept POST controller.registerHandler(RestRequest.Method.POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/influencers", this); + controller.registerHandler(RestRequest.Method.POST, + MachineLearning.V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/influencers", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetOverallBucketsAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetOverallBucketsAction.java index bf4121c3ec7ed..d3fc89a9a2105 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetOverallBucketsAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetOverallBucketsAction.java @@ -25,8 +25,12 @@ public RestGetOverallBucketsAction(Settings settings, RestController controller) super(settings); controller.registerHandler(RestRequest.Method.GET, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/overall_buckets", this); + controller.registerHandler(RestRequest.Method.GET, + MachineLearning.V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/overall_buckets", this); controller.registerHandler(RestRequest.Method.POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/overall_buckets", this); + controller.registerHandler(RestRequest.Method.POST, + MachineLearning.V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/overall_buckets", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetRecordsAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetRecordsAction.java index c7e571f2cdce3..b41012c90fc65 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetRecordsAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetRecordsAction.java @@ -25,8 +25,12 @@ public RestGetRecordsAction(Settings settings, RestController controller) { super(settings); controller.registerHandler(RestRequest.Method.GET, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/records", this); + controller.registerHandler(RestRequest.Method.GET, MachineLearning.V7_BASE_PATH + "anomaly_detectors/{" + + Job.ID.getPreferredName() + "}/results/records", this); controller.registerHandler(RestRequest.Method.POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/records", this); + controller.registerHandler(RestRequest.Method.POST, MachineLearning.V7_BASE_PATH + "anomaly_detectors/{" + + Job.ID.getPreferredName() + "}/results/records", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/validate/RestValidateDetectorAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/validate/RestValidateDetectorAction.java index d611d1d956f4b..ca51ccf24a952 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/validate/RestValidateDetectorAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/validate/RestValidateDetectorAction.java @@ -22,6 +22,7 @@ public class RestValidateDetectorAction extends BaseRestHandler { public RestValidateDetectorAction(Settings settings, RestController controller) { super(settings); controller.registerHandler(RestRequest.Method.POST, MachineLearning.BASE_PATH + "anomaly_detectors/_validate/detector", this); + controller.registerHandler(RestRequest.Method.POST, MachineLearning.V7_BASE_PATH + "anomaly_detectors/_validate/detector", this); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/validate/RestValidateJobConfigAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/validate/RestValidateJobConfigAction.java index 8bd7ef88b6641..f95185280c0bb 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/validate/RestValidateJobConfigAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/validate/RestValidateJobConfigAction.java @@ -22,6 +22,7 @@ public class RestValidateJobConfigAction extends BaseRestHandler { public RestValidateJobConfigAction(Settings settings, RestController controller) { super(settings); controller.registerHandler(RestRequest.Method.POST, MachineLearning.BASE_PATH + "anomaly_detectors/_validate", this); + controller.registerHandler(RestRequest.Method.POST, MachineLearning.V7_BASE_PATH + "anomaly_detectors/_validate", this); } @Override