Revert "[plugin/apm-data] Set fallback to legacy ILM policies (#112028)"

This reverts commit fd37ef8.
elastic · Aug 22, 2024 · ce9a78f · ce9a78f
1 parent 322d319
commit ce9a78f
Show file tree

Hide file tree

Showing 20 changed files with 1 addition and 60 deletions.
diff --git a/x-pack/plugin/apm-data/src/main/resources/index-templates/[email protected] b/x-pack/plugin/apm-data/src/main/resources/index-templates/[email protected]
@@ -23,6 +23,3 @@ template:
     index:
       default_pipeline: logs-apm.app@default-pipeline
       final_pipeline: apm@pipeline
-      lifecycle:
-        name: logs-apm.app_logs-default_policy
-        prefer_ilm: false
diff --git a/x-pack/plugin/apm-data/src/main/resources/index-templates/[email protected] b/x-pack/plugin/apm-data/src/main/resources/index-templates/[email protected]
@@ -30,6 +30,3 @@ template:
     index:
       default_pipeline: logs-apm.error@default-pipeline
       final_pipeline: apm@pipeline
-      lifecycle:
-        name: logs-apm.error_logs-default_policy
-        prefer_ilm: false
diff --git a/x-pack/plugin/apm-data/src/main/resources/index-templates/[email protected] b/x-pack/plugin/apm-data/src/main/resources/index-templates/[email protected]
@@ -24,6 +24,3 @@ template:
     index:
       default_pipeline: metrics-apm.app@default-pipeline
       final_pipeline: metrics-apm@pipeline
-      lifecycle:
-        name: metrics-apm.app_metrics-default_policy
-        prefer_ilm: false
diff --git a/x-pack/plugin/apm-data/src/main/resources/index-templates/[email protected] b/x-pack/plugin/apm-data/src/main/resources/index-templates/[email protected]
@@ -25,9 +25,6 @@ template:
     index:
       default_pipeline: metrics-apm.internal@default-pipeline
       final_pipeline: metrics-apm@pipeline
-      lifecycle:
-        name: metrics-apm.internal_metrics-default_policy
-        prefer_ilm: false
   mappings:
     properties:
       data_stream.dataset:

diff --git a/...data/src/main/resources/index-templates/[email protected] b/...data/src/main/resources/index-templates/[email protected]
@@ -27,9 +27,6 @@ template:
     index:
       default_pipeline: metrics-apm.service_destination@default-pipeline
       final_pipeline: metrics-apm@pipeline
-      lifecycle:
-        name: metrics-apm.service_destination_10m_metrics-default_policy
-        prefer_ilm: false
   mappings:
     properties:
       metricset.interval:

diff --git a/...-data/src/main/resources/index-templates/[email protected] b/...-data/src/main/resources/index-templates/[email protected]
@@ -26,9 +26,6 @@ template:
     index:
       default_pipeline: metrics-apm.service_destination@default-pipeline
       final_pipeline: metrics-apm@pipeline
-      lifecycle:
-        name: metrics-apm.service_destination_1m_metrics-default_policy
-        prefer_ilm: false
   mappings:
     properties:
       metricset.interval:

diff --git a/...data/src/main/resources/index-templates/[email protected] b/...data/src/main/resources/index-templates/[email protected]
@@ -27,9 +27,6 @@ template:
     index:
       default_pipeline: metrics-apm.service_destination@default-pipeline
       final_pipeline: metrics-apm@pipeline
-      lifecycle:
-        name: metrics-apm.service_destination_60m_metrics-default_policy
-        prefer_ilm: false
   mappings:
     properties:
       metricset.interval:

diff --git a/...apm-data/src/main/resources/index-templates/[email protected] b/...apm-data/src/main/resources/index-templates/[email protected]
@@ -27,9 +27,6 @@ template:
     index:
       default_pipeline: metrics-apm.service_summary@default-pipeline
       final_pipeline: metrics-apm@pipeline
-      lifecycle:
-        name: metrics-apm.service_summary_10m_metrics-default_policy
-        prefer_ilm: false
   mappings:
     properties:
       metricset.interval:

diff --git a/.../apm-data/src/main/resources/index-templates/[email protected] b/.../apm-data/src/main/resources/index-templates/[email protected]
@@ -26,9 +26,6 @@ template:
     index:
       default_pipeline: metrics-apm.service_summary@default-pipeline
       final_pipeline: metrics-apm@pipeline
-      lifecycle:
-        name: metrics-apm.service_summary_1m_metrics-default_policy
-        prefer_ilm: false
   mappings:
     properties:
       metricset.interval:

diff --git a/...apm-data/src/main/resources/index-templates/[email protected] b/...apm-data/src/main/resources/index-templates/[email protected]
@@ -27,9 +27,6 @@ template:
     index:
       default_pipeline: metrics-apm.service_summary@default-pipeline
       final_pipeline: metrics-apm@pipeline
-      lifecycle:
-        name: metrics-apm.service_summary_60m_metrics-default_policy
-        prefer_ilm: false
   mappings:
     properties:
       metricset.interval:

