Rebranding user facing DLM references (#96866)

Part of bigger rebranding effort (#96875)

Author: gmarouli

docs/reference/dlm/apis/explain-data-lifecycle.asciidoc

@@ -55,7 +55,7 @@ GET .ds-metrics-2023.03.22-000001/_lifecycle/explain
 --------------------------------------------------
 // TEST[skip:we're not setting up DLM in these tests]
 
-If the index is managed by DLM `explain` will show the `managed_by_dlm` field
+If the index is managed by DLM `explain` will show the `managed_by_lifecycle` field
 set to `true` and the rest of the response will contain information about the
 lifecycle execution status for this index:
 
@@ -65,7 +65,7 @@ lifecycle execution status for this index:
   "indices": {
     ".ds-metrics-2023.03.22-000001": {
       "index" : ".ds-metrics-2023.03.22-000001",
-      "managed_by_dlm" : true,                        <1>
+      "managed_by_lifecycle" : true,                        <1>
       "index_creation_date_millis" : 1679475563571,   <2>
       "time_since_index_creation" : "843ms",          <3>
       "rollover_date_millis" : 1679475564293,         <4>
@@ -104,7 +104,7 @@ index:
   "indices": {
     ".ds-metrics-2023.03.22-000001": {
       "index" : ".ds-metrics-2023.03.22-000001",
-      "managed_by_dlm" : true,
+      "managed_by_lifecycle" : true,
       "index_creation_date_millis" : 1679475563571,
       "time_since_index_creation" : "843ms",
       "lifecycle" : { },

docs/reference/dlm/apis/get-lifecycle.asciidoc

@@ -75,7 +75,7 @@ duration the document could be deleted. When undefined, every document in this d
 `rollover`::
 (Optional, object)
 The conditions which will trigger the rollover of a backing index as configured by the cluster setting
-`cluster.dlm.default.rollover`. This property is an implementation detail and it will only be retrieved when the query
+`cluster.lifecycle.default.rollover`. This property is an implementation detail and it will only be retrieved when the query
 param `include_defaults` is set to `true`. The contents of this field are subject to change.
 =====
 ====

docs/reference/indices/get-data-stream.asciidoc

@@ -236,7 +236,7 @@ duration the document could be deleted. When empty, every document in this data
 `rollover`::
 (object)
 The conditions which will trigger the rollover of a backing index as configured by the cluster setting
-`cluster.dlm.default.rollover`. This property is an implementation detail and it will only be retrieved when the query
+`cluster.lifecycle.default.rollover`. This property is an implementation detail and it will only be retrieved when the query
 param `include_defaults` is set to `true`. The contents of this field are subject to change.
 =====
 ====

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

@@ -181,7 +181,7 @@ static GetDataStreamAction.Response innerOperation(
         return new GetDataStreamAction.Response(
             dataStreamInfos,
             request.includeDefaults() && DataLifecycle.isEnabled()
-                ? clusterSettings.get(DataLifecycle.CLUSTER_DLM_DEFAULT_ROLLOVER_SETTING)
+                ? clusterSettings.get(DataLifecycle.CLUSTER_LIFECYCLE_DEFAULT_ROLLOVER_SETTING)
                 : null
         );
     }

modules/dlm/build.gradle

@@ -30,7 +30,7 @@ testClusters.configureEach {
   // disable ILM history, since it disturbs tests using _all
   setting 'indices.lifecycle.history_index_enabled', 'false'
   setting 'xpack.security.enabled', 'true'
-  setting 'indices.dlm.poll_interval', '1000ms'
+  setting 'data_streams.lifecycle.poll_interval', '1000ms'
   keystore 'bootstrap.password', 'x-pack-test-password'
   user username: "x_pack_rest_user", password: "x-pack-test-password"
   requiresFeature 'es.dlm_feature_flag_enabled', Version.fromString("8.8.0")

modules/dlm/src/internalClusterTest/java/org/elasticsearch/dlm/DataLifecycleServiceIT.java

@@ -84,8 +84,8 @@ protected boolean ignoreExternalCluster() {
     @Override
     protected Settings nodeSettings(int nodeOrdinal, Settings otherSettings) {
         Settings.Builder settings = Settings.builder().put(super.nodeSettings(nodeOrdinal, otherSettings));
-        settings.put(DataLifecycleService.DLM_POLL_INTERVAL, "1s");
-        settings.put(DataLifecycle.CLUSTER_DLM_DEFAULT_ROLLOVER_SETTING.getKey(), "min_docs=1,max_docs=1");
+        settings.put(DataLifecycleService.DATA_STREAM_LIFECYCLE_POLL_INTERVAL, "1s");
+        settings.put(DataLifecycle.CLUSTER_LIFECYCLE_DEFAULT_ROLLOVER_SETTING.getKey(), "min_docs=1,max_docs=1");
         return settings.build();
     }
 
@@ -356,7 +356,7 @@ public void testAutomaticForceMerge() throws Exception {
     }
 
     private static void disableDLM() {
-        updateClusterSettings(Settings.builder().put(DataLifecycleService.DLM_POLL_INTERVAL, TimeValue.MAX_VALUE));
+        updateClusterSettings(Settings.builder().put(DataLifecycleService.DATA_STREAM_LIFECYCLE_POLL_INTERVAL, TimeValue.MAX_VALUE));
     }
 
     public void testErrorRecordingOnRollover() throws Exception {

modules/dlm/src/internalClusterTest/java/org/elasticsearch/dlm/ExplainDataLifecycleIT.java

@@ -68,8 +68,8 @@ protected boolean ignoreExternalCluster() {
     @Override
     protected Settings nodeSettings(int nodeOrdinal, Settings otherSettings) {
         Settings.Builder settings = Settings.builder().put(super.nodeSettings(nodeOrdinal, otherSettings));
-        settings.put(DataLifecycleService.DLM_POLL_INTERVAL, "1s");
-        settings.put(DataLifecycle.CLUSTER_DLM_DEFAULT_ROLLOVER_SETTING.getKey(), "min_docs=1,max_docs=1");
+        settings.put(DataLifecycleService.DATA_STREAM_LIFECYCLE_POLL_INTERVAL, "1s");
+        settings.put(DataLifecycle.CLUSTER_LIFECYCLE_DEFAULT_ROLLOVER_SETTING.getKey(), "min_docs=1,max_docs=1");
         return settings.build();
     }
 

modules/dlm/src/main/java/org/elasticsearch/dlm/DataLifecyclePlugin.java

@@ -125,7 +125,7 @@ public List<Setting<?>> getSettings() {
             return List.of();
         }
 
-        return List.of(DataLifecycleService.DLM_POLL_INTERVAL_SETTING);
+        return List.of(DataLifecycleService.DATA_STREAM_LIFECYCLE_POLL_INTERVAL_SETTING);
     }
 
     @Override

modules/dlm/src/main/java/org/elasticsearch/dlm/DataLifecycleService.java

@@ -66,13 +66,14 @@
 
 /**
  * This service will implement the needed actions (e.g. rollover, retention) to manage the data streams with a DLM lifecycle configured.
- * It runs on the master node and it schedules a job according to the configured {@link DataLifecycleService#DLM_POLL_INTERVAL_SETTING}.
+ * It runs on the master node and it schedules a job according to the configured
+ * {@link DataLifecycleService#DATA_STREAM_LIFECYCLE_POLL_INTERVAL_SETTING}.
  */
 public class DataLifecycleService implements ClusterStateListener, Closeable, SchedulerEngine.Listener {
 
-    public static final String DLM_POLL_INTERVAL = "indices.dlm.poll_interval";
-    public static final Setting<TimeValue> DLM_POLL_INTERVAL_SETTING = Setting.timeSetting(
-        DLM_POLL_INTERVAL,
+    public static final String DATA_STREAM_LIFECYCLE_POLL_INTERVAL = "data_streams.lifecycle.poll_interval";
+    public static final Setting<TimeValue> DATA_STREAM_LIFECYCLE_POLL_INTERVAL_SETTING = Setting.timeSetting(
+        DATA_STREAM_LIFECYCLE_POLL_INTERVAL,
         TimeValue.timeValueMinutes(10),
         TimeValue.timeValueSeconds(1),
         Setting.Property.Dynamic,
@@ -83,11 +84,11 @@ public class DataLifecycleService implements ClusterStateListener, Closeable, Sc
     /**
      * Name constant for the job DLM schedules
      */
-    private static final String DATA_LIFECYCLE_JOB_NAME = "dlm";
+    private static final String LIFECYCLE_JOB_NAME = "data_stream_lifecycle";
     /*
      * This is the key for DLM-related custom index metadata.
      */
-    static final String DLM_CUSTOM_INDEX_METADATA_KEY = "dlm";
+    static final String LIFECYCLE_CUSTOM_INDEX_METADATA_KEY = "data_stream_lifecycle";
     static final String FORCE_MERGE_COMPLETED_TIMESTAMP_METADATA_KEY = "force_merge_completed_timestamp";
 
     private final Settings settings;
@@ -137,8 +138,8 @@ public DataLifecycleService(
         this.nowSupplier = nowSupplier;
         this.errorStore = errorStore;
         this.scheduledJob = null;
-        this.pollInterval = DLM_POLL_INTERVAL_SETTING.get(settings);
-        this.rolloverConfiguration = clusterService.getClusterSettings().get(DataLifecycle.CLUSTER_DLM_DEFAULT_ROLLOVER_SETTING);
+        this.pollInterval = DATA_STREAM_LIFECYCLE_POLL_INTERVAL_SETTING.get(settings);
+        this.rolloverConfiguration = clusterService.getClusterSettings().get(DataLifecycle.CLUSTER_LIFECYCLE_DEFAULT_ROLLOVER_SETTING);
         this.forceMergeClusterStateUpdateTaskQueue = clusterService.createTaskQueue(
             "dlm-forcemerge-state-update",
             Priority.LOW,
@@ -151,9 +152,10 @@ public DataLifecycleService(
      */
     public void init() {
         clusterService.addListener(this);
-        clusterService.getClusterSettings().addSettingsUpdateConsumer(DLM_POLL_INTERVAL_SETTING, this::updatePollInterval);
         clusterService.getClusterSettings()
-            .addSettingsUpdateConsumer(DataLifecycle.CLUSTER_DLM_DEFAULT_ROLLOVER_SETTING, this::updateRolloverConfiguration);
+            .addSettingsUpdateConsumer(DATA_STREAM_LIFECYCLE_POLL_INTERVAL_SETTING, this::updatePollInterval);
+        clusterService.getClusterSettings()
+            .addSettingsUpdateConsumer(DataLifecycle.CLUSTER_LIFECYCLE_DEFAULT_ROLLOVER_SETTING, this::updateRolloverConfiguration);
     }
 
     @Override
@@ -190,7 +192,7 @@ public void close() {
 
     @Override
     public void triggered(SchedulerEngine.Event event) {
-        if (event.getJobName().equals(DATA_LIFECYCLE_JOB_NAME)) {
+        if (event.getJobName().equals(LIFECYCLE_JOB_NAME)) {
             if (this.isMaster) {
                 logger.trace("DLM job triggered: {}, {}, {}", event.getJobName(), event.getScheduledTime(), event.getTriggeredTime());
                 run(clusterService.state());
@@ -501,8 +503,9 @@ public void onFailure(Exception e) {
     }
 
     /*
-     * This method sets the value of the custom index metadata field "force_merge_completed_timestamp" within the field "dlm" to value. The
-     * method returns immediately, but the update happens asynchronously and listener is notified on success or failure.
+     * This method sets the value of the custom index metadata field "force_merge_completed_timestamp" within the field
+     * "data_stream_lifecycle" to value. The method returns immediately, but the update happens asynchronously and listener is notified on
+     * success or failure.
      */
     private void setForceMergeCompletedTimestamp(String targetIndex, ActionListener<Void> listener) {
         forceMergeClusterStateUpdateTaskQueue.submitTask(
@@ -513,10 +516,11 @@ private void setForceMergeCompletedTimestamp(String targetIndex, ActionListener<
     }
 
     /*
-     * Returns true if a value has been set for the custom index metadata field "force_merge_completed_timestamp" within the field "dlm".
+     * Returns true if a value has been set for the custom index metadata field "force_merge_completed_timestamp" within the field
+     * "data_stream_lifecycle".
      */
     private boolean isForceMergeComplete(IndexMetadata backingIndex) {
-        Map<String, String> customMetadata = backingIndex.getCustomData(DLM_CUSTOM_INDEX_METADATA_KEY);
+        Map<String, String> customMetadata = backingIndex.getCustomData(LIFECYCLE_CUSTOM_INDEX_METADATA_KEY);
         return customMetadata != null && customMetadata.containsKey(FORCE_MERGE_COMPLETED_TIMESTAMP_METADATA_KEY);
     }
 
@@ -574,7 +578,7 @@ private void updateRolloverConfiguration(RolloverConfiguration newRolloverConfig
 
     private void cancelJob() {
         if (scheduler.get() != null) {
-            scheduler.get().remove(DATA_LIFECYCLE_JOB_NAME);
+            scheduler.get().remove(LIFECYCLE_JOB_NAME);
             scheduledJob = null;
         }
     }
@@ -601,7 +605,7 @@ private void maybeScheduleJob() {
         }
 
         assert scheduler.get() != null : "scheduler should be available";
-        scheduledJob = new SchedulerEngine.Job(DATA_LIFECYCLE_JOB_NAME, new TimeValueSchedule(pollInterval));
+        scheduledJob = new SchedulerEngine.Job(LIFECYCLE_JOB_NAME, new TimeValueSchedule(pollInterval));
         scheduler.get().add(scheduledJob);
     }
 
@@ -628,14 +632,14 @@ static class UpdateForceMergeCompleteTask implements ClusterStateTaskListener {
         ClusterState execute(ClusterState currentState) throws Exception {
             logger.debug("Updating cluster state with force merge complete marker for {}", targetIndex);
             IndexMetadata indexMetadata = currentState.metadata().index(targetIndex);
-            Map<String, String> customMetadata = indexMetadata.getCustomData(DLM_CUSTOM_INDEX_METADATA_KEY);
+            Map<String, String> customMetadata = indexMetadata.getCustomData(LIFECYCLE_CUSTOM_INDEX_METADATA_KEY);
             Map<String, String> newCustomMetadata = new HashMap<>();
             if (customMetadata != null) {
                 newCustomMetadata.putAll(customMetadata);
             }
             newCustomMetadata.put(FORCE_MERGE_COMPLETED_TIMESTAMP_METADATA_KEY, Long.toString(threadPool.absoluteTimeInMillis()));
             IndexMetadata updatededIndexMetadata = new IndexMetadata.Builder(indexMetadata).putCustom(
-                DLM_CUSTOM_INDEX_METADATA_KEY,
+                LIFECYCLE_CUSTOM_INDEX_METADATA_KEY,
                 newCustomMetadata
             ).build();
             Metadata metadata = Metadata.builder(currentState.metadata()).put(updatededIndexMetadata, true).build();

modules/dlm/src/main/java/org/elasticsearch/dlm/action/TransportExplainDataLifecycleAction.java

@@ -111,7 +111,7 @@ protected void masterOperation(
             new ExplainDataLifecycleAction.Response(
                 explainIndices,
                 request.includeDefaults() && DataLifecycle.isEnabled()
-                    ? clusterSettings.get(DataLifecycle.CLUSTER_DLM_DEFAULT_ROLLOVER_SETTING)
+                    ? clusterSettings.get(DataLifecycle.CLUSTER_LIFECYCLE_DEFAULT_ROLLOVER_SETTING)
                     : null
             )
         );