[DOCS] Revert the fix for 'Data Stream' test in 'docs/reference' and skip the test

docs/build.gradle

@@ -80,7 +80,14 @@ buildRestTests.docs = fileTree(projectDir) {
   // Just syntax examples
   exclude 'README.asciidoc'
   // Broken code snippet tests
-
+  exclude 'reference/data-streams'
+  exclude 'reference/indices/create-data-stream.asciidoc'
+  exclude 'reference/indices/data-stream-stats.asciidoc'
+  exclude 'reference/indices/delete-data-stream.asciidoc'
+  exclude 'reference/indices/get-data-stream.asciidoc'
+  exclude 'reference/indices/put-index-template.asciidoc'
+  exclude 'reference/indices/resolve.asciidoc'
+  exclude 'reference/indices/rollover-index.asciidoc'
   if (Boolean.parseBoolean(System.getProperty("tests.fips.enabled"))) {
     // We don't install/support this plugin in FIPS 140
     exclude 'plugins/ingest-attachment.asciidoc'

server/src/internalClusterTest/java/org/elasticsearch/indices/template/ComposableTemplateIT.java

@@ -24,11 +24,19 @@
 import org.elasticsearch.cluster.metadata.ComponentTemplate;
 import org.elasticsearch.cluster.metadata.ComposableIndexTemplate;
 import org.elasticsearch.cluster.metadata.Template;
+import org.elasticsearch.common.bytes.BytesArray;
+import org.elasticsearch.common.collect.List;
 import org.elasticsearch.common.compress.CompressedXContent;
+import org.elasticsearch.common.xcontent.XContentHelper;
+import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.test.ESIntegTestCase;
 
+import java.io.IOException;
 import java.util.Collections;
 
+import static org.hamcrest.Matchers.equalTo;
+
 public class ComposableTemplateIT extends ESIntegTestCase {
 
     // See: https://github.com/elastic/elasticsearch/issues/58643
@@ -83,4 +91,23 @@ public void testComponentTemplatesCanBeUpdatedAfterRestart() throws Exception {
         client().execute(PutComposableIndexTemplateAction.INSTANCE,
             new PutComposableIndexTemplateAction.Request("my-it").indexTemplate(cit2)).get();
     }
+
+    public void testUsageOfDataStreamFails() throws IOException {
+        // Exception that would happen if a unknown field is provided in a composable template:
+        // The thrown exception will be used to compare against the exception that is thrown when providing
+        // a composable template with a data stream definition.
+        String content = "{\"index_patterns\":[\"logs-*-*\"],\"my_field\":\"bla\"}";
+        XContentParser parser =
+            XContentHelper.createParser(xContentRegistry(), null, new BytesArray(content), XContentType.JSON);
+        Exception expectedException = expectThrows(Exception.class, () -> ComposableIndexTemplate.parse(parser));
+
+        ComposableIndexTemplate template = new ComposableIndexTemplate(List.of("logs-*-*"), null, null, null, null,
+            null, new ComposableIndexTemplate.DataStreamTemplate());
+        Exception e = expectThrows(IllegalArgumentException.class, () -> client().execute(PutComposableIndexTemplateAction.INSTANCE,
+            new PutComposableIndexTemplateAction.Request("my-it").indexTemplate(template)).actionGet());
+        Exception actualException = (Exception) e.getCause();
+        assertThat(actualException.getMessage(),
+            equalTo(expectedException.getMessage().replace("[1:32] ", "").replace("my_field", "data_stream")));
+        assertThat(actualException.getMessage(), equalTo("[index_template] unknown field [data_stream]"));
+    }
 }

server/src/main/java/org/elasticsearch/indices/IndicesModule.java

@@ -50,7 +50,6 @@
 import org.elasticsearch.index.mapper.SeqNoFieldMapper;
 import org.elasticsearch.index.mapper.SourceFieldMapper;
 import org.elasticsearch.index.mapper.TextFieldMapper;
-import org.elasticsearch.index.mapper.DataStreamTimestampFieldMapper;
 import org.elasticsearch.index.mapper.TypeFieldMapper;
 import org.elasticsearch.index.mapper.VersionFieldMapper;
 import org.elasticsearch.index.seqno.RetentionLeaseBackgroundSyncAction;
@@ -163,7 +162,6 @@ private static Map<String, MetadataFieldMapper.TypeParser> initBuiltInMetadataMa
         builtInMetadataMappers.put(TypeFieldMapper.NAME, TypeFieldMapper.PARSER);
         builtInMetadataMappers.put(VersionFieldMapper.NAME, VersionFieldMapper.PARSER);
         builtInMetadataMappers.put(SeqNoFieldMapper.NAME, SeqNoFieldMapper.PARSER);
-        builtInMetadataMappers.put(DataStreamTimestampFieldMapper.NAME, DataStreamTimestampFieldMapper.PARSER);
         //_field_names must be added last so that it has a chance to see all the other mappers
         builtInMetadataMappers.put(FieldNamesFieldMapper.NAME, FieldNamesFieldMapper.PARSER);
         return Collections.unmodifiableMap(builtInMetadataMappers);