From 36b8fe9b29d10add2d95a3753dfcd3e851e0ef6c Mon Sep 17 00:00:00 2001 From: Colin Goodheart-Smithe Date: Fri, 2 Jun 2017 08:46:48 +0100 Subject: [PATCH] Adds nodes usage action to known actions list (elastic/x-pack-elasticsearch#1111) * Adds nodes usage action to known actions list * Adds name to all rest actions Original commit: elastic/x-pack-elasticsearch@77ae827a6675fb2ffe0958b42d090362d3488e0d --- .../license/RestDeleteLicenseAction.java | 5 +++++ .../license/RestGetLicenseAction.java | 5 +++++ .../license/RestPutLicenseAction.java | 5 +++++ .../xpack/graph/rest/action/RestGraphAction.java | 5 +++++ .../ml/rest/RestDeleteExpiredDataAction.java | 5 +++++ .../rest/datafeeds/RestDeleteDatafeedAction.java | 5 +++++ .../datafeeds/RestGetDatafeedStatsAction.java | 5 +++++ .../ml/rest/datafeeds/RestGetDatafeedsAction.java | 5 +++++ .../rest/datafeeds/RestPreviewDatafeedAction.java | 5 +++++ .../ml/rest/datafeeds/RestPutDatafeedAction.java | 5 +++++ .../rest/datafeeds/RestStartDatafeedAction.java | 5 +++++ .../ml/rest/datafeeds/RestStopDatafeedAction.java | 5 +++++ .../rest/datafeeds/RestUpdateDatafeedAction.java | 5 +++++ .../ml/rest/filter/RestDeleteFilterAction.java | 5 +++++ .../ml/rest/filter/RestGetFiltersAction.java | 5 +++++ .../xpack/ml/rest/filter/RestPutFilterAction.java | 5 +++++ .../xpack/ml/rest/job/RestCloseJobAction.java | 5 +++++ .../xpack/ml/rest/job/RestDeleteJobAction.java | 5 +++++ .../xpack/ml/rest/job/RestFlushJobAction.java | 5 +++++ .../xpack/ml/rest/job/RestGetJobStatsAction.java | 5 +++++ .../xpack/ml/rest/job/RestGetJobsAction.java | 5 +++++ .../xpack/ml/rest/job/RestOpenJobAction.java | 5 +++++ .../xpack/ml/rest/job/RestPostDataAction.java | 5 +++++ .../ml/rest/job/RestPostJobUpdateAction.java | 5 +++++ .../xpack/ml/rest/job/RestPutJobAction.java | 5 +++++ .../RestDeleteModelSnapshotAction.java | 5 +++++ .../RestGetModelSnapshotsAction.java | 5 +++++ .../RestRevertModelSnapshotAction.java | 5 +++++ .../RestUpdateModelSnapshotAction.java | 5 +++++ .../ml/rest/results/RestGetBucketsAction.java | 5 +++++ .../ml/rest/results/RestGetCategoriesAction.java | 5 +++++ .../ml/rest/results/RestGetInfluencersAction.java | 5 +++++ .../ml/rest/results/RestGetRecordsAction.java | 7 ++++++- .../rest/validate/RestValidateDetectorAction.java | 5 +++++ .../validate/RestValidateJobConfigAction.java | 5 +++++ .../rest/action/RestMonitoringBulkAction.java | 5 +++++ .../xpack/rest/action/RestXPackInfoAction.java | 5 +++++ .../xpack/rest/action/RestXPackUsageAction.java | 5 +++++ .../rest/action/RestAuthenticateAction.java | 5 +++++ .../rest/action/oauth2/RestGetTokenAction.java | 5 +++++ .../action/oauth2/RestInvalidateTokenAction.java | 5 +++++ .../action/realm/RestClearRealmCacheAction.java | 5 +++++ .../action/role/RestClearRolesCacheAction.java | 5 +++++ .../rest/action/role/RestDeleteRoleAction.java | 5 +++++ .../rest/action/role/RestGetRolesAction.java | 5 +++++ .../rest/action/role/RestPutRoleAction.java | 5 +++++ .../rolemapping/RestDeleteRoleMappingAction.java | 9 +++++++-- .../rolemapping/RestGetRoleMappingsAction.java | 9 +++++++-- .../rolemapping/RestPutRoleMappingAction.java | 9 +++++++-- .../action/user/RestChangePasswordAction.java | 5 +++++ .../rest/action/user/RestDeleteUserAction.java | 5 +++++ .../rest/action/user/RestGetUsersAction.java | 5 +++++ .../rest/action/user/RestHasPrivilegesAction.java | 10 +++++++--- .../rest/action/user/RestPutUserAction.java | 5 +++++ .../rest/action/user/RestSetEnabledAction.java | 6 +++++- .../watcher/rest/action/RestAckWatchAction.java | 5 +++++ .../rest/action/RestActivateWatchAction.java | 10 ++++++++++ .../rest/action/RestDeleteWatchAction.java | 5 +++++ .../rest/action/RestExecuteWatchAction.java | 5 +++++ .../watcher/rest/action/RestGetWatchAction.java | 5 +++++ .../rest/action/RestHijackOperationAction.java | 10 ++++++++++ .../watcher/rest/action/RestPutWatchAction.java | 5 +++++ .../rest/action/RestWatchServiceAction.java | 15 +++++++++++++++ .../rest/action/RestWatcherStatsAction.java | 6 +++++- .../rest/action/SecurityBaseRestHandlerTests.java | 6 ++++++ .../resources/org/elasticsearch/transport/actions | 1 + .../org/elasticsearch/transport/handlers | 1 + 67 files changed, 357 insertions(+), 12 deletions(-) diff --git a/plugin/src/main/java/org/elasticsearch/license/RestDeleteLicenseAction.java b/plugin/src/main/java/org/elasticsearch/license/RestDeleteLicenseAction.java index 6bcd9a883a9..aed273d43b1 100644 --- a/plugin/src/main/java/org/elasticsearch/license/RestDeleteLicenseAction.java +++ b/plugin/src/main/java/org/elasticsearch/license/RestDeleteLicenseAction.java @@ -30,6 +30,11 @@ public class RestDeleteLicenseAction extends XPackRestHandler { deprecationLogger); } + @Override + public String getName() { + return "xpack_delete_license_action"; + } + @Override public RestChannelConsumer doPrepareRequest(final RestRequest request, final XPackClient client) throws IOException { return channel -> client.es().admin().cluster().execute(DeleteLicenseAction.INSTANCE, diff --git a/plugin/src/main/java/org/elasticsearch/license/RestGetLicenseAction.java b/plugin/src/main/java/org/elasticsearch/license/RestGetLicenseAction.java index 4ed5cd87f00..1080074dbe5 100644 --- a/plugin/src/main/java/org/elasticsearch/license/RestGetLicenseAction.java +++ b/plugin/src/main/java/org/elasticsearch/license/RestGetLicenseAction.java @@ -41,6 +41,11 @@ public class RestGetLicenseAction extends XPackRestHandler { deprecationLogger); } + @Override + public String getName() { + return "xpack_get_license_action"; + } + /** * There will be only one license displayed per feature, the selected license will have the latest expiry_date * out of all other licenses for the feature. diff --git a/plugin/src/main/java/org/elasticsearch/license/RestPutLicenseAction.java b/plugin/src/main/java/org/elasticsearch/license/RestPutLicenseAction.java index 41cdb2da96d..f7bb3df0842 100644 --- a/plugin/src/main/java/org/elasticsearch/license/RestPutLicenseAction.java +++ b/plugin/src/main/java/org/elasticsearch/license/RestPutLicenseAction.java @@ -42,6 +42,11 @@ public class RestPutLicenseAction extends XPackRestHandler { deprecationLogger); } + @Override + public String getName() { + return "xpack_put_license_action"; + } + @Override public RestChannelConsumer doPrepareRequest(final RestRequest request, final XPackClient client) throws IOException { PutLicenseRequest putLicenseRequest = new PutLicenseRequest(); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/graph/rest/action/RestGraphAction.java b/plugin/src/main/java/org/elasticsearch/xpack/graph/rest/action/RestGraphAction.java index 14c992d821d..7447c1e3468 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/graph/rest/action/RestGraphAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/graph/rest/action/RestGraphAction.java @@ -69,6 +69,11 @@ public class RestGraphAction extends XPackRestHandler { POST, "/{index}/{type}" + URI_BASE + "/_graph/_explore", deprecationLogger); } + @Override + public String getName() { + return "xpack_graph_action"; + } + @Override public RestChannelConsumer doPrepareRequest(final RestRequest request, final XPackClient client) throws IOException { GraphExploreRequest graphRequest = new GraphExploreRequest(Strings.splitStringByCommaToArray(request.param("index"))); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/RestDeleteExpiredDataAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/RestDeleteExpiredDataAction.java index f816cfefbe4..d985b517ec7 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/RestDeleteExpiredDataAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/RestDeleteExpiredDataAction.java @@ -23,6 +23,11 @@ public class RestDeleteExpiredDataAction extends BaseRestHandler { controller.registerHandler(RestRequest.Method.DELETE, MachineLearning.BASE_PATH + "_delete_expired_data", this); } + @Override + public String getName() { + return "xpack_ml_delete_expired_data_action"; + } + @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { DeleteExpiredDataAction.Request request = new DeleteExpiredDataAction.Request(); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestDeleteDatafeedAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestDeleteDatafeedAction.java index 87cc2fdd72e..64857f8d3f7 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestDeleteDatafeedAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestDeleteDatafeedAction.java @@ -25,6 +25,11 @@ public class RestDeleteDatafeedAction extends BaseRestHandler { + DatafeedConfig.ID.getPreferredName() + "}", this); } + @Override + public String getName() { + return "xpack_ml_delete_datafeed_action"; + } + @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { String datafeedId = restRequest.param(DatafeedConfig.ID.getPreferredName()); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestGetDatafeedStatsAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestGetDatafeedStatsAction.java index 9a8332b03c1..46c8b7ead65 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestGetDatafeedStatsAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestGetDatafeedStatsAction.java @@ -28,6 +28,11 @@ public class RestGetDatafeedStatsAction extends BaseRestHandler { + "datafeeds/_stats", this); } + @Override + public String getName() { + return "xpack_ml_get_datafeed_stats_action"; + } + @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { String datafeedId = restRequest.param(DatafeedConfig.ID.getPreferredName()); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestGetDatafeedsAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestGetDatafeedsAction.java index a1d1d1fd668..f6526a0ca98 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestGetDatafeedsAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestGetDatafeedsAction.java @@ -27,6 +27,11 @@ public class RestGetDatafeedsAction extends BaseRestHandler { + "datafeeds", this); } + @Override + public String getName() { + return "xpack_ml_get_datafeeds_action"; + } + @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { String datafeedId = restRequest.param(DatafeedConfig.ID.getPreferredName()); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestPreviewDatafeedAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestPreviewDatafeedAction.java index 1c105fbf745..aaba03ff449 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestPreviewDatafeedAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestPreviewDatafeedAction.java @@ -25,6 +25,11 @@ public class RestPreviewDatafeedAction extends BaseRestHandler { MachineLearning.BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}/_preview", this); } + @Override + public String getName() { + return "xpack_ml_preview_datafeed_action"; + } + @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { String datafeedId = restRequest.param(DatafeedConfig.ID.getPreferredName()); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestPutDatafeedAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestPutDatafeedAction.java index ed39fa228d5..6a350411e51 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestPutDatafeedAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestPutDatafeedAction.java @@ -26,6 +26,11 @@ public class RestPutDatafeedAction extends BaseRestHandler { + DatafeedConfig.ID.getPreferredName() + "}", this); } + @Override + public String getName() { + return "xpack_ml_put_datafeed_action"; + } + @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { String datafeedId = restRequest.param(DatafeedConfig.ID.getPreferredName()); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestStartDatafeedAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestStartDatafeedAction.java index a21357ab60d..08feeb43389 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestStartDatafeedAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestStartDatafeedAction.java @@ -33,6 +33,11 @@ public class RestStartDatafeedAction extends BaseRestHandler { MachineLearning.BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}/_start", this); } + @Override + public String getName() { + return "xpack_ml_start_datafeed_action"; + } + @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { String datafeedId = restRequest.param(DatafeedConfig.ID.getPreferredName()); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestStopDatafeedAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestStopDatafeedAction.java index db4cba8652f..7ca7ce4bcb6 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestStopDatafeedAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestStopDatafeedAction.java @@ -32,6 +32,11 @@ public class RestStopDatafeedAction extends BaseRestHandler { + DatafeedConfig.ID.getPreferredName() + "}/_stop", this); } + @Override + public String getName() { + return "xpack_ml_stop_datafeed_action"; + } + @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { String datafeedId = restRequest.param(DatafeedConfig.ID.getPreferredName()); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestUpdateDatafeedAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestUpdateDatafeedAction.java index 88a63e67528..cc0cb9c8965 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestUpdateDatafeedAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestUpdateDatafeedAction.java @@ -26,6 +26,11 @@ public class RestUpdateDatafeedAction extends BaseRestHandler { + DatafeedConfig.ID.getPreferredName() + "}/_update", this); } + @Override + public String getName() { + return "xpack_ml_update_datafeed_action"; + } + @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { String datafeedId = restRequest.param(DatafeedConfig.ID.getPreferredName()); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestDeleteFilterAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestDeleteFilterAction.java index 79599adf29c..988ddf42a56 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestDeleteFilterAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestDeleteFilterAction.java @@ -25,6 +25,11 @@ public class RestDeleteFilterAction extends BaseRestHandler { MachineLearning.BASE_PATH + "filters/{" + Request.FILTER_ID.getPreferredName() + "}", this); } + @Override + public String getName() { + return "xpack_ml_delete_filter_action"; + } + @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { Request request = new Request(restRequest.param(Request.FILTER_ID.getPreferredName())); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestGetFiltersAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestGetFiltersAction.java index c405ba9246c..fe7eeed2c4d 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestGetFiltersAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestGetFiltersAction.java @@ -28,6 +28,11 @@ public class RestGetFiltersAction extends BaseRestHandler { controller.registerHandler(RestRequest.Method.GET, MachineLearning.BASE_PATH + "filters/", this); } + @Override + public String getName() { + return "xpack_ml_get_filters_action"; + } + @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { GetFiltersAction.Request getListRequest = new GetFiltersAction.Request(); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestPutFilterAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestPutFilterAction.java index af9c4824f2d..b0230e09e0e 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestPutFilterAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestPutFilterAction.java @@ -26,6 +26,11 @@ public class RestPutFilterAction extends BaseRestHandler { MachineLearning.BASE_PATH + "filters/{" + MlFilter.ID.getPreferredName() + "}", this); } + @Override + public String getName() { + return "xpack_ml_put_filter_action"; + } + @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { String filterId = restRequest.param(MlFilter.ID.getPreferredName()); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestCloseJobAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestCloseJobAction.java index ee901c0bd0f..fbb55c21fcf 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestCloseJobAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestCloseJobAction.java @@ -27,6 +27,11 @@ public class RestCloseJobAction extends BaseRestHandler { + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_close", this); } + @Override + public String getName() { + return "xpack_ml_close_job_action"; + } + @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { Request request = new Request(restRequest.param(Job.ID.getPreferredName())); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestDeleteJobAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestDeleteJobAction.java index 5cc9e3d3a6f..0fc0cfeb1a9 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestDeleteJobAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestDeleteJobAction.java @@ -25,6 +25,11 @@ public class RestDeleteJobAction extends BaseRestHandler { + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}", this); } + @Override + public String getName() { + return "xpack_ml_delete_job_action"; + } + @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { DeleteJobAction.Request deleteJobRequest = new DeleteJobAction.Request(restRequest.param(Job.ID.getPreferredName())); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestFlushJobAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestFlushJobAction.java index e205413f2c9..7b671aff40c 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestFlushJobAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestFlushJobAction.java @@ -31,6 +31,11 @@ public class RestFlushJobAction extends BaseRestHandler { + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_flush", this); } + @Override + public String getName() { + return "xpack_ml_flush_job_action"; + } + @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { String jobId = restRequest.param(Job.ID.getPreferredName()); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestGetJobStatsAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestGetJobStatsAction.java index 4b158bc8098..71427e07ce3 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestGetJobStatsAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestGetJobStatsAction.java @@ -28,6 +28,11 @@ public class RestGetJobStatsAction extends BaseRestHandler { + "anomaly_detectors/_stats", this); } + @Override + public String getName() { + return "xpack_ml_get_job_stats_action"; + } + @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { String jobId = restRequest.param(Job.ID.getPreferredName()); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestGetJobsAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestGetJobsAction.java index f3e5ec4f55f..febe1b6f51c 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestGetJobsAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestGetJobsAction.java @@ -29,6 +29,11 @@ public class RestGetJobsAction extends BaseRestHandler { + "anomaly_detectors", this); } + @Override + public String getName() { + return "xpack_ml_get_jobs_action"; + } + @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { String jobId = restRequest.param(Job.ID.getPreferredName()); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestOpenJobAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestOpenJobAction.java index 754559d6042..3758fc6224a 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestOpenJobAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestOpenJobAction.java @@ -30,6 +30,11 @@ public class RestOpenJobAction extends BaseRestHandler { + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_open", this); } + @Override + public String getName() { + return "xpack_ml_open_job_action"; + } + @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { OpenJobAction.Request request; diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPostDataAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPostDataAction.java index ba26977da7d..758fa8053fb 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPostDataAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPostDataAction.java @@ -28,6 +28,11 @@ public class RestPostDataAction extends BaseRestHandler { + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_data", this); } + @Override + public String getName() { + return "xpack_ml_post_data_action"; + } + @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { PostDataAction.Request request = new PostDataAction.Request(restRequest.param(Job.ID.getPreferredName())); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPostJobUpdateAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPostJobUpdateAction.java index 99475e3c536..52b10ca00a0 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPostJobUpdateAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPostJobUpdateAction.java @@ -25,6 +25,11 @@ public class RestPostJobUpdateAction extends BaseRestHandler { MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_update", this); } + @Override + public String getName() { + return "xpack_ml_post_job_update_action"; + } + @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { String jobId = restRequest.param(Job.ID.getPreferredName()); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPutJobAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPutJobAction.java index 5bbb5664deb..e99afaa4e53 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPutJobAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPutJobAction.java @@ -26,6 +26,11 @@ public class RestPutJobAction extends BaseRestHandler { MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}", this); } + @Override + public String getName() { + return "xpack_ml_put_job_action"; + } + @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { String jobId = restRequest.param(Job.ID.getPreferredName()); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestDeleteModelSnapshotAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestDeleteModelSnapshotAction.java index 3b2d716998c..95d3398fcc0 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestDeleteModelSnapshotAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestDeleteModelSnapshotAction.java @@ -26,6 +26,11 @@ public class RestDeleteModelSnapshotAction extends BaseRestHandler { + Job.ID.getPreferredName() + "}/model_snapshots/{" + ModelSnapshot.SNAPSHOT_ID.getPreferredName() + "}", this); } + @Override + public String getName() { + return "xpack_ml_delete_model_snapshot_action"; + } + @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { DeleteModelSnapshotAction.Request deleteModelSnapshot = new DeleteModelSnapshotAction.Request( diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestGetModelSnapshotsAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestGetModelSnapshotsAction.java index 17a81c14b32..6f0d528864f 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestGetModelSnapshotsAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestGetModelSnapshotsAction.java @@ -48,6 +48,11 @@ public class RestGetModelSnapshotsAction extends BaseRestHandler { + Job.ID.getPreferredName() + "}/model_snapshots", this); } + @Override + public String getName() { + return "xpack_ml_get_model_snapshot_action"; + } + @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { String jobId = restRequest.param(Job.ID.getPreferredName()); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestRevertModelSnapshotAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestRevertModelSnapshotAction.java index 7b5510f1cd9..101179f880b 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestRevertModelSnapshotAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestRevertModelSnapshotAction.java @@ -29,6 +29,11 @@ public class RestRevertModelSnapshotAction extends BaseRestHandler { RevertModelSnapshotAction.Request.SNAPSHOT_ID.getPreferredName() + "}/_revert", this); } + @Override + public String getName() { + return "xpack_ml_revert_model_snapshot_action"; + } + @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { String jobId = restRequest.param(Job.ID.getPreferredName()); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestUpdateModelSnapshotAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestUpdateModelSnapshotAction.java index ec93bdc1a31..0531c85e6eb 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestUpdateModelSnapshotAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestUpdateModelSnapshotAction.java @@ -28,6 +28,11 @@ public class RestUpdateModelSnapshotAction extends BaseRestHandler { this); } + @Override + public String getName() { + return "xpack_ml_update_model_snapshot_action"; + } + @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { XContentParser parser = restRequest.contentParser(); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetBucketsAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetBucketsAction.java index c5b5b7a7e10..a653f272089 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetBucketsAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetBucketsAction.java @@ -37,6 +37,11 @@ public class RestGetBucketsAction extends BaseRestHandler { MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/buckets", this); } + @Override + public String getName() { + return "xpack_ml_get_buckets_action"; + } + @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { String jobId = restRequest.param(Job.ID.getPreferredName()); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetCategoriesAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetCategoriesAction.java index bb468c35139..8eed5fba7a1 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetCategoriesAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetCategoriesAction.java @@ -37,6 +37,11 @@ public class RestGetCategoriesAction extends BaseRestHandler { MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/categories", this); } + @Override + public String getName() { + return "xpack_ml_get_catagories_action"; + } + @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { Request request; diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetInfluencersAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetInfluencersAction.java index 73258b30793..d7ffbda1ea6 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetInfluencersAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetInfluencersAction.java @@ -30,6 +30,11 @@ public class RestGetInfluencersAction extends BaseRestHandler { MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/influencers", this); } + @Override + public String getName() { + return "xpack_ml_get_influencers_action"; + } + @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { String jobId = restRequest.param(Job.ID.getPreferredName()); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetRecordsAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetRecordsAction.java index 055628a3440..5b339992d91 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetRecordsAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetRecordsAction.java @@ -14,9 +14,9 @@ import org.elasticsearch.rest.RestRequest; import org.elasticsearch.rest.action.RestToXContentListener; import org.elasticsearch.xpack.ml.MachineLearning; import org.elasticsearch.xpack.ml.action.GetRecordsAction; +import org.elasticsearch.xpack.ml.action.util.PageParams; import org.elasticsearch.xpack.ml.job.config.Job; import org.elasticsearch.xpack.ml.job.results.AnomalyRecord; -import org.elasticsearch.xpack.ml.action.util.PageParams; import java.io.IOException; @@ -30,6 +30,11 @@ public class RestGetRecordsAction extends BaseRestHandler { + Job.ID.getPreferredName() + "}/results/records", this); } + @Override + public String getName() { + return "xpack_ml_get_records_action"; + } + @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { String jobId = restRequest.param(Job.ID.getPreferredName()); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/validate/RestValidateDetectorAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/validate/RestValidateDetectorAction.java index f6ae0a72551..92fa327e414 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/validate/RestValidateDetectorAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/validate/RestValidateDetectorAction.java @@ -24,6 +24,11 @@ public class RestValidateDetectorAction extends BaseRestHandler { controller.registerHandler(RestRequest.Method.POST, MachineLearning.BASE_PATH + "anomaly_detectors/_validate/detector", this); } + @Override + public String getName() { + return "xpack_ml_validate_detector_action"; + } + @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { XContentParser parser = restRequest.contentOrSourceParamParser(); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/validate/RestValidateJobConfigAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/validate/RestValidateJobConfigAction.java index 096f03981d0..d30d515a830 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/validate/RestValidateJobConfigAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/rest/validate/RestValidateJobConfigAction.java @@ -24,6 +24,11 @@ public class RestValidateJobConfigAction extends BaseRestHandler { controller.registerHandler(RestRequest.Method.POST, MachineLearning.BASE_PATH + "anomaly_detectors/_validate", this); } + @Override + public String getName() { + return "xpack_ml_validate_job_config_action"; + } + @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { XContentParser parser = restRequest.contentOrSourceParamParser(); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/monitoring/rest/action/RestMonitoringBulkAction.java b/plugin/src/main/java/org/elasticsearch/xpack/monitoring/rest/action/RestMonitoringBulkAction.java index 14f83677839..f2fd8fa63e1 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/monitoring/rest/action/RestMonitoringBulkAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/monitoring/rest/action/RestMonitoringBulkAction.java @@ -38,6 +38,11 @@ public class RestMonitoringBulkAction extends MonitoringRestHandler { controller.registerHandler(PUT, URI_BASE + "/{type}/_bulk", this); } + @Override + public String getName() { + return "xpack_monitoring_bulk_action"; + } + @Override public RestChannelConsumer doPrepareRequest(RestRequest request, XPackClient client) throws IOException { String defaultType = request.param("type"); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/rest/action/RestXPackInfoAction.java b/plugin/src/main/java/org/elasticsearch/xpack/rest/action/RestXPackInfoAction.java index b365a838e5c..818005095b5 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/rest/action/RestXPackInfoAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/rest/action/RestXPackInfoAction.java @@ -31,6 +31,11 @@ public class RestXPackInfoAction extends XPackRestHandler { controller.registerHandler(GET, URI_BASE, this); } + @Override + public String getName() { + return "xpack_info_action"; + } + @Override public RestChannelConsumer doPrepareRequest(RestRequest request, XPackClient client) throws IOException { diff --git a/plugin/src/main/java/org/elasticsearch/xpack/rest/action/RestXPackUsageAction.java b/plugin/src/main/java/org/elasticsearch/xpack/rest/action/RestXPackUsageAction.java index 41be0424383..4c2f03ac1ae 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/rest/action/RestXPackUsageAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/rest/action/RestXPackUsageAction.java @@ -31,6 +31,11 @@ public class RestXPackUsageAction extends XPackRestHandler { controller.registerHandler(GET, URI_BASE + "/usage", this); } + @Override + public String getName() { + return "xpack_usage_action"; + } + @Override public RestChannelConsumer doPrepareRequest(RestRequest request, XPackClient client) throws IOException { final TimeValue masterTimeout = request.paramAsTime("master_timeout", MasterNodeRequest.DEFAULT_MASTER_NODE_TIMEOUT); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/RestAuthenticateAction.java b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/RestAuthenticateAction.java index 379ffd3c835..240a0da8e4a 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/RestAuthenticateAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/RestAuthenticateAction.java @@ -43,6 +43,11 @@ public class RestAuthenticateAction extends SecurityBaseRestHandler { deprecationLogger); } + @Override + public String getName() { + return "xpack_security_authenticate_action"; + } + @Override public RestChannelConsumer innerPrepareRequest(RestRequest request, NodeClient client) throws IOException { final User user = securityContext.getUser(); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/oauth2/RestGetTokenAction.java b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/oauth2/RestGetTokenAction.java index dffd2c34749..03e18c8dfe2 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/oauth2/RestGetTokenAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/oauth2/RestGetTokenAction.java @@ -58,6 +58,11 @@ public final class RestGetTokenAction extends SecurityBaseRestHandler { controller.registerHandler(POST, "/_xpack/security/oauth2/token", this); } + @Override + public String getName() { + return "xpack_security_get_token_action"; + } + @Override protected RestChannelConsumer innerPrepareRequest(RestRequest request, NodeClient client)throws IOException { try (XContentParser parser = request.contentParser()) { diff --git a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/oauth2/RestInvalidateTokenAction.java b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/oauth2/RestInvalidateTokenAction.java index e6a1199d372..b4d29736cfd 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/oauth2/RestInvalidateTokenAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/oauth2/RestInvalidateTokenAction.java @@ -43,6 +43,11 @@ public final class RestInvalidateTokenAction extends SecurityBaseRestHandler { controller.registerHandler(DELETE, "/_xpack/security/oauth2/token", this); } + @Override + public String getName() { + return "xpack_security_invalidate_token_action"; + } + @Override protected RestChannelConsumer innerPrepareRequest(RestRequest request, NodeClient client) throws IOException { try (XContentParser parser = request.contentParser()) { diff --git a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/realm/RestClearRealmCacheAction.java b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/realm/RestClearRealmCacheAction.java index 7b488cd0d36..7ea868e3a41 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/realm/RestClearRealmCacheAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/realm/RestClearRealmCacheAction.java @@ -36,6 +36,11 @@ public final class RestClearRealmCacheAction extends SecurityBaseRestHandler { deprecationLogger); } + @Override + public String getName() { + return "xpack_security_clear_realm_cache_action"; + } + @Override public RestChannelConsumer innerPrepareRequest(RestRequest request, NodeClient client) throws IOException { String[] realms = request.paramAsStringArrayOrEmptyIfAll("realms"); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestClearRolesCacheAction.java b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestClearRolesCacheAction.java index 100b8587354..99368dbe5d8 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestClearRolesCacheAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestClearRolesCacheAction.java @@ -32,6 +32,11 @@ public final class RestClearRolesCacheAction extends SecurityBaseRestHandler { deprecationLogger); } + @Override + public String getName() { + return "xpack_security_clear_roles_cache_action"; + } + @Override public RestChannelConsumer innerPrepareRequest(RestRequest request, NodeClient client) throws IOException { String[] roles = request.paramAsStringArrayOrEmptyIfAll("name"); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestDeleteRoleAction.java b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestDeleteRoleAction.java index 37f0598c280..c42bd02ebdd 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestDeleteRoleAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestDeleteRoleAction.java @@ -39,6 +39,11 @@ public class RestDeleteRoleAction extends SecurityBaseRestHandler { deprecationLogger); } + @Override + public String getName() { + return "xpack_security_delete_role_action"; + } + @Override public RestChannelConsumer innerPrepareRequest(RestRequest request, NodeClient client) throws IOException { final String name = request.param("name"); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestGetRolesAction.java b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestGetRolesAction.java index 9673896174a..1ef5bb0e2d1 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestGetRolesAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestGetRolesAction.java @@ -45,6 +45,11 @@ public class RestGetRolesAction extends SecurityBaseRestHandler { deprecationLogger); } + @Override + public String getName() { + return "xpack_security_get_roles_action"; + } + @Override public RestChannelConsumer innerPrepareRequest(RestRequest request, NodeClient client) throws IOException { final String[] roles = request.paramAsStringArray("name", Strings.EMPTY_ARRAY); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestPutRoleAction.java b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestPutRoleAction.java index 18007c15020..544052e1a0e 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestPutRoleAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestPutRoleAction.java @@ -46,6 +46,11 @@ public class RestPutRoleAction extends SecurityBaseRestHandler { deprecationLogger); } + @Override + public String getName() { + return "xpack_security_put_role_action"; + } + @Override public RestChannelConsumer innerPrepareRequest(RestRequest request, NodeClient client) throws IOException { PutRoleRequestBuilder requestBuilder = new SecurityClient(client) diff --git a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/rolemapping/RestDeleteRoleMappingAction.java b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/rolemapping/RestDeleteRoleMappingAction.java index d9175131bb0..4f3037b0b8a 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/rolemapping/RestDeleteRoleMappingAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/rolemapping/RestDeleteRoleMappingAction.java @@ -5,8 +5,6 @@ */ package org.elasticsearch.xpack.security.rest.action.rolemapping; -import java.io.IOException; - import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -21,6 +19,8 @@ import org.elasticsearch.xpack.security.action.rolemapping.DeleteRoleMappingResp import org.elasticsearch.xpack.security.client.SecurityClient; import org.elasticsearch.xpack.security.rest.action.SecurityBaseRestHandler; +import java.io.IOException; + import static org.elasticsearch.rest.RestRequest.Method.DELETE; /** @@ -33,6 +33,11 @@ public class RestDeleteRoleMappingAction extends SecurityBaseRestHandler { controller.registerHandler(DELETE, "/_xpack/security/role_mapping/{name}", this); } + @Override + public String getName() { + return "xpack_security_delete_role_mapping_action"; + } + @Override public RestChannelConsumer innerPrepareRequest(RestRequest request, NodeClient client) throws IOException { final String name = request.param("name"); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/rolemapping/RestGetRoleMappingsAction.java b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/rolemapping/RestGetRoleMappingsAction.java index ac999ac84d0..263836cb12d 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/rolemapping/RestGetRoleMappingsAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/rolemapping/RestGetRoleMappingsAction.java @@ -5,8 +5,6 @@ */ package org.elasticsearch.xpack.security.rest.action.rolemapping; -import java.io.IOException; - import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -22,6 +20,8 @@ import org.elasticsearch.xpack.security.authc.support.mapper.ExpressionRoleMappi import org.elasticsearch.xpack.security.client.SecurityClient; import org.elasticsearch.xpack.security.rest.action.SecurityBaseRestHandler; +import java.io.IOException; + import static org.elasticsearch.rest.RestRequest.Method.GET; /** @@ -35,6 +35,11 @@ public class RestGetRoleMappingsAction extends SecurityBaseRestHandler { controller.registerHandler(GET, "/_xpack/security/role_mapping/{name}", this); } + @Override + public String getName() { + return "xpack_security_get_role_mappings_action"; + } + @Override public RestChannelConsumer innerPrepareRequest(RestRequest request, NodeClient client) throws IOException { final String[] names = request.paramAsStringArrayOrEmptyIfAll("name"); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/rolemapping/RestPutRoleMappingAction.java b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/rolemapping/RestPutRoleMappingAction.java index 6ef896b3b98..b4497622519 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/rolemapping/RestPutRoleMappingAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/rolemapping/RestPutRoleMappingAction.java @@ -5,8 +5,6 @@ */ package org.elasticsearch.xpack.security.rest.action.rolemapping; -import java.io.IOException; - import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -22,6 +20,8 @@ import org.elasticsearch.xpack.security.action.rolemapping.PutRoleMappingRespons import org.elasticsearch.xpack.security.client.SecurityClient; import org.elasticsearch.xpack.security.rest.action.SecurityBaseRestHandler; +import java.io.IOException; + import static org.elasticsearch.rest.RestRequest.Method.POST; import static org.elasticsearch.rest.RestRequest.Method.PUT; @@ -38,6 +38,11 @@ public class RestPutRoleMappingAction extends SecurityBaseRestHandler { controller.registerHandler(PUT, "/_xpack/security/role_mapping/{name}", this); } + @Override + public String getName() { + return "xpack_security_put_role_mappings_action"; + } + @Override public RestChannelConsumer innerPrepareRequest(RestRequest request, NodeClient client) throws IOException { final String name = request.param("name"); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestChangePasswordAction.java b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestChangePasswordAction.java index b3bfb02802b..47c3e8c1c14 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestChangePasswordAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestChangePasswordAction.java @@ -43,6 +43,11 @@ public class RestChangePasswordAction extends SecurityBaseRestHandler implements controller.registerHandler(PUT, "/_xpack/security/user/_password", this); } + @Override + public String getName() { + return "xpack_security_change_password_action"; + } + @Override public RestChannelConsumer innerPrepareRequest(RestRequest request, NodeClient client) throws IOException { final User user = securityContext.getUser(); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestDeleteUserAction.java b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestDeleteUserAction.java index a70c7ad9f4d..322e14d2466 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestDeleteUserAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestDeleteUserAction.java @@ -39,6 +39,11 @@ public class RestDeleteUserAction extends SecurityBaseRestHandler { deprecationLogger); } + @Override + public String getName() { + return "xpack_security_delete_user_action"; + } + @Override public RestChannelConsumer innerPrepareRequest(RestRequest request, NodeClient client) throws IOException { final String username = request.param("username"); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestGetUsersAction.java b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestGetUsersAction.java index de48618e8c6..375f4c98e91 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestGetUsersAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestGetUsersAction.java @@ -46,6 +46,11 @@ public class RestGetUsersAction extends SecurityBaseRestHandler { deprecationLogger); } + @Override + public String getName() { + return "xpack_security_get_users_action"; + } + @Override public RestChannelConsumer innerPrepareRequest(RestRequest request, NodeClient client) throws IOException { String[] usernames = request.paramAsStringArray("username", Strings.EMPTY_ARRAY); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestHasPrivilegesAction.java b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestHasPrivilegesAction.java index ab36fd9544c..4a37c7e5051 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestHasPrivilegesAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestHasPrivilegesAction.java @@ -5,8 +5,6 @@ */ package org.elasticsearch.xpack.security.rest.action.user; -import java.io.IOException; - import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -23,7 +21,8 @@ import org.elasticsearch.xpack.security.action.user.HasPrivilegesRequestBuilder; import org.elasticsearch.xpack.security.action.user.HasPrivilegesResponse; import org.elasticsearch.xpack.security.client.SecurityClient; import org.elasticsearch.xpack.security.rest.action.SecurityBaseRestHandler; -import org.elasticsearch.xpack.security.user.User; + +import java.io.IOException; import static org.elasticsearch.rest.RestRequest.Method.GET; import static org.elasticsearch.rest.RestRequest.Method.POST; @@ -46,6 +45,11 @@ public class RestHasPrivilegesAction extends SecurityBaseRestHandler { controller.registerHandler(POST, "/_xpack/security/user/_has_privileges", this); } + @Override + public String getName() { + return "xpack_security_has_priviledges_action"; + } + @Override public RestChannelConsumer innerPrepareRequest(RestRequest request, NodeClient client) throws IOException { final String username = getUsername(request); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestPutUserAction.java b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestPutUserAction.java index f095735dfa6..0d52a8e0cc9 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestPutUserAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestPutUserAction.java @@ -50,6 +50,11 @@ public class RestPutUserAction extends SecurityBaseRestHandler implements RestRe deprecationLogger); } + @Override + public String getName() { + return "xpack_security_put_user_action"; + } + @Override public RestChannelConsumer innerPrepareRequest(RestRequest request, NodeClient client) throws IOException { PutUserRequestBuilder requestBuilder = new SecurityClient(client) diff --git a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestSetEnabledAction.java b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestSetEnabledAction.java index 0956af9fb17..2748125b396 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestSetEnabledAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestSetEnabledAction.java @@ -9,7 +9,6 @@ import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.license.XPackLicenseState; -import org.elasticsearch.rest.BaseRestHandler; import org.elasticsearch.rest.BytesRestResponse; import org.elasticsearch.rest.RestController; import org.elasticsearch.rest.RestRequest; @@ -39,6 +38,11 @@ public class RestSetEnabledAction extends SecurityBaseRestHandler { controller.registerHandler(PUT, "/_xpack/security/user/{username}/_disable", this); } + @Override + public String getName() { + return "xpack_security_set_enabled_action"; + } + @Override public RestChannelConsumer innerPrepareRequest(RestRequest request, NodeClient client) throws IOException { final boolean enabled = request.path().endsWith("_enable"); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestAckWatchAction.java b/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestAckWatchAction.java index 323a3e0a340..dcb329ad6a1 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestAckWatchAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestAckWatchAction.java @@ -53,6 +53,11 @@ public class RestAckWatchAction extends WatcherRestHandler { deprecationLogger); } + @Override + public String getName() { + return "xpack_watcher_ack_watch_action"; + } + @Override public RestChannelConsumer doPrepareRequest(RestRequest request, WatcherClient client) throws IOException { AckWatchRequest ackWatchRequest = new AckWatchRequest(request.param("id")); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestActivateWatchAction.java b/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestActivateWatchAction.java index 66f7e293c92..101952510a8 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestActivateWatchAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestActivateWatchAction.java @@ -45,6 +45,11 @@ public class RestActivateWatchAction extends WatcherRestHandler { PUT, "/_watcher/watch/{id}/_deactivate", deprecationLogger); } + @Override + public String getName() { + return "xpack_watcher_activate_watch_action"; + } + @Override public RestChannelConsumer doPrepareRequest(RestRequest request, WatcherClient client) throws IOException { String watchId = request.param("id"); @@ -65,6 +70,11 @@ public class RestActivateWatchAction extends WatcherRestHandler { super(settings); } + @Override + public String getName() { + return "xpack_watcher_deactivate_watch_action"; + } + @Override public RestChannelConsumer doPrepareRequest(RestRequest request, WatcherClient client) throws IOException { String watchId = request.param("id"); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestDeleteWatchAction.java b/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestDeleteWatchAction.java index b8059b5eb94..075d2e53a57 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestDeleteWatchAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestDeleteWatchAction.java @@ -32,6 +32,11 @@ public class RestDeleteWatchAction extends WatcherRestHandler { DELETE, "/_watcher/watch/{id}", deprecationLogger); } + @Override + public String getName() { + return "xpack_watcher_delete_watch_action"; + } + @Override protected RestChannelConsumer doPrepareRequest(final RestRequest request, WatcherClient client) throws IOException { DeleteWatchRequest deleteWatchRequest = new DeleteWatchRequest(request.param("id")); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestExecuteWatchAction.java b/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestExecuteWatchAction.java index 5e334390b46..463fa30f130 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestExecuteWatchAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestExecuteWatchAction.java @@ -52,6 +52,11 @@ public class RestExecuteWatchAction extends WatcherRestHandler implements RestRe PUT, "/_watcher/watch/_execute", deprecationLogger); } + @Override + public String getName() { + return "xpack_watcher_execute_watch_action"; + } + @Override protected RestChannelConsumer doPrepareRequest(final RestRequest request, WatcherClient client) throws IOException { ExecuteWatchRequest executeWatchRequest = parseRequest(request, client); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestGetWatchAction.java b/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestGetWatchAction.java index d5d197678c5..1e730a16087 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestGetWatchAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestGetWatchAction.java @@ -34,6 +34,11 @@ public class RestGetWatchAction extends WatcherRestHandler { GET, "/_watcher/watch/{id}", deprecationLogger); } + @Override + public String getName() { + return "xpack_watcher_get_watch_action"; + } + @Override protected RestChannelConsumer doPrepareRequest(final RestRequest request, WatcherClient client) throws IOException { final GetWatchRequest getWatchRequest = new GetWatchRequest(request.param("id")); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestHijackOperationAction.java b/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestHijackOperationAction.java index e7486c0f39d..eaeeff48ed3 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestHijackOperationAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestHijackOperationAction.java @@ -49,6 +49,11 @@ public class RestHijackOperationAction extends WatcherRestHandler { } } + @Override + public String getName() { + return "xpack_watcher_hijack_operation_action"; + } + @Override public RestChannelConsumer doPrepareRequest(RestRequest request, WatcherClient client) throws IOException { // we have to consume the id parameter lest the request will fail for the wrong reason @@ -73,6 +78,11 @@ public class RestHijackOperationAction extends WatcherRestHandler { super(settings); } + @Override + public String getName() { + return "xpack_watcher_unsupported_action"; + } + @Override public RestChannelConsumer doPrepareRequest(RestRequest request, WatcherClient client) throws IOException { // we have to consume the id parameter lest the request will fail for the wrong reason diff --git a/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestPutWatchAction.java b/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestPutWatchAction.java index 7eaa85c960a..90ba05013dd 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestPutWatchAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestPutWatchAction.java @@ -41,6 +41,11 @@ public class RestPutWatchAction extends WatcherRestHandler implements RestReques PUT, "/_watcher/watch/{id}", deprecationLogger); } + @Override + public String getName() { + return "xpack_watcher_put_watch_action"; + } + @Override protected RestChannelConsumer doPrepareRequest(final RestRequest request, WatcherClient client) throws IOException { PutWatchRequest putWatchRequest = diff --git a/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestWatchServiceAction.java b/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestWatchServiceAction.java index ed27c22a6e3..16b54e88215 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestWatchServiceAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestWatchServiceAction.java @@ -35,6 +35,11 @@ public class RestWatchServiceAction extends WatcherRestHandler { new StopRestHandler(settings), PUT, "/_watcher/_stop", deprecationLogger); } + @Override + public String getName() { + return "xpack_watcher_service_action"; + } + @Override public RestChannelConsumer doPrepareRequest(RestRequest request, WatcherClient client) throws IOException { @@ -58,6 +63,11 @@ public class RestWatchServiceAction extends WatcherRestHandler { super(settings); } + @Override + public String getName() { + return "xpack_watcher_start_service_action"; + } + @Override public RestChannelConsumer doPrepareRequest(RestRequest request, WatcherClient client) throws IOException { @@ -72,6 +82,11 @@ public class RestWatchServiceAction extends WatcherRestHandler { super(settings); } + @Override + public String getName() { + return "xpack_watcher_stop_service_action"; + } + @Override public RestChannelConsumer doPrepareRequest(RestRequest request, WatcherClient client) throws IOException { diff --git a/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestWatcherStatsAction.java b/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestWatcherStatsAction.java index 98eadf45e52..a36c1ac4b1b 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestWatcherStatsAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestWatcherStatsAction.java @@ -13,7 +13,6 @@ import org.elasticsearch.rest.action.RestActions; import org.elasticsearch.xpack.watcher.client.WatcherClient; import org.elasticsearch.xpack.watcher.rest.WatcherRestHandler; import org.elasticsearch.xpack.watcher.transport.actions.stats.WatcherStatsRequest; -import org.elasticsearch.xpack.watcher.transport.actions.stats.WatcherStatsResponse; import java.io.IOException; import java.util.Set; @@ -31,6 +30,11 @@ public class RestWatcherStatsAction extends WatcherRestHandler { GET, "/_watcher/stats/{metric}", deprecationLogger); } + @Override + public String getName() { + return "xpack_watcher_stats_action"; + } + @Override protected RestChannelConsumer doPrepareRequest(final RestRequest restRequest, WatcherClient client) throws IOException { Set metrics = Strings.splitStringByCommaToSet(restRequest.param("metric", "")); diff --git a/plugin/src/test/java/org/elasticsearch/xpack/security/rest/action/SecurityBaseRestHandlerTests.java b/plugin/src/test/java/org/elasticsearch/xpack/security/rest/action/SecurityBaseRestHandlerTests.java index 6c5307ccb35..a7111846899 100644 --- a/plugin/src/test/java/org/elasticsearch/xpack/security/rest/action/SecurityBaseRestHandlerTests.java +++ b/plugin/src/test/java/org/elasticsearch/xpack/security/rest/action/SecurityBaseRestHandlerTests.java @@ -29,6 +29,12 @@ public class SecurityBaseRestHandlerTests extends ESTestCase { final XPackLicenseState licenseState = mock(XPackLicenseState.class); when(licenseState.isAuthAllowed()).thenReturn(securityEnabled); SecurityBaseRestHandler handler = new SecurityBaseRestHandler(Settings.EMPTY, licenseState) { + + @Override + public String getName() { + return "test_xpack_security_base_action"; + } + @Override protected RestChannelConsumer innerPrepareRequest(RestRequest request, NodeClient client) throws IOException { return channel -> { diff --git a/plugin/src/test/resources/org/elasticsearch/transport/actions b/plugin/src/test/resources/org/elasticsearch/transport/actions index 49b2a989df0..8b06ffc4f3f 100644 --- a/plugin/src/test/resources/org/elasticsearch/transport/actions +++ b/plugin/src/test/resources/org/elasticsearch/transport/actions @@ -16,6 +16,7 @@ cluster:monitor/main cluster:monitor/nodes/hot_threads cluster:monitor/nodes/info cluster:monitor/nodes/stats +cluster:monitor/nodes/usage cluster:monitor/remote/info cluster:monitor/state cluster:monitor/stats diff --git a/plugin/src/test/resources/org/elasticsearch/transport/handlers b/plugin/src/test/resources/org/elasticsearch/transport/handlers index 48efbc9a75f..a70d857fb1f 100644 --- a/plugin/src/test/resources/org/elasticsearch/transport/handlers +++ b/plugin/src/test/resources/org/elasticsearch/transport/handlers @@ -7,6 +7,7 @@ cluster:monitor/nodes/hot_threads[n] cluster:monitor/nodes/info[n] cluster:monitor/nodes/liveness cluster:monitor/nodes/stats[n] +cluster:monitor/nodes/usage[n] cluster:monitor/stats[n] cluster:monitor/tasks/lists[n] cluster:admin/xpack/security/realm/cache/clear