diff --git a/...data/src/main/resources/index-templates/[email protected] b/...data/src/main/resources/index-templates/[email protected]
@@ -27,9 +27,6 @@ template:
     index:
       default_pipeline: metrics-apm.service_transaction@default-pipeline
       final_pipeline: metrics-apm@pipeline
-      lifecycle:
-        name: metrics-apm.service_transaction_10m_metrics-default_policy
-        prefer_ilm: false
   mappings:
     properties:
       metricset.interval:

diff --git a/...-data/src/main/resources/index-templates/[email protected] b/...-data/src/main/resources/index-templates/[email protected]
@@ -26,9 +26,6 @@ template:
     index:
       default_pipeline: metrics-apm.service_transaction@default-pipeline
       final_pipeline: metrics-apm@pipeline
-      lifecycle:
-        name: metrics-apm.service_transaction_1m_metrics-default_policy
-        prefer_ilm: false
   mappings:
     properties:
       metricset.interval:

diff --git a/...data/src/main/resources/index-templates/[email protected] b/...data/src/main/resources/index-templates/[email protected]
@@ -27,9 +27,6 @@ template:
     index:
       default_pipeline: metrics-apm.service_transaction@default-pipeline
       final_pipeline: metrics-apm@pipeline
-      lifecycle:
-        name: metrics-apm.service_transaction_60m_metrics-default_policy
-        prefer_ilm: false
   mappings:
     properties:
       metricset.interval:

diff --git a/...gin/apm-data/src/main/resources/index-templates/[email protected] b/...gin/apm-data/src/main/resources/index-templates/[email protected]
@@ -27,9 +27,6 @@ template:
     index:
       default_pipeline: metrics-apm.transaction@default-pipeline
       final_pipeline: metrics-apm@pipeline
-      lifecycle:
-        name: metrics-apm.transaction_10m_metrics-default_policy
-        prefer_ilm: false
   mappings:
     properties:
       metricset.interval:

diff --git a/...ugin/apm-data/src/main/resources/index-templates/[email protected] b/...ugin/apm-data/src/main/resources/index-templates/[email protected]
@@ -26,9 +26,6 @@ template:
     index:
       default_pipeline: metrics-apm.transaction@default-pipeline
       final_pipeline: metrics-apm@pipeline
-      lifecycle:
-        name: metrics-apm.transaction_1m_metrics-default_policy
-        prefer_ilm: false
   mappings:
     properties:
       metricset.interval:

diff --git a/...gin/apm-data/src/main/resources/index-templates/[email protected] b/...gin/apm-data/src/main/resources/index-templates/[email protected]
@@ -27,9 +27,6 @@ template:
     index:
       default_pipeline: metrics-apm.transaction@default-pipeline
       final_pipeline: metrics-apm@pipeline
-      lifecycle:
-        name: metrics-apm.transaction_60m_metrics-default_policy
-        prefer_ilm: false
   mappings:
     properties:
       metricset.interval:

diff --git a/x-pack/plugin/apm-data/src/main/resources/index-templates/[email protected] b/x-pack/plugin/apm-data/src/main/resources/index-templates/[email protected]
@@ -25,9 +25,6 @@ template:
     index:
       default_pipeline: traces-apm.rum@default-pipeline
       final_pipeline: traces-apm@pipeline
-      lifecycle:
-        name: traces-apm.rum_traces-default_policy
-        prefer_ilm: false
   mappings:
     properties:
       data_stream.type:

diff --git a/x-pack/plugin/apm-data/src/main/resources/index-templates/[email protected] b/x-pack/plugin/apm-data/src/main/resources/index-templates/[email protected]
@@ -20,11 +20,6 @@ ignore_missing_component_templates:
 template:
   lifecycle:
     data_retention: 1h
-  settings:
-    index:
-      lifecycle:
-        name: traces-apm.sampled_traces-default_policy
-        prefer_ilm: false
   mappings:
     properties:
       data_stream.type:

diff --git a/x-pack/plugin/apm-data/src/main/resources/index-templates/[email protected] b/x-pack/plugin/apm-data/src/main/resources/index-templates/[email protected]
@@ -24,9 +24,6 @@ template:
     index:
       default_pipeline: traces-apm@default-pipeline
       final_pipeline: traces-apm@pipeline
-      lifecycle:
-        name: traces-apm.traces-default_policy
-        prefer_ilm: false
   mappings:
     properties:
       data_stream.type:

diff --git a/x-pack/plugin/apm-data/src/main/resources/resources.yaml b/x-pack/plugin/apm-data/src/main/resources/resources.yaml
@@ -1,7 +1,7 @@
 # "version" holds the version of the templates and ingest pipelines installed
 # by xpack-plugin apm-data. This must be increased whenever an existing template or
 # pipeline is changed, in order for it to be updated on Elasticsearch upgrade.
-version: 7
+version: 6
 
 component-templates:
   # Data lifecycle.