Skip to content

Commit fb0bc21

Browse files
masseykejoegallo
authored andcommitted
Removing the data stream settings feature flag (#128594)
1 parent 24c2afc commit fb0bc21

File tree

4 files changed

+7
-14
lines changed

4 files changed

+7
-14
lines changed

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.elasticsearch.action.datastreams.lifecycle.GetDataStreamLifecycleAction;
2727
import org.elasticsearch.action.datastreams.lifecycle.PutDataStreamLifecycleAction;
2828
import org.elasticsearch.client.internal.OriginSettingClient;
29-
import org.elasticsearch.cluster.metadata.DataStream;
3029
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
3130
import org.elasticsearch.cluster.node.DiscoveryNodes;
3231
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
@@ -285,10 +284,8 @@ public List<RestHandler> getRestHandlers(
285284
handlers.add(new RestGetDataStreamOptionsAction());
286285
handlers.add(new RestPutDataStreamOptionsAction());
287286
handlers.add(new RestDeleteDataStreamOptionsAction());
288-
if (DataStream.LOGS_STREAM_FEATURE_FLAG) {
289-
handlers.add(new RestGetDataStreamSettingsAction());
290-
handlers.add(new RestUpdateDataStreamSettingsAction());
291-
}
287+
handlers.add(new RestGetDataStreamSettingsAction());
288+
handlers.add(new RestUpdateDataStreamSettingsAction());
292289
return handlers;
293290
}
294291

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
"description":"Gets a data stream's settings"
66
},
77
"stability":"stable",
8-
"visibility": "feature_flag",
9-
"feature_flag": "logs_stream",
8+
"visibility": "public",
109
"headers":{
1110
"accept": [ "application/json"]
1211
},

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
"description":"Updates a data stream's settings"
66
},
77
"stability":"stable",
8-
"visibility": "feature_flag",
9-
"feature_flag": "logs_stream",
8+
"visibility": "public",
109
"headers":{
1110
"accept": [ "application/json"]
1211
},

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -435,11 +435,9 @@ public XContentBuilder toXContent(
435435
builder.endArray();
436436
builder.endObject();
437437
}
438-
if (DataStream.LOGS_STREAM_FEATURE_FLAG) {
439-
builder.startObject(SETTINGS_FIELD.getPreferredName());
440-
dataStream.getSettings().toXContent(builder, params);
441-
builder.endObject();
442-
}
438+
builder.startObject(SETTINGS_FIELD.getPreferredName());
439+
dataStream.getSettings().toXContent(builder, params);
440+
builder.endObject();
443441

444442
builder.startObject(DataStream.FAILURE_STORE_FIELD.getPreferredName());
445443
builder.field(FAILURE_STORE_ENABLED.getPreferredName(), failureStoreEffectivelyEnabled);

0 commit comments

Comments
 (0)