Skip duplicate index prefix

Author: felixbarny

docs/reference/elasticsearch/index-settings/serverless.md

@@ -56,7 +56,7 @@ This page lists the {{es}} index settings available in {{serverless-full}} proje
 * [`index.look_ahead_time`](./time-series.md#index-look-ahead-time)
 * [`index.look_back_time`](./time-series.md#index-look-back-time)
 * [`index.routing_path`](./time-series.md#index-routing-path)
-* [`index.index_dimensions_tsid_strategy_enabled`](./time-series.md#index-dimensions-tsid-strategy-enabled)
+* [`index.dimensions_tsid_strategy_enabled`](./time-series.md#index-dimensions-tsid-strategy-enabled)
 
 ### Similarity and analyzers
 

docs/reference/elasticsearch/index-settings/time-series.md

@@ -48,7 +48,7 @@ $$$index-routing-path$$$ `index.routing_path` {applies_to}`serverless: all`
 
 $$$index-dimensions-tsid-strategy-enabled$$$
 
-`index.index_dimensions_tsid_strategy_enabled` {applies_to}`stack: ga 9.2` {applies_to}`serverless: all`
+`index.dimensions_tsid_strategy_enabled` {applies_to}`stack: ga 9.2` {applies_to}`serverless: all`
 :   (Static, boolean) Controls if the `_tsid` can be created using the `index.dimensions` index setting.
 This is an internal setting that will be automatically populated and updated for eligible time series data streams and is not user-configurable.
 This strategy offers an improved ingestion performance that avoids processing dimensions multiple times for the purposes of shard routing and creating the `_tsid`.

modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/TSDBIndexingIT.java

@@ -333,7 +333,7 @@ public void testTsdbTemplatesNoKeywordFieldType() throws Exception {
                         Settings.builder()
                             .put("index.mode", "time_series")
                             .put("index.routing_path", randomBoolean() ? null : "metricset")
-                            .put("index.index_dimensions_tsid_strategy_enabled", usually())
+                            .put("index.dimensions_tsid_strategy_enabled", usually())
                             .build(),
                         new CompressedXContent(mappingTemplate),
                         null
@@ -649,7 +649,7 @@ public void testAddDimensionToMapping() throws Exception {
                     new Template(
                         Settings.builder()
                             .put("index.mode", "time_series")
-                            .put("index.index_dimensions_tsid_strategy_enabled", indexDimensionsTsidStrategyEnabled)
+                            .put("index.dimensions_tsid_strategy_enabled", indexDimensionsTsidStrategyEnabled)
                             .build(),
                         new CompressedXContent(MAPPING_TEMPLATE),
                         null

modules/data-streams/src/test/java/org/elasticsearch/datastreams/DataStreamIndexSettingsProviderTests.java

@@ -119,7 +119,7 @@ public void testGetAdditionalIndexSettings() throws Exception {
         // (in production the index.mode setting is usually provided in an index or component template)
         result = builder().put(result)
             .put("index.mode", "time_series")
-            .put("index.index_dimensions_tsid_strategy_enabled", indexDimensionsTsidStrategyEnabledSetting)
+            .put("index.dimensions_tsid_strategy_enabled", indexDimensionsTsidStrategyEnabledSetting)
             .build();
         assertThat(result.size(), equalTo(5));
         assertThat(IndexSettings.MODE.get(result), equalTo(IndexMode.TIME_SERIES));
@@ -251,7 +251,7 @@ public void testGetAdditionalIndexSettingsMappingsMerging() throws Exception {
         // (in production the index.mode setting is usually provided in an index or component template)
         result = builder().put(result)
             .put("index.mode", "time_series")
-            .put("index.index_dimensions_tsid_strategy_enabled", indexDimensionsTsidStrategyEnabledSetting)
+            .put("index.dimensions_tsid_strategy_enabled", indexDimensionsTsidStrategyEnabledSetting)
             .build();
         assertThat(result.size(), equalTo(5));
         assertThat(IndexSettings.MODE.get(result), equalTo(IndexMode.TIME_SERIES));
@@ -981,7 +981,7 @@ private Settings generateTsdbSettings(String mapping, Instant now) throws IOExce
         ProjectMetadata projectMetadata = emptyProject();
         String dataStreamName = "logs-app1";
         Settings settings = Settings.builder()
-            .put("index.index_dimensions_tsid_strategy_enabled", indexDimensionsTsidStrategyEnabledSetting)
+            .put("index.dimensions_tsid_strategy_enabled", indexDimensionsTsidStrategyEnabledSetting)
             .build();
 
         Settings.Builder additionalSettings = builder();

server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadata.java

@@ -545,7 +545,7 @@ public Iterator<Setting<?>> settings() {
      * it's not allowed to add a dynamic template that defines dimension fields to existing backing indices of a time series data stream.
      */
     public static final Setting<Boolean> INDEX_DIMENSIONS_TSID_STRATEGY_ENABLED = Setting.boolSetting(
-        "index.index_dimensions_tsid_strategy_enabled",
+        "index.dimensions_tsid_strategy_enabled",
         true,
         Setting.Property.IndexScope,
         Property.Final,