diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/CloseJobAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/CloseJobAction.java index b07742a2b9a..e4b969bcec3 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/CloseJobAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/CloseJobAction.java @@ -52,7 +52,7 @@ import java.util.Optional; public class CloseJobAction extends Action { public static final CloseJobAction INSTANCE = new CloseJobAction(); - public static final String NAME = "cluster:admin/ml/job/close"; + public static final String NAME = "cluster:admin/xpack/ml/job/close"; private CloseJobAction() { super(NAME); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/DeleteDatafeedAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/DeleteDatafeedAction.java index fb2f2c749c0..b68076b422a 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/DeleteDatafeedAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/DeleteDatafeedAction.java @@ -41,7 +41,7 @@ public class DeleteDatafeedAction extends Action { public static final DeleteDatafeedAction INSTANCE = new DeleteDatafeedAction(); - public static final String NAME = "cluster:admin/ml/datafeeds/delete"; + public static final String NAME = "cluster:admin/xpack/ml/datafeeds/delete"; private DeleteDatafeedAction() { super(NAME); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/DeleteExpiredDataAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/DeleteExpiredDataAction.java index d64df224043..09eedbded71 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/DeleteExpiredDataAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/DeleteExpiredDataAction.java @@ -37,7 +37,7 @@ public class DeleteExpiredDataAction extends Action { public static final DeleteExpiredDataAction INSTANCE = new DeleteExpiredDataAction(); - public static final String NAME = "cluster:admin/ml/delete_expired_data"; + public static final String NAME = "cluster:admin/xpack/ml/delete_expired_data"; private DeleteExpiredDataAction() { super(NAME); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/DeleteFilterAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/DeleteFilterAction.java index 29aff1d5669..a8ef60ce58d 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/DeleteFilterAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/DeleteFilterAction.java @@ -50,7 +50,7 @@ import java.util.Objects; public class DeleteFilterAction extends Action { public static final DeleteFilterAction INSTANCE = new DeleteFilterAction(); - public static final String NAME = "cluster:admin/ml/filters/delete"; + public static final String NAME = "cluster:admin/xpack/ml/filters/delete"; private DeleteFilterAction() { super(NAME); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/DeleteJobAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/DeleteJobAction.java index acea29e02b2..24a7f8a9643 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/DeleteJobAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/DeleteJobAction.java @@ -38,7 +38,7 @@ import java.util.Objects; public class DeleteJobAction extends Action { public static final DeleteJobAction INSTANCE = new DeleteJobAction(); - public static final String NAME = "cluster:admin/ml/job/delete"; + public static final String NAME = "cluster:admin/xpack/ml/job/delete"; private DeleteJobAction() { super(NAME); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/DeleteModelSnapshotAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/DeleteModelSnapshotAction.java index 1e274a39ef1..9c15f16c031 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/DeleteModelSnapshotAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/DeleteModelSnapshotAction.java @@ -42,7 +42,7 @@ public class DeleteModelSnapshotAction extends Action { public static final DeleteModelSnapshotAction INSTANCE = new DeleteModelSnapshotAction(); - public static final String NAME = "cluster:admin/ml/job/model_snapshots/delete"; + public static final String NAME = "cluster:admin/xpack/ml/job/model_snapshots/delete"; private DeleteModelSnapshotAction() { super(NAME); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/FinalizeJobExecutionAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/FinalizeJobExecutionAction.java index c29e021f643..c547191fcec 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/FinalizeJobExecutionAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/FinalizeJobExecutionAction.java @@ -37,7 +37,7 @@ public class FinalizeJobExecutionAction extends Action { public static final FinalizeJobExecutionAction INSTANCE = new FinalizeJobExecutionAction(); - public static final String NAME = "cluster:internal/ml/job/finalize_job_execution"; + public static final String NAME = "cluster:internal/xpack/ml/job/finalize_job_execution"; private FinalizeJobExecutionAction() { super(NAME); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/FlushJobAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/FlushJobAction.java index 0cdfb6db844..3e8cf8efd43 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/FlushJobAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/FlushJobAction.java @@ -38,7 +38,7 @@ import java.util.Objects; public class FlushJobAction extends Action { public static final FlushJobAction INSTANCE = new FlushJobAction(); - public static final String NAME = "cluster:admin/ml/job/flush"; + public static final String NAME = "cluster:admin/xpack/ml/job/flush"; private FlushJobAction() { super(NAME); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetBucketsAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetBucketsAction.java index 1367ee4ee57..e60e99d299b 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetBucketsAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetBucketsAction.java @@ -45,7 +45,7 @@ import java.util.Objects; public class GetBucketsAction extends Action { public static final GetBucketsAction INSTANCE = new GetBucketsAction(); - public static final String NAME = "cluster:monitor/ml/job/results/buckets/get"; + public static final String NAME = "cluster:monitor/xpack/ml/job/results/buckets/get"; private GetBucketsAction() { super(NAME); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetCategoriesAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetCategoriesAction.java index fe510c4d747..5149f6852a4 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetCategoriesAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetCategoriesAction.java @@ -44,7 +44,7 @@ public class GetCategoriesAction extends Action { public static final GetCategoriesAction INSTANCE = new GetCategoriesAction(); - public static final String NAME = "cluster:monitor/ml/job/results/categories/get"; + public static final String NAME = "cluster:monitor/xpack/ml/job/results/categories/get"; private GetCategoriesAction() { super(NAME); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetDatafeedsAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetDatafeedsAction.java index 9f9287e3b16..8fdf1c52129 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetDatafeedsAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetDatafeedsAction.java @@ -43,7 +43,7 @@ public class GetDatafeedsAction extends Action { public static final GetDatafeedsAction INSTANCE = new GetDatafeedsAction(); - public static final String NAME = "cluster:monitor/ml/datafeeds/get"; + public static final String NAME = "cluster:monitor/xpack/ml/datafeeds/get"; public static final String ALL = "_all"; diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetDatafeedsStatsAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetDatafeedsStatsAction.java index 68acd1248da..42cb81dbd6f 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetDatafeedsStatsAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetDatafeedsStatsAction.java @@ -54,7 +54,7 @@ public class GetDatafeedsStatsAction extends Action { public static final GetDatafeedsStatsAction INSTANCE = new GetDatafeedsStatsAction(); - public static final String NAME = "cluster:monitor/ml/datafeeds/stats/get"; + public static final String NAME = "cluster:monitor/xpack/ml/datafeeds/stats/get"; public static final String ALL = "_all"; private static final String STATE = "state"; diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetFiltersAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetFiltersAction.java index dd7db660189..ec7749a59d3 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetFiltersAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetFiltersAction.java @@ -57,7 +57,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; public class GetFiltersAction extends Action { public static final GetFiltersAction INSTANCE = new GetFiltersAction(); - public static final String NAME = "cluster:admin/ml/filters/get"; + public static final String NAME = "cluster:admin/xpack/ml/filters/get"; private GetFiltersAction() { super(NAME); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetInfluencersAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetInfluencersAction.java index ea549cd36b2..3031ddb0aaa 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetInfluencersAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetInfluencersAction.java @@ -44,7 +44,7 @@ public class GetInfluencersAction extends Action { public static final GetInfluencersAction INSTANCE = new GetInfluencersAction(); - public static final String NAME = "cluster:monitor/ml/job/results/influencers/get"; + public static final String NAME = "cluster:monitor/xpack/ml/job/results/influencers/get"; private GetInfluencersAction() { super(NAME); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetJobsAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetJobsAction.java index a377ed168ac..1c1d123a9b3 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetJobsAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetJobsAction.java @@ -39,7 +39,7 @@ import java.util.Objects; public class GetJobsAction extends Action { public static final GetJobsAction INSTANCE = new GetJobsAction(); - public static final String NAME = "cluster:monitor/ml/job/get"; + public static final String NAME = "cluster:monitor/xpack/ml/job/get"; private GetJobsAction() { super(NAME); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetJobsStatsAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetJobsStatsAction.java index 24f06cb1265..fb860cf96f9 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetJobsStatsAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetJobsStatsAction.java @@ -64,7 +64,7 @@ import java.util.stream.Collectors; public class GetJobsStatsAction extends Action { public static final GetJobsStatsAction INSTANCE = new GetJobsStatsAction(); - public static final String NAME = "cluster:monitor/ml/job/stats/get"; + public static final String NAME = "cluster:monitor/xpack/ml/job/stats/get"; private static final String DATA_COUNTS = "data_counts"; private static final String MODEL_SIZE_STATS = "model_size_stats"; diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetModelSnapshotsAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetModelSnapshotsAction.java index ed4aac37fc5..a16b1e21d68 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetModelSnapshotsAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetModelSnapshotsAction.java @@ -44,7 +44,7 @@ public class GetModelSnapshotsAction extends Action { public static final GetModelSnapshotsAction INSTANCE = new GetModelSnapshotsAction(); - public static final String NAME = "cluster:monitor/ml/job/model_snapshots/get"; + public static final String NAME = "cluster:monitor/xpack/ml/job/model_snapshots/get"; private GetModelSnapshotsAction() { super(NAME); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetRecordsAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetRecordsAction.java index a436ef7b1b7..d77dfd1900b 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetRecordsAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetRecordsAction.java @@ -45,7 +45,7 @@ import java.util.Objects; public class GetRecordsAction extends Action { public static final GetRecordsAction INSTANCE = new GetRecordsAction(); - public static final String NAME = "cluster:monitor/ml/job/results/records/get"; + public static final String NAME = "cluster:monitor/xpack/ml/job/results/records/get"; private GetRecordsAction() { super(NAME); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/OpenJobAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/OpenJobAction.java index e9cf0707fb0..3a5442dbdf1 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/OpenJobAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/OpenJobAction.java @@ -70,7 +70,7 @@ import static org.elasticsearch.xpack.ml.job.process.autodetect.AutodetectProces public class OpenJobAction extends Action { public static final OpenJobAction INSTANCE = new OpenJobAction(); - public static final String NAME = "cluster:admin/ml/job/open"; + public static final String NAME = "cluster:admin/xpack/ml/job/open"; private OpenJobAction() { super(NAME); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/PostDataAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/PostDataAction.java index 9f0300204b9..6d999eee4de 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/PostDataAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/PostDataAction.java @@ -40,7 +40,7 @@ import java.util.Optional; public class PostDataAction extends Action { public static final PostDataAction INSTANCE = new PostDataAction(); - public static final String NAME = "cluster:admin/ml/job/data/post"; + public static final String NAME = "cluster:admin/xpack/ml/job/data/post"; private PostDataAction() { super(NAME); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/PreviewDatafeedAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/PreviewDatafeedAction.java index ea151523a03..7dc06ce7fb4 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/PreviewDatafeedAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/PreviewDatafeedAction.java @@ -51,7 +51,7 @@ public class PreviewDatafeedAction extends Action { public static final PreviewDatafeedAction INSTANCE = new PreviewDatafeedAction(); - public static final String NAME = "cluster:admin/ml/datafeeds/preview"; + public static final String NAME = "cluster:admin/xpack/ml/datafeeds/preview"; private PreviewDatafeedAction() { super(NAME); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/PutDatafeedAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/PutDatafeedAction.java index 57127a5d76e..ee26de59f70 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/PutDatafeedAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/PutDatafeedAction.java @@ -56,7 +56,7 @@ import java.util.Objects; public class PutDatafeedAction extends Action { public static final PutDatafeedAction INSTANCE = new PutDatafeedAction(); - public static final String NAME = "cluster:admin/ml/datafeeds/put"; + public static final String NAME = "cluster:admin/xpack/ml/datafeeds/put"; private PutDatafeedAction() { super(NAME); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/PutFilterAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/PutFilterAction.java index 1bcc67b7512..7d73bcff294 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/PutFilterAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/PutFilterAction.java @@ -44,7 +44,7 @@ import java.util.Objects; public class PutFilterAction extends Action { public static final PutFilterAction INSTANCE = new PutFilterAction(); - public static final String NAME = "cluster:admin/ml/filters/put"; + public static final String NAME = "cluster:admin/xpack/ml/filters/put"; private PutFilterAction() { super(NAME); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/PutJobAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/PutJobAction.java index af612539486..411f2f75371 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/PutJobAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/PutJobAction.java @@ -45,7 +45,7 @@ import java.util.Objects; public class PutJobAction extends Action { public static final PutJobAction INSTANCE = new PutJobAction(); - public static final String NAME = "cluster:admin/ml/job/put"; + public static final String NAME = "cluster:admin/xpack/ml/job/put"; private PutJobAction() { super(NAME); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/RevertModelSnapshotAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/RevertModelSnapshotAction.java index f19fa451cf5..912dc715b36 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/RevertModelSnapshotAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/RevertModelSnapshotAction.java @@ -55,7 +55,7 @@ public class RevertModelSnapshotAction extends Action { public static final RevertModelSnapshotAction INSTANCE = new RevertModelSnapshotAction(); - public static final String NAME = "cluster:admin/ml/job/model_snapshots/revert"; + public static final String NAME = "cluster:admin/xpack/ml/job/model_snapshots/revert"; private RevertModelSnapshotAction() { super(NAME); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/StartDatafeedAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/StartDatafeedAction.java index 2d0cd26c6e4..19d7db12abf 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/StartDatafeedAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/StartDatafeedAction.java @@ -75,7 +75,7 @@ public class StartDatafeedAction public static final ParseField TIMEOUT = new ParseField("timeout"); public static final StartDatafeedAction INSTANCE = new StartDatafeedAction(); - public static final String NAME = "cluster:admin/ml/datafeeds/start"; + public static final String NAME = "cluster:admin/xpack/ml/datafeeds/start"; private StartDatafeedAction() { super(NAME); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/StopDatafeedAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/StopDatafeedAction.java index 4f01cc08a1e..da192ecc8dd 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/StopDatafeedAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/StopDatafeedAction.java @@ -54,7 +54,7 @@ public class StopDatafeedAction extends Action { public static final StopDatafeedAction INSTANCE = new StopDatafeedAction(); - public static final String NAME = "cluster:admin/ml/datafeeds/stop"; + public static final String NAME = "cluster:admin/xpack/ml/datafeeds/stop"; public static final ParseField TIMEOUT = new ParseField("timeout"); public static final ParseField FORCE = new ParseField("force"); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/UpdateDatafeedAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/UpdateDatafeedAction.java index 92e1044912e..3dceeeb03f8 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/UpdateDatafeedAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/UpdateDatafeedAction.java @@ -41,7 +41,7 @@ public class UpdateDatafeedAction extends Action { public static final UpdateDatafeedAction INSTANCE = new UpdateDatafeedAction(); - public static final String NAME = "cluster:admin/ml/datafeeds/update"; + public static final String NAME = "cluster:admin/xpack/ml/datafeeds/update"; private UpdateDatafeedAction() { super(NAME); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/UpdateJobAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/UpdateJobAction.java index 1950f43f427..4856e0ab266 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/UpdateJobAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/UpdateJobAction.java @@ -38,7 +38,7 @@ import java.util.Objects; public class UpdateJobAction extends Action { public static final UpdateJobAction INSTANCE = new UpdateJobAction(); - public static final String NAME = "cluster:admin/ml/job/update"; + public static final String NAME = "cluster:admin/xpack/ml/job/update"; private UpdateJobAction() { super(NAME); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/UpdateModelSnapshotAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/UpdateModelSnapshotAction.java index c5c009ca320..d41c188a5ba 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/UpdateModelSnapshotAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/UpdateModelSnapshotAction.java @@ -46,7 +46,7 @@ public class UpdateModelSnapshotAction extends Action { public static final UpdateModelSnapshotAction INSTANCE = new UpdateModelSnapshotAction(); - public static final String NAME = "cluster:admin/ml/job/model_snapshots/update"; + public static final String NAME = "cluster:admin/xpack/ml/job/model_snapshots/update"; private UpdateModelSnapshotAction() { super(NAME); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/UpdateProcessAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/UpdateProcessAction.java index 25c72d3a283..8bfbc3d5260 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/UpdateProcessAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/UpdateProcessAction.java @@ -36,7 +36,7 @@ public class UpdateProcessAction extends Action { public static final UpdateProcessAction INSTANCE = new UpdateProcessAction(); - public static final String NAME = "cluster:internal/ml/job/update/process"; + public static final String NAME = "cluster:internal/xpack/ml/job/update/process"; private UpdateProcessAction() { super(NAME); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/ValidateDetectorAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/ValidateDetectorAction.java index 0a57be0cc7c..c6c83b2aaa9 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/ValidateDetectorAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/ValidateDetectorAction.java @@ -34,7 +34,7 @@ public class ValidateDetectorAction extends Action { public static final ValidateDetectorAction INSTANCE = new ValidateDetectorAction(); - public static final String NAME = "cluster:admin/ml/job/validate/detector"; + public static final String NAME = "cluster:admin/xpack/ml/job/validate/detector"; protected ValidateDetectorAction() { super(NAME); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/ValidateJobConfigAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/ValidateJobConfigAction.java index 5e2c8ca41ea..b3ac9209c92 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/ValidateJobConfigAction.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/ValidateJobConfigAction.java @@ -35,7 +35,7 @@ public class ValidateJobConfigAction extends Action { public static final ValidateJobConfigAction INSTANCE = new ValidateJobConfigAction(); - public static final String NAME = "cluster:admin/ml/job/validate"; + public static final String NAME = "cluster:admin/xpack/ml/job/validate"; protected ValidateJobConfigAction() { super(NAME); diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobProvider.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobProvider.java index cb09e1155b5..2b1f06b0739 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobProvider.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobProvider.java @@ -1038,7 +1038,7 @@ public class JobProvider { * * gets mapped to: * - * action [cluster:monitor/ml/anomaly_detectors/results/buckets/get] is unauthorized for user [ml_test] for job [farequote] + * action [cluster:monitor/xpack/ml/anomaly_detectors/results/buckets/get] is unauthorized for user [ml_test] for job [farequote] * * Exceptions that are not related to authorization are returned unaltered. * @param e An exception that occurred while getting ML data diff --git a/plugin/src/main/java/org/elasticsearch/xpack/security/authz/privilege/ClusterPrivilege.java b/plugin/src/main/java/org/elasticsearch/xpack/security/authz/privilege/ClusterPrivilege.java index 3d98898fa83..ba5a62a4f08 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/security/authz/privilege/ClusterPrivilege.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/security/authz/privilege/ClusterPrivilege.java @@ -26,10 +26,10 @@ public final class ClusterPrivilege extends Privilege { // shared automatons private static final Automaton MANAGE_SECURITY_AUTOMATON = patterns("cluster:admin/xpack/security/*"); private static final Automaton MONITOR_AUTOMATON = patterns("cluster:monitor/*"); - private static final Automaton MONITOR_ML_AUTOMATON = patterns("cluster:monitor/ml/*"); + private static final Automaton MONITOR_ML_AUTOMATON = patterns("cluster:monitor/xpack/ml/*"); private static final Automaton ALL_CLUSTER_AUTOMATON = patterns("cluster:*", "indices:admin/template/*"); private static final Automaton MANAGE_AUTOMATON = minusAndMinimize(ALL_CLUSTER_AUTOMATON, MANAGE_SECURITY_AUTOMATON); - private static final Automaton MANAGE_ML_AUTOMATON = patterns("cluster:admin/ml/*", "cluster:monitor/ml/*"); + private static final Automaton MANAGE_ML_AUTOMATON = patterns("cluster:admin/xpack/ml/*", "cluster:monitor/xpack/ml/*"); private static final Automaton TRANSPORT_CLIENT_AUTOMATON = patterns("cluster:monitor/nodes/liveness", "cluster:monitor/state"); private static final Automaton MANAGE_IDX_TEMPLATE_AUTOMATON = patterns("indices:admin/template/*"); private static final Automaton MANAGE_INGEST_PIPELINE_AUTOMATON = patterns("cluster:admin/ingest/pipeline/*"); diff --git a/plugin/src/test/resources/org/elasticsearch/transport/actions b/plugin/src/test/resources/org/elasticsearch/transport/actions index e0d3d83cd14..4446a0b3bbf 100644 --- a/plugin/src/test/resources/org/elasticsearch/transport/actions +++ b/plugin/src/test/resources/org/elasticsearch/transport/actions @@ -104,42 +104,42 @@ cluster:admin/ingest/pipeline/delete cluster:admin/ingest/pipeline/get cluster:admin/ingest/pipeline/put cluster:admin/ingest/pipeline/simulate -cluster:admin/ml/filters/get -cluster:monitor/ml/job/results/categories/get -cluster:monitor/ml/job/stats/get -cluster:monitor/ml/job/results/buckets/get -cluster:monitor/ml/job/model_snapshots/get -cluster:monitor/ml/job/results/records/get -cluster:monitor/ml/job/results/influencers/get -cluster:admin/ml/datafeeds/preview -cluster:admin/ml/datafeeds/put -cluster:admin/ml/datafeeds/update -cluster:admin/ml/job/model_snapshots/delete -cluster:admin/ml/job/validate/detector -cluster:admin/ml/job/validate -cluster:admin/ml/job/delete -cluster:admin/ml/job/model_snapshots/revert -cluster:admin/ml/datafeeds/delete -cluster:admin/ml/job/data/post -cluster:admin/ml/job/close -cluster:admin/ml/filters/put -cluster:admin/ml/job/put -cluster:monitor/ml/job/get -cluster:monitor/ml/datafeeds/get -cluster:admin/ml/job/model_snapshots/update -cluster:admin/ml/job/flush -cluster:admin/ml/filters/delete -cluster:monitor/ml/datafeeds/stats/get -cluster:admin/ml/datafeeds/stop -cluster:admin/ml/datafeeds/start -cluster:admin/ml/job/open -cluster:admin/ml/job/update +cluster:admin/xpack/ml/filters/get +cluster:monitor/xpack/ml/job/results/categories/get +cluster:monitor/xpack/ml/job/stats/get +cluster:monitor/xpack/ml/job/results/buckets/get +cluster:monitor/xpack/ml/job/model_snapshots/get +cluster:monitor/xpack/ml/job/results/records/get +cluster:monitor/xpack/ml/job/results/influencers/get +cluster:admin/xpack/ml/datafeeds/preview +cluster:admin/xpack/ml/datafeeds/put +cluster:admin/xpack/ml/datafeeds/update +cluster:admin/xpack/ml/job/model_snapshots/delete +cluster:admin/xpack/ml/job/validate/detector +cluster:admin/xpack/ml/job/validate +cluster:admin/xpack/ml/job/delete +cluster:admin/xpack/ml/job/model_snapshots/revert +cluster:admin/xpack/ml/datafeeds/delete +cluster:admin/xpack/ml/job/data/post +cluster:admin/xpack/ml/job/close +cluster:admin/xpack/ml/filters/put +cluster:admin/xpack/ml/job/put +cluster:monitor/xpack/ml/job/get +cluster:monitor/xpack/ml/datafeeds/get +cluster:admin/xpack/ml/job/model_snapshots/update +cluster:admin/xpack/ml/job/flush +cluster:admin/xpack/ml/filters/delete +cluster:monitor/xpack/ml/datafeeds/stats/get +cluster:admin/xpack/ml/datafeeds/stop +cluster:admin/xpack/ml/datafeeds/start +cluster:admin/xpack/ml/job/open +cluster:admin/xpack/ml/job/update indices:internal/data/write/mldeletebyquery -cluster:internal/ml/job/update/process -cluster:admin/ml/delete_expired_data +cluster:internal/xpack/ml/job/update/process +cluster:admin/xpack/ml/delete_expired_data cluster:admin/persistent/create cluster:admin/persistent/start cluster:admin/persistent/completion cluster:admin/persistent/update_status cluster:admin/persistent/remove -cluster:internal/ml/job/finalize_job_execution +cluster:internal/xpack/ml/job/finalize_job_execution diff --git a/qa/smoke-test-ml-with-security/src/test/java/org/elasticsearch/smoketest/MlWithSecurityInsufficientRoleIT.java b/qa/smoke-test-ml-with-security/src/test/java/org/elasticsearch/smoketest/MlWithSecurityInsufficientRoleIT.java index c0ac63115d5..60b0ef4e984 100644 --- a/qa/smoke-test-ml-with-security/src/test/java/org/elasticsearch/smoketest/MlWithSecurityInsufficientRoleIT.java +++ b/qa/smoke-test-ml-with-security/src/test/java/org/elasticsearch/smoketest/MlWithSecurityInsufficientRoleIT.java @@ -24,7 +24,7 @@ public class MlWithSecurityInsufficientRoleIT extends MlWithSecurityIT { public void test() throws IOException { AssertionError ae = expectThrows(AssertionError.class, super::test); assertThat(ae.getMessage(), - either(containsString("action [cluster:monitor/ml")).or(containsString("action [cluster:admin/ml"))); + either(containsString("action [cluster:monitor/xpack/ml")).or(containsString("action [cluster:admin/xpack/ml"))); assertThat(ae.getMessage(), containsString("returned [403 Forbidden]")); assertThat(ae.getMessage(), containsString("is unauthorized for user [no_ml]")); } diff --git a/qa/smoke-test-ml-with-security/src/test/java/org/elasticsearch/smoketest/MlWithSecurityUserRoleIT.java b/qa/smoke-test-ml-with-security/src/test/java/org/elasticsearch/smoketest/MlWithSecurityUserRoleIT.java index e354cdd0a74..2d72d92276a 100644 --- a/qa/smoke-test-ml-with-security/src/test/java/org/elasticsearch/smoketest/MlWithSecurityUserRoleIT.java +++ b/qa/smoke-test-ml-with-security/src/test/java/org/elasticsearch/smoketest/MlWithSecurityUserRoleIT.java @@ -40,7 +40,7 @@ public class MlWithSecurityUserRoleIT extends MlWithSecurityIT { } } catch (AssertionError ae) { assertThat(ae.getMessage(), - either(containsString("action [cluster:monitor/ml")).or(containsString("action [cluster:admin/ml"))); + either(containsString("action [cluster:monitor/xpack/ml")).or(containsString("action [cluster:admin/xpack/ml"))); assertThat(ae.getMessage(), containsString("returned [403 Forbidden]")); assertThat(ae.getMessage(), containsString("is unauthorized for user [ml_user]")); }