Replace ilm/slm with their full names (#88060) (#88204)

(cherry picked from commit 3e1242b) Signed-off-by: Andrei Dan <andrei.dan@elastic.co>
elastic · Jun 30, 2022 · 789d52b · 789d52b
1 parent 8870140
commit 789d52b
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 30 deletions.
diff --git a/docs/reference/tab-widgets/troubleshooting/data/add-tier.asciidoc b/docs/reference/tab-widgets/troubleshooting/data/add-tier.asciidoc
@@ -49,7 +49,7 @@ setting:
 GET /my-index-000001/_settings/index.routing.allocation.include._tier_preference?flat_settings
 ----
 +
-The reponse will look like this:
+The response will look like this:
 +
 [source,console-result]
 ----
@@ -101,7 +101,7 @@ GET /my-index-000001/_settings/index.routing.allocation.include._tier_preference
 // TEST[continued]
 
 
-The reponse will look like this:
+The response will look like this:
 
 [source,console-result]
 ----

diff --git a/...eference/tab-widgets/troubleshooting/data/increase-cluster-shard-limit.asciidoc b/...eference/tab-widgets/troubleshooting/data/increase-cluster-shard-limit.asciidoc
@@ -113,7 +113,7 @@ GET /my-index-000001/_settings/index.routing.allocation.include._tier_preference
 // TEST[continued]
 
 
-The reponse will look like this:
+The response will look like this:
 
 [source,console-result]
 ----

diff --git a/docs/reference/tab-widgets/troubleshooting/data/increase-tier-capacity.asciidoc b/docs/reference/tab-widgets/troubleshooting/data/increase-tier-capacity.asciidoc
@@ -211,7 +211,7 @@ GET /my-index-000001/_settings/index.routing.allocation.include._tier_preference
 // TEST[continued]
 
 
-The reponse will look like this:
+The response will look like this:
 
 [source,console-result]
 ----

diff --git a/docs/reference/tab-widgets/troubleshooting/data/start-ilm.asciidoc b/docs/reference/tab-widgets/troubleshooting/data/start-ilm.asciidoc
@@ -29,7 +29,7 @@ image::images/kibana-console.png[{kib} Console,align="center"]
 POST _ilm/start
 ----
 +
-The reponse will look like this:
+The response will look like this:
 +
 [source,console-result]
 ----
@@ -47,7 +47,7 @@ The reponse will look like this:
 GET _ilm/status
 ----
 +
-The reponse will look like this:
+The response will look like this:
 +
 [source,console-result]
 ----
@@ -61,14 +61,14 @@ The reponse will look like this:
 // end::cloud[]
 
 // tag::self-managed[]
-<<ilm-start, Start ILM>>:
+<<ilm-start, Start>> {ilm}:
 
 [source,console]
 ----
 POST _ilm/start
 ----
 
-The reponse will look like this:
+The response will look like this:
 
 [source,console-result]
 ----
@@ -86,7 +86,7 @@ Verify {ilm} is now running:
 GET _ilm/status
 ----
 
-The reponse will look like this:
+The response will look like this:
 
 [source,console-result]
 ----

diff --git a/docs/reference/tab-widgets/troubleshooting/data/start-slm.asciidoc b/docs/reference/tab-widgets/troubleshooting/data/start-slm.asciidoc
@@ -29,7 +29,7 @@ image::images/kibana-console.png[{kib} Console,align="center"]
 POST _slm/start
 ----
 +
-The reponse will look like this:
+The response will look like this:
 +
 [source,console-result]
 ----
@@ -46,7 +46,7 @@ The reponse will look like this:
 GET _slm/status
 ----
 +
-The reponse will look like this:
+The response will look like this:
 +
 [source,console-result]
 ----
@@ -64,7 +64,7 @@ The reponse will look like this:
 ----
 POST _slm/start
 ----
-The reponse will look like this:
+The response will look like this:
 [source,console-result]
 ----
 {
@@ -77,7 +77,7 @@ Verify the {slm} is now running:
 ----
 GET _slm/status
 ----
-The reponse will look like this:
+The response will look like this:
 [source,console-result]
 ----
 {

diff --git a/docs/reference/tab-widgets/troubleshooting/data/total-shards-per-node.asciidoc b/docs/reference/tab-widgets/troubleshooting/data/total-shards-per-node.asciidoc
@@ -113,7 +113,7 @@ GET /my-index-000001/_settings/index.routing.allocation.include._tier_preference
 // TEST[continued]
 
 
-The reponse will look like this:
+The response will look like this:
 
 [source,console-result]
 ----

diff --git a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/IlmHealthIndicatorService.java b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/IlmHealthIndicatorService.java
@@ -40,7 +40,7 @@ public class IlmHealthIndicatorService implements HealthIndicatorService {
 
     public static final String HELP_URL = "https://ela.st/fix-ilm";
     public static final UserAction ILM_NOT_RUNNING = new UserAction(
-        new UserAction.Definition("ilm-not-running", "Start ILM using [POST /_ilm/start].", HELP_URL),
+        new UserAction.Definition("ilm-not-running", "Start Index Lifecycle Management using [POST /_ilm/start].", HELP_URL),
         null
     );
 
@@ -71,7 +71,7 @@ public HealthIndicatorResult calculate(boolean explain) {
         if (ilmMetadata.getPolicyMetadatas().isEmpty()) {
             return createIndicator(
                 GREEN,
-                "No ILM policies configured",
+                "No Index Lifecycle Management policies configured",
                 createDetails(explain, ilmMetadata),
                 Collections.emptyList(),
                 Collections.emptyList()
@@ -85,11 +85,17 @@ public HealthIndicatorResult calculate(boolean explain) {
                     List.of(ImpactArea.DEPLOYMENT_MANAGEMENT)
                 )
             );
-            return createIndicator(YELLOW, "ILM is not running", createDetails(explain, ilmMetadata), impacts, List.of(ILM_NOT_RUNNING));
+            return createIndicator(
+                YELLOW,
+                "Index Lifecycle Management is not running",
+                createDetails(explain, ilmMetadata),
+                impacts,
+                List.of(ILM_NOT_RUNNING)
+            );
         } else {
             return createIndicator(
                 GREEN,
-                "ILM is running",
+                "Index Lifecycle Management is running",
                 createDetails(explain, ilmMetadata),
                 Collections.emptyList(),
                 Collections.emptyList()

diff --git a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/SlmHealthIndicatorService.java b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/SlmHealthIndicatorService.java
@@ -40,7 +40,7 @@ public class SlmHealthIndicatorService implements HealthIndicatorService {
 
     public static final String HELP_URL = "https://ela.st/fix-slm";
     public static final UserAction SLM_NOT_RUNNING = new UserAction(
-        new UserAction.Definition("slm-not-running", "Start SLM using [POST /_slm/start].", HELP_URL),
+        new UserAction.Definition("slm-not-running", "Start Snapshot Lifecycle Management using [POST /_slm/start].", HELP_URL),
         null
     );
 
@@ -71,7 +71,7 @@ public HealthIndicatorResult calculate(boolean explain) {
         if (slmMetadata.getSnapshotConfigurations().isEmpty()) {
             return createIndicator(
                 GREEN,
-                "No SLM policies configured",
+                "No Snapshot Lifecycle Management policies configured",
                 createDetails(explain, slmMetadata),
                 Collections.emptyList(),
                 Collections.emptyList()
@@ -84,11 +84,17 @@ public HealthIndicatorResult calculate(boolean explain) {
                     List.of(ImpactArea.BACKUP)
                 )
             );
-            return createIndicator(YELLOW, "SLM is not running", createDetails(explain, slmMetadata), impacts, List.of(SLM_NOT_RUNNING));
+            return createIndicator(
+                YELLOW,
+                "Snapshot Lifecycle Management is not running",
+                createDetails(explain, slmMetadata),
+                impacts,
+                List.of(SLM_NOT_RUNNING)
+            );
         } else {
             return createIndicator(
                 GREEN,
-                "SLM is running",
+                "Snapshot Lifecycle Management is running",
                 createDetails(explain, slmMetadata),
                 Collections.emptyList(),
                 Collections.emptyList()

diff --git a/.../plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/IlmHealthIndicatorServiceTests.java b/.../plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/IlmHealthIndicatorServiceTests.java
@@ -48,7 +48,7 @@ public void testIsGreenWhenRunningAndPoliciesConfigured() {
                     NAME,
                     DATA,
                     GREEN,
-                    "ILM is running",
+                    "Index Lifecycle Management is running",
                     null,
                     new SimpleHealthIndicatorDetails(Map.of("ilm_status", RUNNING, "policies", 1)),
                     Collections.emptyList(),
@@ -70,7 +70,7 @@ public void testIsYellowWhenNotRunningAndPoliciesConfigured() {
                     NAME,
                     DATA,
                     YELLOW,
-                    "ILM is not running",
+                    "Index Lifecycle Management is not running",
                     IlmHealthIndicatorService.HELP_URL,
                     new SimpleHealthIndicatorDetails(Map.of("ilm_status", status, "policies", 1)),
                     Collections.singletonList(
@@ -99,7 +99,7 @@ public void testIsGreenWhenNotRunningAndNoPolicies() {
                     NAME,
                     DATA,
                     GREEN,
-                    "No ILM policies configured",
+                    "No Index Lifecycle Management policies configured",
                     null,
                     new SimpleHealthIndicatorDetails(Map.of("ilm_status", status, "policies", 0)),
                     Collections.emptyList(),
@@ -120,7 +120,7 @@ public void testIsGreenWhenNoMetadata() {
                     NAME,
                     DATA,
                     GREEN,
-                    "No ILM policies configured",
+                    "No Index Lifecycle Management policies configured",
                     null,
                     new SimpleHealthIndicatorDetails(Map.of("ilm_status", RUNNING, "policies", 0)),
                     Collections.emptyList(),

diff --git a/.../plugin/ilm/src/test/java/org/elasticsearch/xpack/slm/SlmHealthIndicatorServiceTests.java b/.../plugin/ilm/src/test/java/org/elasticsearch/xpack/slm/SlmHealthIndicatorServiceTests.java
@@ -49,7 +49,7 @@ public void testIsGreenWhenRunningAndPoliciesConfigured() {
                     NAME,
                     SNAPSHOT,
                     GREEN,
-                    "SLM is running",
+                    "Snapshot Lifecycle Management is running",
                     null,
                     new SimpleHealthIndicatorDetails(Map.of("slm_status", RUNNING, "policies", 1)),
                     Collections.emptyList(),
@@ -71,7 +71,7 @@ public void testIsYellowWhenNotRunningAndPoliciesConfigured() {
                     NAME,
                     SNAPSHOT,
                     YELLOW,
-                    "SLM is not running",
+                    "Snapshot Lifecycle Management is not running",
                     SlmHealthIndicatorService.HELP_URL,
                     new SimpleHealthIndicatorDetails(Map.of("slm_status", status, "policies", 1)),
                     Collections.singletonList(
@@ -99,7 +99,7 @@ public void testIsGreenWhenNotRunningAndNoPolicies() {
                     NAME,
                     SNAPSHOT,
                     GREEN,
-                    "No SLM policies configured",
+                    "No Snapshot Lifecycle Management policies configured",
                     null,
                     new SimpleHealthIndicatorDetails(Map.of("slm_status", status, "policies", 0)),
                     Collections.emptyList(),
@@ -120,7 +120,7 @@ public void testIsGreenWhenNoMetadata() {
                     NAME,
                     SNAPSHOT,
                     GREEN,
-                    "No SLM policies configured",
+                    "No Snapshot Lifecycle Management policies configured",
                     null,
                     new SimpleHealthIndicatorDetails(Map.of("slm_status", RUNNING, "policies", 0)),
                     Collections.emptyList(),