Merge branch 'main' into data-stream-settings-index_number_of_replicas

Author: masseyke

modules/data-streams/src/main/java/org/elasticsearch/datastreams/DataStreamsPlugin.java

@@ -26,7 +26,6 @@
 import org.elasticsearch.action.datastreams.lifecycle.GetDataStreamLifecycleAction;
 import org.elasticsearch.action.datastreams.lifecycle.PutDataStreamLifecycleAction;
 import org.elasticsearch.client.internal.OriginSettingClient;
-import org.elasticsearch.cluster.metadata.DataStream;
 import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
 import org.elasticsearch.cluster.node.DiscoveryNodes;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
@@ -253,10 +252,8 @@ public List<ActionHandler> getActions() {
         actions.add(new ActionHandler(DeleteDataStreamOptionsAction.INSTANCE, TransportDeleteDataStreamOptionsAction.class));
         actions.add(new ActionHandler(GetDataStreamSettingsAction.INSTANCE, TransportGetDataStreamSettingsAction.class));
         actions.add(new ActionHandler(UpdateDataStreamSettingsAction.INSTANCE, TransportUpdateDataStreamSettingsAction.class));
-        if (DataStream.LOGS_STREAM_FEATURE_FLAG) {
-            actions.add(new ActionHandler(GetDataStreamMappingsAction.INSTANCE, TransportGetDataStreamMappingsAction.class));
-            actions.add(new ActionHandler(UpdateDataStreamMappingsAction.INSTANCE, TransportUpdateDataStreamMappingsAction.class));
-        }
+        actions.add(new ActionHandler(GetDataStreamMappingsAction.INSTANCE, TransportGetDataStreamMappingsAction.class));
+        actions.add(new ActionHandler(UpdateDataStreamMappingsAction.INSTANCE, TransportUpdateDataStreamMappingsAction.class));
         return actions;
     }
 
@@ -294,10 +291,8 @@ public List<RestHandler> getRestHandlers(
         handlers.add(new RestDeleteDataStreamOptionsAction());
         handlers.add(new RestGetDataStreamSettingsAction());
         handlers.add(new RestUpdateDataStreamSettingsAction());
-        if (DataStream.LOGS_STREAM_FEATURE_FLAG) {
-            handlers.add(new RestGetDataStreamMappingsAction());
-            handlers.add(new RestUpdateDataStreamMappingsAction());
-        }
+        handlers.add(new RestGetDataStreamMappingsAction());
+        handlers.add(new RestUpdateDataStreamMappingsAction());
         return handlers;
     }
 

modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/250_data_stream_mappings.yml

@@ -4,9 +4,6 @@ setup:
 
 ---
 "Test single data stream":
-  - requires:
-      cluster_features: [ "logs_stream" ]
-      reason: requires setting 'logs_stream' to get or set data stream settings
   - do:
       allowed_warnings:
         - "index template [my-template] has index patterns [my-data-stream-*] matching patterns from existing older templates [global] with patterns (global => [*]); this template [my-template] will take precedence during new index creation"

rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_data_stream_mappings.json

@@ -5,8 +5,7 @@
       "description":"Gets a data stream's mappings"
     },
     "stability":"stable",
-    "visibility": "feature_flag",
-    "feature_flag": "logs_stream",
+    "visibility": "public",
     "headers":{
       "accept": [ "application/json"]
     },

rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_data_stream_mappings.json

@@ -5,8 +5,7 @@
       "description":"Updates a data stream's mappings"
     },
     "stability":"stable",
-    "visibility": "feature_flag",
-    "feature_flag": "logs_stream",
+    "visibility": "public",
     "headers":{
       "accept": [ "application/json"]
     },

server/src/main/java/org/elasticsearch/action/datastreams/GetDataStreamAction.java

@@ -423,15 +423,13 @@ public XContentBuilder toXContent(
                 builder.startObject(SETTINGS_FIELD.getPreferredName());
                 dataStream.getSettings().toXContent(builder, params);
                 builder.endObject();
-                if (DataStream.LOGS_STREAM_FEATURE_FLAG) {
-                    builder.field(MAPPINGS_FIELD.getPreferredName());
-                    Map<String, Object> uncompressedMappings = XContentHelper.convertToMap(
-                        dataStream.getMappings().uncompressed(),
-                        true,
-                        builder.contentType()
-                    ).v2();
-                    builder.map(uncompressedMappings);
-                }
+                builder.field(MAPPINGS_FIELD.getPreferredName());
+                Map<String, Object> uncompressedMappings = XContentHelper.convertToMap(
+                    dataStream.getMappings().uncompressed(),
+                    true,
+                    builder.contentType()
+                ).v2();
+                builder.map(uncompressedMappings);
                 builder.startObject(DataStream.FAILURE_STORE_FIELD.getPreferredName());
                 builder.field(FAILURE_STORE_ENABLED.getPreferredName(), failureStoreEffectivelyEnabled);
                 builder.field(DataStream.ROLLOVER_ON_WRITE_FIELD.getPreferredName(), dataStream.getFailureComponent().isRolloverOnWrite());

server/src/test/java/org/elasticsearch/action/datastreams/GetDataStreamActionTests.java

@@ -66,10 +66,8 @@ public void testDataStreamInfoToXContent() throws IOException {
             assertThat(lifecycleResult.get("retention_determined_by"), equalTo("max_global_retention"));
             Map<String, Map<String, Object>> settingsMap = (Map<String, Map<String, Object>>) resultMap.get("settings");
             assertThat(Settings.builder().loadFromMap(settingsMap).build(), equalTo(dataStreamInfo.getDataStream().getSettings()));
-            if (DataStream.LOGS_STREAM_FEATURE_FLAG) {
-                Map<String, Object> mappingsMap = (Map<String, Object>) resultMap.get("mappings");
-                assertThat(new CompressedXContent(mappingsMap), equalTo(dataStreamInfo.getDataStream().getMappings()));
-            }
+            Map<String, Object> mappingsMap = (Map<String, Object>) resultMap.get("mappings");
+            assertThat(new CompressedXContent(mappingsMap), equalTo(dataStreamInfo.getDataStream().getMappings()));
         }
     }