diff --git a/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/TSDBIndexingIT.java b/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/TSDBIndexingIT.java index 200e7c8785262..194737040455c 100644 --- a/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/TSDBIndexingIT.java +++ b/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/TSDBIndexingIT.java @@ -710,10 +710,14 @@ public void testAddDimensionToMapping() throws Exception { } """, XContentType.JSON); assertAcked(client().execute(TransportPutMappingAction.TYPE, putMappingRequest).actionGet()); - assertThat( - getSetting(dataStreamName, IndexMetadata.INDEX_ROUTING_PATH), - containsInAnyOrder("metricset", "labels.*", "k8s.pod.name") - ); + if (INDEX_DIMENSIONS_TSID_OPTIMIZATION_FEATURE_FLAG) { + assertThat( + getSetting(dataStreamName, IndexMetadata.INDEX_ROUTING_PATH), + containsInAnyOrder("metricset", "labels.*", "k8s.pod.name") + ); + } else { + assertThat(getSetting(dataStreamName, IndexMetadata.INDEX_ROUTING_PATH), containsInAnyOrder("metricset")); + } assertThat(getSetting(dataStreamName, IndexMetadata.INDEX_DIMENSIONS), empty()); indexWithPodNames(dataStreamName, Instant.now(), Map.of(), "dog", "cat");