Skip to content

Replace ilm/slm with their full names #88060

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 30, 2022
Merged

Replace ilm/slm with their full names #88060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
752924b
Replace ilm/slm with their full names
andreidan Jun 27, 2022
5d60ad4
Spotless
andreidan Jun 27, 2022
0dbe7eb
Tests
andreidan Jun 27, 2022
a926172
Merge branch 'master' into ilm-slm-copy
elasticmachine Jun 27, 2022
a7e65cd
Merge branch 'master' into ilm-slm-copy
elasticmachine Jun 30, 2022
a6dcc7c
Update docs/reference/tab-widgets/troubleshooting/data/start-ilm.asci…
andreidan Jun 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/reference/tab-widgets/troubleshooting/data/add-tier.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
----
Expand Down Expand Up @@ -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]
----
Expand Down
2 changes: 1 addition & 1 deletion ...eference/tab-widgets/troubleshooting/data/increase-cluster-shard-limit.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
----
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/tab-widgets/troubleshooting/data/increase-tier-capacity.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
----
Expand Down
10 changes: 5 additions & 5 deletions docs/reference/tab-widgets/troubleshooting/data/start-ilm.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
----
Expand All @@ -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]
----
Expand All @@ -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]
----
Expand All @@ -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]
----
Expand Down
8 changes: 4 additions & 4 deletions docs/reference/tab-widgets/troubleshooting/data/start-slm.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
----
Expand All @@ -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]
----
Expand All @@ -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]
----
{
Expand All @@ -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]
----
{
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/tab-widgets/troubleshooting/data/total-shards-per-node.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
----
Expand Down
14 changes: 10 additions & 4 deletions x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/IlmHealthIndicatorService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
);

Expand Down Expand Up @@ -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()
Expand All @@ -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()
Expand Down
14 changes: 10 additions & 4 deletions x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/SlmHealthIndicatorService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
);

Expand Down Expand Up @@ -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()
Expand All @@ -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()
Expand Down
8 changes: 4 additions & 4 deletions .../plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/IlmHealthIndicatorServiceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand All @@ -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(
Expand Down Expand Up @@ -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(),
Expand All @@ -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(),
Expand Down
8 changes: 4 additions & 4 deletions .../plugin/ilm/src/test/java/org/elasticsearch/xpack/slm/SlmHealthIndicatorServiceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand All @@ -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(
Expand Down Expand Up @@ -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(),
Expand All @@ -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(),
Expand Down