Merge remote-tracking branch 'origin/main' into ga-data-stream-lifecy…

…cles
dakrone · Apr 17, 2024 · b0c8679 · b0c8679
2 parents a8371ea + a809641
commit b0c8679
Show file tree

Hide file tree

Showing 40 changed files with 97 additions and 1,508 deletions.
diff --git a/docs/changelog/105682.yaml b/docs/changelog/105682.yaml
diff --git a/docs/reference/data-streams/data-stream-apis.asciidoc b/docs/reference/data-streams/data-stream-apis.asciidoc
@@ -27,12 +27,6 @@ preview:[]
 preview:[]
 * <<data-streams-get-lifecycle-stats,Get data stream lifecycle stats>>
 preview:[]
-* <<data-streams-put-global-retention,Update the global retention for data stream lifecycle managed data streams>>
-preview:[]
-* <<data-streams-get-global-retention,Get the global retention for data stream lifecycle managed data streams>>
-preview:[]
-* <<data-streams-delete-global-retention,Delete the global retention for data stream lifecycle managed data streams>>
-preview:[]
 
 The following API is available for <<tsds,time series data streams>>:
 
@@ -65,10 +59,4 @@ include::{es-ref-dir}/data-streams/lifecycle/apis/explain-lifecycle.asciidoc[]
 
 include::{es-ref-dir}/data-streams/lifecycle/apis/get-lifecycle-stats.asciidoc[]
 
-include::{es-ref-dir}/data-streams/lifecycle/apis/put-global-retention.asciidoc[]
-
-include::{es-ref-dir}/data-streams/lifecycle/apis/get-global-retention.asciidoc[]
-
-include::{es-ref-dir}/data-streams/lifecycle/apis/delete-global-retention.asciidoc[]
-
 include::{es-ref-dir}/indices/downsample-data-stream.asciidoc[]
diff --git a/docs/reference/data-streams/lifecycle/apis/delete-global-retention.asciidoc b/docs/reference/data-streams/lifecycle/apis/delete-global-retention.asciidoc
diff --git a/docs/reference/data-streams/lifecycle/apis/get-global-retention.asciidoc b/docs/reference/data-streams/lifecycle/apis/get-global-retention.asciidoc
diff --git a/docs/reference/data-streams/lifecycle/apis/get-lifecycle.asciidoc b/docs/reference/data-streams/lifecycle/apis/get-lifecycle.asciidoc
@@ -128,18 +128,14 @@ The response will look like the following:
       "name": "my-data-stream-1",
       "lifecycle": {
         "enabled": true,
-        "data_retention": "7d",
-        "effective_retention": "7d",
-        "retention_determined_by": "data_stream_configuration"
+        "data_retention": "7d"
       }
     },
     {
       "name": "my-data-stream-2",
       "lifecycle": {
         "enabled": true,
-        "data_retention": "7d",
-        "effective_retention": "7d",
-        "retention_determined_by": "data_stream_configuration"
+        "data_retention": "7d"
       }
     }
   ]