diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/snapshotlifecycle/action/DeleteSnapshotLifecycleAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/snapshotlifecycle/action/DeleteSnapshotLifecycleAction.java index 8a5295b0d1eda..922a1fa6b4b32 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/snapshotlifecycle/action/DeleteSnapshotLifecycleAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/snapshotlifecycle/action/DeleteSnapshotLifecycleAction.java @@ -19,7 +19,7 @@ public class DeleteSnapshotLifecycleAction extends Action { public static final DeleteSnapshotLifecycleAction INSTANCE = new DeleteSnapshotLifecycleAction(); - public static final String NAME = "cluster:admin/ilm/snapshot/delete"; + public static final String NAME = "cluster:admin/slm/delete"; protected DeleteSnapshotLifecycleAction() { super(NAME); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/snapshotlifecycle/action/ExecuteSnapshotLifecycleAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/snapshotlifecycle/action/ExecuteSnapshotLifecycleAction.java index ea23a62b11d21..1558d86bb019e 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/snapshotlifecycle/action/ExecuteSnapshotLifecycleAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/snapshotlifecycle/action/ExecuteSnapshotLifecycleAction.java @@ -26,7 +26,7 @@ */ public class ExecuteSnapshotLifecycleAction extends Action { public static final ExecuteSnapshotLifecycleAction INSTANCE = new ExecuteSnapshotLifecycleAction(); - public static final String NAME = "cluster:admin/ilm/snapshot/execute"; + public static final String NAME = "cluster:admin/slm/execute"; protected ExecuteSnapshotLifecycleAction() { super(NAME); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/snapshotlifecycle/action/GetSnapshotLifecycleAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/snapshotlifecycle/action/GetSnapshotLifecycleAction.java index 84fdd7aa07850..1ec568f2d56e5 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/snapshotlifecycle/action/GetSnapshotLifecycleAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/snapshotlifecycle/action/GetSnapshotLifecycleAction.java @@ -25,7 +25,7 @@ public class GetSnapshotLifecycleAction extends Action { public static final GetSnapshotLifecycleAction INSTANCE = new GetSnapshotLifecycleAction(); - public static final String NAME = "cluster:admin/ilm/snapshot/get"; + public static final String NAME = "cluster:admin/slm/get"; protected GetSnapshotLifecycleAction() { super(NAME); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/snapshotlifecycle/action/PutSnapshotLifecycleAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/snapshotlifecycle/action/PutSnapshotLifecycleAction.java index d5387ad1ba7e0..a76feb9d87c9b 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/snapshotlifecycle/action/PutSnapshotLifecycleAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/snapshotlifecycle/action/PutSnapshotLifecycleAction.java @@ -24,7 +24,7 @@ public class PutSnapshotLifecycleAction extends Action { public static final PutSnapshotLifecycleAction INSTANCE = new PutSnapshotLifecycleAction(); - public static final String NAME = "cluster:admin/ilm/snapshot/put"; + public static final String NAME = "cluster:admin/slm/put"; protected PutSnapshotLifecycleAction() { super(NAME); diff --git a/x-pack/plugin/ilm/qa/multi-node/src/test/java/org/elasticsearch/xpack/snapshotlifecycle/SnapshotLifecycleIT.java b/x-pack/plugin/ilm/qa/multi-node/src/test/java/org/elasticsearch/xpack/snapshotlifecycle/SnapshotLifecycleIT.java index ea76087a0b99c..57dbe7d77fac3 100644 --- a/x-pack/plugin/ilm/qa/multi-node/src/test/java/org/elasticsearch/xpack/snapshotlifecycle/SnapshotLifecycleIT.java +++ b/x-pack/plugin/ilm/qa/multi-node/src/test/java/org/elasticsearch/xpack/snapshotlifecycle/SnapshotLifecycleIT.java @@ -44,7 +44,7 @@ public void testMissingRepo() throws Exception { SnapshotLifecyclePolicy policy = new SnapshotLifecyclePolicy("test-policy", "snap", "*/1 * * * * ?", "missing-repo", Collections.emptyMap()); - Request putLifecycle = new Request("PUT", "/_ilm/snapshot/test-policy"); + Request putLifecycle = new Request("PUT", "/_slm/policy/test-policy"); XContentBuilder lifecycleBuilder = JsonXContent.contentBuilder(); policy.toXContent(lifecycleBuilder, ToXContent.EMPTY_PARAMS); putLifecycle.setJsonEntity(Strings.toString(lifecycleBuilder)); @@ -86,7 +86,7 @@ public void testFullPolicySnapshot() throws Exception { assertThat((List)snapResponse.get("indices"), equalTo(Collections.singletonList(indexName))); // Check that the last success date was written to the cluster state - Request getReq = new Request("GET", "/_ilm/snapshot/" + policyName); + Request getReq = new Request("GET", "/_slm/policy/" + policyName); Response policyMetadata = client().performRequest(getReq); Map policyResponseMap; try (InputStream is = policyMetadata.getEntity().getContent()) { @@ -105,7 +105,7 @@ public void testFullPolicySnapshot() throws Exception { assertThat(lastSnapshotName, startsWith("snap-")); }); - Request delReq = new Request("DELETE", "/_ilm/snapshot/" + policyName); + Request delReq = new Request("DELETE", "/_slm/policy/" + policyName); assertOK(client().performRequest(delReq)); // It's possible there could have been a snapshot in progress when the @@ -127,7 +127,7 @@ public void testPolicyFailure() throws Exception { assertBusy(() -> { // Check that the failure is written to the cluster state - Request getReq = new Request("GET", "/_ilm/snapshot/" + policyName); + Request getReq = new Request("GET", "/_slm/policy/" + policyName); Response policyMetadata = client().performRequest(getReq); try (InputStream is = policyMetadata.getEntity().getContent()) { Map responseMap = XContentHelper.convertToMap(XContentType.JSON.xContent(), is, true); @@ -151,7 +151,7 @@ public void testPolicyFailure() throws Exception { } }); - Request delReq = new Request("DELETE", "/_ilm/snapshot/" + policyName); + Request delReq = new Request("DELETE", "/_slm/policy/" + policyName); assertOK(client().performRequest(delReq)); } @@ -171,11 +171,11 @@ public void testPolicyManualExecution() throws Exception { createSnapshotPolicy(policyName, "snap", "1 2 3 4 5 ?", repoId, indexName, true); ResponseException badResp = expectThrows(ResponseException.class, - () -> client().performRequest(new Request("PUT", "/_ilm/snapshot/" + policyName + "-bad/_execute"))); + () -> client().performRequest(new Request("PUT", "/_slm/policy/" + policyName + "-bad/_execute"))); assertThat(EntityUtils.toString(badResp.getResponse().getEntity()), containsString("no such snapshot lifecycle policy [" + policyName + "-bad]")); - Response goodResp = client().performRequest(new Request("PUT", "/_ilm/snapshot/" + policyName + "/_execute")); + Response goodResp = client().performRequest(new Request("PUT", "/_slm/policy/" + policyName + "/_execute")); try (XContentParser parser = JsonXContent.jsonXContent.createParser(NamedXContentRegistry.EMPTY, DeprecationHandler.THROW_UNSUPPORTED_OPERATION, EntityUtils.toByteArray(goodResp.getEntity()))) { @@ -196,7 +196,7 @@ public void testPolicyManualExecution() throws Exception { }); } - Request delReq = new Request("DELETE", "/_ilm/snapshot/" + policyName); + Request delReq = new Request("DELETE", "/_slm/policy/" + policyName); assertOK(client().performRequest(delReq)); // It's possible there could have been a snapshot in progress when the @@ -213,7 +213,7 @@ private void createSnapshotPolicy(String policyName, String snapshotNamePattern, snapConfig.put("ignore_unavailable", ignoreUnavailable); SnapshotLifecyclePolicy policy = new SnapshotLifecyclePolicy(policyName, snapshotNamePattern, schedule, repoId, snapConfig); - Request putLifecycle = new Request("PUT", "/_ilm/snapshot/" + policyName); + Request putLifecycle = new Request("PUT", "/_slm/policy/" + policyName); XContentBuilder lifecycleBuilder = JsonXContent.contentBuilder(); policy.toXContent(lifecycleBuilder, ToXContent.EMPTY_PARAMS); putLifecycle.setJsonEntity(Strings.toString(lifecycleBuilder)); diff --git a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/RestDeleteSnapshotLifecycleAction.java b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/RestDeleteSnapshotLifecycleAction.java index 53f777b340dfe..8f9b409778ec7 100644 --- a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/RestDeleteSnapshotLifecycleAction.java +++ b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/RestDeleteSnapshotLifecycleAction.java @@ -18,12 +18,12 @@ public class RestDeleteSnapshotLifecycleAction extends BaseRestHandler { public RestDeleteSnapshotLifecycleAction(Settings settings, RestController controller) { super(settings); - controller.registerHandler(RestRequest.Method.DELETE, "/_ilm/snapshot/{name}", this); + controller.registerHandler(RestRequest.Method.DELETE, "/_slm/policy/{name}", this); } @Override public String getName() { - return "ilm_delete_snapshot_lifecycle"; + return "slm_delete_lifecycle"; } @Override diff --git a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/RestExecuteSnapshotLifecycleAction.java b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/RestExecuteSnapshotLifecycleAction.java index d833971a7127c..aeca7401fbec5 100644 --- a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/RestExecuteSnapshotLifecycleAction.java +++ b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/RestExecuteSnapshotLifecycleAction.java @@ -20,12 +20,12 @@ public class RestExecuteSnapshotLifecycleAction extends BaseRestHandler { public RestExecuteSnapshotLifecycleAction(Settings settings, RestController controller) { super(settings); - controller.registerHandler(RestRequest.Method.PUT, "/_ilm/snapshot/{name}/_execute", this); + controller.registerHandler(RestRequest.Method.PUT, "/_slm/policy/{name}/_execute", this); } @Override public String getName() { - return "ilm_execute_snapshot_lifecycle"; + return "slm_execute_lifecycle"; } @Override diff --git a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/RestGetSnapshotLifecycleAction.java b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/RestGetSnapshotLifecycleAction.java index 6d7cb4bad012a..6196721abde6a 100644 --- a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/RestGetSnapshotLifecycleAction.java +++ b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/RestGetSnapshotLifecycleAction.java @@ -19,13 +19,13 @@ public class RestGetSnapshotLifecycleAction extends BaseRestHandler { public RestGetSnapshotLifecycleAction(Settings settings, RestController controller) { super(settings); - controller.registerHandler(RestRequest.Method.GET, "/_ilm/snapshot", this); - controller.registerHandler(RestRequest.Method.GET, "/_ilm/snapshot/{name}", this); + controller.registerHandler(RestRequest.Method.GET, "/_slm/policy", this); + controller.registerHandler(RestRequest.Method.GET, "/_slm/policy/{name}", this); } @Override public String getName() { - return "ilm_get_snapshot_lifecycle"; + return "slm_get_lifecycle"; } @Override diff --git a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/RestPutSnapshotLifecycleAction.java b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/RestPutSnapshotLifecycleAction.java index 65576f7c3891b..b59549011938a 100644 --- a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/RestPutSnapshotLifecycleAction.java +++ b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/RestPutSnapshotLifecycleAction.java @@ -21,12 +21,12 @@ public class RestPutSnapshotLifecycleAction extends BaseRestHandler { public RestPutSnapshotLifecycleAction(Settings settings, RestController controller) { super(settings); - controller.registerHandler(RestRequest.Method.PUT, "/_ilm/snapshot/{name}", this); + controller.registerHandler(RestRequest.Method.PUT, "/_slm/policy/{name}", this); } @Override public String getName() { - return "ilm_put_snapshot_lifecycle"; + return "slm_put_lifecycle"; } @Override