Skip to content

Commit b9faa07

Browse files
authored
[7.x] Rename ILM history index enablement setting (#51698) (#51705)
* Rename ILM history index enablement setting The previous setting was `index.lifecycle.history_index_enabled`, this commit changes it to `indices.lifecycle.history_index_enabled` to indicate this is not an index-level setting (it's node level).
1 parent 1380dd4 commit b9faa07

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

client/rest-high-level/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ testClusters.all {
135135
setting 'xpack.security.authc.realms.pki.pki1.delegation.enabled', 'true'
136136

137137
setting 'indices.lifecycle.poll_interval', '1000ms'
138-
setting 'index.lifecycle.history_index_enabled', 'false'
138+
setting 'indices.lifecycle.history_index_enabled', 'false'
139139
keystore 'xpack.security.transport.ssl.truststore.secure_password', 'testnode'
140140
extraConfigFile 'roles.yml', file('roles.yml')
141141
user username: System.getProperty('tests.rest.cluster.username', 'test_user'),

docs/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ buildRestTests.expectedUnconvertedCandidates = [
4444
testClusters.integTest {
4545
if (singleNode().testDistribution == DEFAULT) {
4646
setting 'xpack.license.self_generated.type', 'trial'
47+
setting 'indices.lifecycle.history_index_enabled', 'false'
4748
if (BuildParams.isSnapshotBuild()) {
4849
setting 'xpack.autoscaling.enabled', 'true'
4950
setting 'xpack.eql.enabled', 'true'
@@ -67,7 +68,6 @@ testClusters.integTest {
6768
extraConfigFile 'hunspell/en_US/en_US.dic', project(":server").file('src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.dic')
6869
// Whitelist reindexing from the local node so we can test it.
6970
setting 'reindex.remote.whitelist', '127.0.0.1:*'
70-
setting 'index.lifecycle.history_index_enabled', 'false'
7171

7272
// TODO: remove this once cname is prepended to transport.publish_address by default in 8.0
7373
systemProperty 'es.transport.cname_in_publish_address', 'true'

docs/reference/settings/ilm-settings.asciidoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ILM REST API endpoints and functionality. Defaults to `true`.
1414
(<<time-units, time units>>) How often {ilm} checks for indices that meet policy
1515
criteria. Defaults to `10m`.
1616

17-
`index.lifecycle.history_index_enabled`::
17+
`indices.lifecycle.history_index_enabled`::
1818
Whether ILM's history index is enabled. If enabled, ILM will record the
1919
history of actions taken as part of ILM policies to the `ilm-history-*`
2020
indices. Defaults to `true`.

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/LifecycleSettings.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class LifecycleSettings {
1919
public static final String LIFECYCLE_INDEXING_COMPLETE = "index.lifecycle.indexing_complete";
2020
public static final String LIFECYCLE_ORIGINATION_DATE = "index.lifecycle.origination_date";
2121
public static final String LIFECYCLE_PARSE_ORIGINATION_DATE = "index.lifecycle.parse_origination_date";
22-
public static final String LIFECYCLE_HISTORY_INDEX_ENABLED = "index.lifecycle.history_index_enabled";
22+
public static final String LIFECYCLE_HISTORY_INDEX_ENABLED = "indices.lifecycle.history_index_enabled";
2323
public static final String LIFECYCLE_STEP_MASTER_TIMEOUT = "index.lifecycle.step.master_timeout";
2424

2525
public static final String SLM_HISTORY_INDEX_ENABLED = "slm.history_index_enabled";

x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/test/MonitoringIntegTestCase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ protected Settings nodeSettings(int nodeOrdinal) {
5858
// .put(MachineLearningField.AUTODETECT_PROCESS.getKey(), false)
5959
// .put(XPackSettings.MACHINE_LEARNING_ENABLED.getKey(), false)
6060
// we do this by default in core, but for monitoring this isn't needed and only adds noise.
61-
.put("index.lifecycle.history_index_enabled", false)
61+
.put("indices.lifecycle.history_index_enabled", false)
6262
.put("index.store.mock.check_index_on_close", false);
6363

6464
return builder.build();

x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ protected Settings nodeSettings(int nodeOrdinal) {
118118
// watcher settings that should work despite randomization
119119
.put("xpack.watcher.execution.scroll.size", randomIntBetween(1, 100))
120120
.put("xpack.watcher.watch.scroll.size", randomIntBetween(1, 100))
121-
.put("index.lifecycle.history_index_enabled", false)
121+
.put("indices.lifecycle.history_index_enabled", false)
122122
// SLM can cause timing issues during testsuite teardown: https://github.com/elastic/elasticsearch/issues/50302
123123
// SLM is not required for tests extending from this base class and only add noise.
124124
.put("xpack.slm.enabled", false)

0 commit comments

Comments
 (0)