From f20efa7152e2f50c38ca9364b2d4a05a3523057c Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Tue, 21 Mar 2017 09:58:37 +0100 Subject: [PATCH] [ML] Renamed action names from */anomaly_detectors/* to */job/* The action name is currently inconsistent with the class name. Also as more types of jobs will be added, they should reuse the existing actions, so it make more sense to gave a generic job name for the action name. Note that it is ok to have additional rest handlers for new type of jobs. Original commit: elastic/x-pack-elasticsearch@a70d46fb8a40433c7ab2ea87dd8ae952f9b8ad81 --- .../xpack/ml/action/CloseJobAction.java | 2 +- .../xpack/ml/action/DeleteJobAction.java | 2 +- .../ml/action/DeleteModelSnapshotAction.java | 2 +- .../xpack/ml/action/FlushJobAction.java | 2 +- .../xpack/ml/action/GetBucketsAction.java | 2 +- .../xpack/ml/action/GetCategoriesAction.java | 2 +- .../xpack/ml/action/GetInfluencersAction.java | 2 +- .../xpack/ml/action/GetJobsAction.java | 2 +- .../xpack/ml/action/GetJobsStatsAction.java | 2 +- .../ml/action/GetModelSnapshotsAction.java | 2 +- .../xpack/ml/action/GetRecordsAction.java | 2 +- .../xpack/ml/action/OpenJobAction.java | 2 +- .../xpack/ml/action/PostDataAction.java | 2 +- .../xpack/ml/action/PutJobAction.java | 2 +- .../ml/action/RevertModelSnapshotAction.java | 2 +- .../xpack/ml/action/UpdateJobAction.java | 2 +- .../ml/action/UpdateModelSnapshotAction.java | 2 +- .../xpack/ml/action/UpdateProcessAction.java | 2 +- .../ml/action/ValidateDetectorAction.java | 2 +- .../ml/action/ValidateJobConfigAction.java | 2 +- .../org/elasticsearch/transport/actions | 40 +++++++++---------- 21 files changed, 40 insertions(+), 40 deletions(-) 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 80e215b4329..e238931a353 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 @@ -56,7 +56,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/anomaly_detectors/close"; + public static final String NAME = "cluster:admin/ml/job/close"; private CloseJobAction() { 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 f4df8e8acaf..acea29e02b2 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/anomaly_detectors/delete"; + public static final String NAME = "cluster:admin/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 615e2a5b77d..8c9a2f6f4f9 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/anomaly_detectors/model_snapshots/delete"; + public static final String NAME = "cluster:admin/ml/job/model_snapshots/delete"; private DeleteModelSnapshotAction() { 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 3844c8f0cb0..19776a0d5a8 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/anomaly_detectors/flush"; + public static final String NAME = "cluster:admin/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 2105602a153..1367ee4ee57 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/anomaly_detectors/results/buckets/get"; + public static final String NAME = "cluster:monitor/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 23dba874e4b..fe510c4d747 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/anomaly_detectors/results/categories/get"; + public static final String NAME = "cluster:monitor/ml/job/results/categories/get"; private GetCategoriesAction() { 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 5df10794c5f..ea549cd36b2 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/anomaly_detectors/results/influencers/get"; + public static final String NAME = "cluster:monitor/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 9281d86436d..a377ed168ac 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/anomaly_detectors/get"; + public static final String NAME = "cluster:monitor/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 8ae129d6c1d..423c2fa0433 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/anomaly_detectors/stats/get"; + public static final String NAME = "cluster:monitor/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 b52eef0d7aa..ed4aac37fc5 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/anomaly_detectors/model_snapshots/get"; + public static final String NAME = "cluster:monitor/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 5453c40e2b4..a436ef7b1b7 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/anomaly_detectors/results/records/get"; + public static final String NAME = "cluster:monitor/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 f437f43395d..949a895a811 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 @@ -72,7 +72,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/anomaly_detectors/open"; + public static final String NAME = "cluster:admin/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 b67c0a5d126..3e875e56b03 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 @@ -39,7 +39,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/anomaly_detectors/data/post"; + public static final String NAME = "cluster:admin/ml/job/data/post"; private PostDataAction() { 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 432d4a08f17..af612539486 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/anomaly_detectors/put"; + public static final String NAME = "cluster:admin/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 298b96cda8a..d21139d6b89 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/anomaly_detectors/model_snapshots/revert"; + public static final String NAME = "cluster:admin/ml/job/model_snapshots/revert"; private RevertModelSnapshotAction() { 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 70b7087b235..720c3ae30fd 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 @@ -44,7 +44,7 @@ import java.util.concurrent.Semaphore; public class UpdateJobAction extends Action { public static final UpdateJobAction INSTANCE = new UpdateJobAction(); - public static final String NAME = "cluster:admin/ml/anomaly_detectors/update"; + public static final String NAME = "cluster:admin/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 a54e19e4127..0ef57dcab71 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 @@ -47,7 +47,7 @@ Action { public static final UpdateModelSnapshotAction INSTANCE = new UpdateModelSnapshotAction(); - public static final String NAME = "cluster:admin/ml/anomaly_detectors/model_snapshots/update"; + public static final String NAME = "cluster:admin/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 821c5ff883c..d23d0891de9 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 = "internal:admin/ml/anomaly_detectors/update/process"; + public static final String NAME = "internal:admin/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 a5f78a1511b..a75e18e4972 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/anomaly_detectors/validate/detector"; + public static final String NAME = "cluster:admin/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 b2505c8271a..5e2c8ca41ea 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/anomaly_detectors/validate"; + public static final String NAME = "cluster:admin/ml/job/validate"; protected ValidateJobConfigAction() { super(NAME); diff --git a/plugin/src/test/resources/org/elasticsearch/transport/actions b/plugin/src/test/resources/org/elasticsearch/transport/actions index 6e0fb2f839e..9b022aeb1d7 100644 --- a/plugin/src/test/resources/org/elasticsearch/transport/actions +++ b/plugin/src/test/resources/org/elasticsearch/transport/actions @@ -107,37 +107,37 @@ cluster:admin/ingest/pipeline/get cluster:admin/ingest/pipeline/put cluster:admin/ingest/pipeline/simulate cluster:admin/ml/filters/get -cluster:monitor/ml/anomaly_detectors/results/categories/get -cluster:monitor/ml/anomaly_detectors/stats/get -cluster:monitor/ml/anomaly_detectors/results/buckets/get -cluster:monitor/ml/anomaly_detectors/model_snapshots/get -cluster:monitor/ml/anomaly_detectors/results/records/get -cluster:monitor/ml/anomaly_detectors/results/influencers/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/anomaly_detectors/model_snapshots/delete -cluster:admin/ml/anomaly_detectors/validate/detector -cluster:admin/ml/anomaly_detectors/validate -cluster:admin/ml/anomaly_detectors/delete -cluster:admin/ml/anomaly_detectors/model_snapshots/revert +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/anomaly_detectors/data/post -cluster:admin/ml/anomaly_detectors/close +cluster:admin/ml/job/data/post +cluster:admin/ml/job/close cluster:admin/ml/filters/put -cluster:admin/ml/anomaly_detectors/put -cluster:monitor/ml/anomaly_detectors/get +cluster:admin/ml/job/put +cluster:monitor/ml/job/get cluster:monitor/ml/datafeeds/get -cluster:admin/ml/anomaly_detectors/model_snapshots/update -cluster:admin/ml/anomaly_detectors/flush +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/anomaly_detectors/open -cluster:admin/ml/anomaly_detectors/update +cluster:admin/ml/job/open +cluster:admin/ml/job/update indices:internal/data/write/mldeletebyquery -internal:admin/ml/anomaly_detectors/update/process +internal:admin/ml/job/update/process cluster:admin/ml/delete_expired_data cluster:admin/persistent/create cluster:admin/persistent/start