Skip to content

Commit 008c55b

Browse files
authored
Improve transient settings deprecation message (elastic#79504)
Update message as per docs team's suggestion.
1 parent 541a4fd commit 008c55b

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/ClusterDeprecationChecks.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ public class ClusterDeprecationChecks {
1414
static DeprecationIssue checkTransientSettingsExistence(ClusterState state) {
1515
if (state.metadata().transientSettings().isEmpty() == false) {
1616
return new DeprecationIssue(DeprecationIssue.Level.WARNING,
17-
"Transient cluster settings are in the process of being removed.",
17+
"Transient cluster settings are deprecated",
1818
"https://ela.st/es-deprecation-7-transient-cluster-settings",
19-
"Use persistent settings to define your cluster settings instead.",
19+
"Use persistent settings to configure your cluster.",
2020
false,
2121
null);
2222
}

x-pack/plugin/deprecation/src/test/java/org/elasticsearch/xpack/deprecation/ClusterDeprecationChecksTests.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,31 @@
1818
public class ClusterDeprecationChecksTests extends ESTestCase {
1919

2020
public void testCheckTransientSettingsExistence() {
21+
Settings persistentSettings = Settings.builder()
22+
.put("xpack.monitoring.collection.enabled", true)
23+
.build();
24+
2125
Settings transientSettings = Settings.builder()
2226
.put("indices.recovery.max_bytes_per_sec", "20mb")
27+
.put("action.auto_create_index", true)
28+
.put("cluster.routing.allocation.enable", "primaries")
2329
.build();
2430
Metadata metadataWithTransientSettings = Metadata.builder()
31+
.persistentSettings(persistentSettings)
2532
.transientSettings(transientSettings)
2633
.build();
2734

2835
ClusterState badState = ClusterState.builder(new ClusterName("test")).metadata(metadataWithTransientSettings).build();
2936
DeprecationIssue issue = ClusterDeprecationChecks.checkTransientSettingsExistence(badState);
3037
assertThat(issue, equalTo(
3138
new DeprecationIssue(DeprecationIssue.Level.WARNING,
32-
"Transient cluster settings are in the process of being removed.",
39+
"Transient cluster settings are deprecated",
3340
"https://ela.st/es-deprecation-7-transient-cluster-settings",
34-
"Use persistent settings to define your cluster settings instead.",
41+
"Use persistent settings to configure your cluster.",
3542
false, null)
3643
));
3744

38-
Settings persistentSettings = Settings.builder()
45+
persistentSettings = Settings.builder()
3946
.put("indices.recovery.max_bytes_per_sec", "20mb")
4047
.build();
4148
Metadata metadataWithoutTransientSettings = Metadata.builder()

0 commit comments

Comments
 (0)