Browse Source

Removing the data stream settings feature flag (#128594)

Keith Massey 4 months ago
parent
commit
dc2fbe19a6

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

@@ -24,7 +24,6 @@ import org.elasticsearch.action.datastreams.lifecycle.ExplainDataStreamLifecycle
 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;
@@ -283,10 +282,8 @@ public class DataStreamsPlugin extends Plugin implements ActionPlugin, HealthPlu
         handlers.add(new RestGetDataStreamOptionsAction());
         handlers.add(new RestPutDataStreamOptionsAction());
         handlers.add(new RestDeleteDataStreamOptionsAction());
-        if (DataStream.LOGS_STREAM_FEATURE_FLAG) {
-            handlers.add(new RestGetDataStreamSettingsAction());
-            handlers.add(new RestUpdateDataStreamSettingsAction());
-        }
+        handlers.add(new RestGetDataStreamSettingsAction());
+        handlers.add(new RestUpdateDataStreamSettingsAction());
         return handlers;
     }
 

+ 1 - 2
rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_data_stream_settings.json

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

+ 1 - 2
rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_data_stream_settings.json

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

+ 3 - 5
server/src/main/java/org/elasticsearch/action/datastreams/GetDataStreamAction.java

@@ -418,11 +418,9 @@ public class GetDataStreamAction extends ActionType<GetDataStreamAction.Response
                     builder.endArray();
                     builder.endObject();
                 }
-                if (DataStream.LOGS_STREAM_FEATURE_FLAG) {
-                    builder.startObject(SETTINGS_FIELD.getPreferredName());
-                    dataStream.getSettings().toXContent(builder, params);
-                    builder.endObject();
-                }
+                builder.startObject(SETTINGS_FIELD.getPreferredName());
+                dataStream.getSettings().toXContent(builder, params);
+                builder.endObject();
 
                 builder.startObject(DataStream.FAILURE_STORE_FIELD.getPreferredName());
                 builder.field(FAILURE_STORE_ENABLED.getPreferredName(), failureStoreEffectivelyEnabled);