Skip to content

Commit 4a3ebfc

Browse files
committed
Removing the data stream settings feature flag
1 parent c2ad34b commit 4a3ebfc

File tree

5 files changed

+2
-9
lines changed

5 files changed

+2
-9
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,10 +283,8 @@ public List<RestHandler> getRestHandlers(
283283
handlers.add(new RestGetDataStreamOptionsAction());
284284
handlers.add(new RestPutDataStreamOptionsAction());
285285
handlers.add(new RestDeleteDataStreamOptionsAction());
286-
if (DataStream.LOGS_STREAM_FEATURE_FLAG) {
287286
handlers.add(new RestGetDataStreamSettingsAction());
288287
handlers.add(new RestUpdateDataStreamSettingsAction());
289-
}
290288
return handlers;
291289
}
292290

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: 0 additions & 2 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) {
422421
builder.startObject(SETTINGS_FIELD.getPreferredName());
423422
dataStream.getSettings().toXContent(builder, params);
424423
builder.endObject();
425-
}
426424

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

server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ public final class DataStream implements SimpleDiffable<DataStream>, ToXContentO
8080
private static final Logger LOGGER = LogManager.getLogger(DataStream.class);
8181

8282
public static final NodeFeature DATA_STREAM_FAILURE_STORE_FEATURE = new NodeFeature("data_stream.failure_store");
83-
public static final boolean LOGS_STREAM_FEATURE_FLAG = new FeatureFlag("logs_stream").isEnabled();
8483
public static final TransportVersion ADDED_FAILURE_STORE_TRANSPORT_VERSION = TransportVersions.V_8_12_0;
8584
public static final TransportVersion ADDED_AUTO_SHARDING_EVENT_VERSION = TransportVersions.V_8_14_0;
8685
public static final TransportVersion ADD_DATA_STREAM_OPTIONS_VERSION = TransportVersions.V_8_16_0;

0 commit comments

Comments
 (0)