Skip to content

Commit be40a20

Browse files
masseykeSamiul-TheSoccerFan
authored andcommitted
Removing the data stream settings feature flag (elastic#128594)
1 parent 0a1177e commit be40a20

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
@@ -24,7 +24,6 @@
2424
import org.elasticsearch.action.datastreams.lifecycle.GetDataStreamLifecycleAction;
2525
import org.elasticsearch.action.datastreams.lifecycle.PutDataStreamLifecycleAction;
2626
import org.elasticsearch.client.internal.OriginSettingClient;
27-
import org.elasticsearch.cluster.metadata.DataStream;
2827
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
2928
import org.elasticsearch.cluster.node.DiscoveryNodes;
3029
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
@@ -283,10 +282,8 @@ public List<RestHandler> getRestHandlers(
283282
handlers.add(new RestGetDataStreamOptionsAction());
284283
handlers.add(new RestPutDataStreamOptionsAction());
285284
handlers.add(new RestDeleteDataStreamOptionsAction());
286-
if (DataStream.LOGS_STREAM_FEATURE_FLAG) {
287-
handlers.add(new RestGetDataStreamSettingsAction());
288-
handlers.add(new RestUpdateDataStreamSettingsAction());
289-
}
285+
handlers.add(new RestGetDataStreamSettingsAction());
286+
handlers.add(new RestUpdateDataStreamSettingsAction());
290287
return handlers;
291288
}
292289

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
@@ -418,11 +418,9 @@ public XContentBuilder toXContent(
418418
builder.endArray();
419419
builder.endObject();
420420
}
421-
if (DataStream.LOGS_STREAM_FEATURE_FLAG) {
422-
builder.startObject(SETTINGS_FIELD.getPreferredName());
423-
dataStream.getSettings().toXContent(builder, params);
424-
builder.endObject();
425-
}
421+
builder.startObject(SETTINGS_FIELD.getPreferredName());
422+
dataStream.getSettings().toXContent(builder, params);
423+
builder.endObject();
426424

427425
builder.startObject(DataStream.FAILURE_STORE_FIELD.getPreferredName());
428426
builder.field(FAILURE_STORE_ENABLED.getPreferredName(), failureStoreEffectivelyEnabled);

0 commit comments

Comments
 (0)