Ignore fallback component templates if not found

elastic · Sep 11, 2024 · 21ee4f2 · 21ee4f2
1 parent 317d57f
commit 21ee4f2
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 0 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]
@@ -19,6 +19,7 @@ composed_of:
 ignore_missing_component_templates:
 - logs@custom
 - logs-apm.app@custom
+- logs-apm.app-fallback@ilm
 template:
   settings:
     index:

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]
@@ -21,6 +21,7 @@ composed_of:
 ignore_missing_component_templates:
 - logs@custom
 - logs-apm.error@custom
+- logs-apm.error-fallback@ilm
 template:
   mappings:
     properties:

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,6 +20,7 @@ composed_of:
 ignore_missing_component_templates:
 - metrics@custom
 - metrics-apm.app@custom
+- metrics-apm.app-fallback@ilm
 template:
   settings:
     index:

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]
@@ -21,6 +21,7 @@ composed_of:
 ignore_missing_component_templates:
 - metrics@custom
 - metrics-apm.internal@custom
+- metrics-apm.internal-fallback@ilm
 template:
   settings:
     index:

diff --git a/...data/src/main/resources/index-templates/[email protected] b/...data/src/main/resources/index-templates/[email protected]
@@ -23,6 +23,7 @@ composed_of:
 ignore_missing_component_templates:
 - metrics@custom
 - metrics-apm.service_destination.10m@custom
+- metrics-apm.service_destination.10m-fallback@ilm
 template:
   settings:
     index:

diff --git a/...-data/src/main/resources/index-templates/[email protected] b/...-data/src/main/resources/index-templates/[email protected]
@@ -22,6 +22,7 @@ composed_of:
 ignore_missing_component_templates:
 - metrics@custom
 - metrics-apm.service_destination.1m@custom
+- metrics-apm.service_destination.1m-fallback@ilm
 template:
   settings:
     index:

diff --git a/...data/src/main/resources/index-templates/[email protected] b/...data/src/main/resources/index-templates/[email protected]
@@ -23,6 +23,7 @@ composed_of:
 ignore_missing_component_templates:
 - metrics@custom
 - metrics-apm.service_destination.60m@custom
+- metrics-apm.service_destination.60m-fallback@ilm
 template:
   settings:
     index:

diff --git a/...apm-data/src/main/resources/index-templates/[email protected] b/...apm-data/src/main/resources/index-templates/[email protected]
@@ -23,6 +23,7 @@ composed_of:
 ignore_missing_component_templates:
 - metrics@custom
 - metrics-apm.service_summary.10m@custom
+- metrics-apm.service_summary.10m-fallback@ilm
 template:
   settings:
     index:

diff --git a/.../apm-data/src/main/resources/index-templates/[email protected] b/.../apm-data/src/main/resources/index-templates/[email protected]
@@ -22,6 +22,7 @@ composed_of:
 ignore_missing_component_templates:
 - metrics@custom
 - metrics-apm.service_summary.1m@custom
+- metrics-apm.service_summary.1m-fallback@ilm
 template:
   settings:
     index:

diff --git a/...apm-data/src/main/resources/index-templates/[email protected] b/...apm-data/src/main/resources/index-templates/[email protected]
@@ -23,6 +23,7 @@ composed_of:
 ignore_missing_component_templates:
 - metrics@custom
 - metrics-apm.service_summary.60m@custom
+- metrics-apm.service_summary.60m-fallback@ilm
 template:
   settings:
     index:

diff --git a/...data/src/main/resources/index-templates/[email protected] b/...data/src/main/resources/index-templates/[email protected]
@@ -23,6 +23,7 @@ composed_of:
 ignore_missing_component_templates:
 - metrics@custom
 - metrics-apm.service_transaction.10m@custom
+- metrics-apm.service_transaction.10m-fallback@ilm
 template:
   settings:
     index:

diff --git a/...-data/src/main/resources/index-templates/[email protected] b/...-data/src/main/resources/index-templates/[email protected]
@@ -22,6 +22,7 @@ composed_of:
 ignore_missing_component_templates:
 - metrics@custom
 - metrics-apm.service_transaction.1m@custom
+- metrics-apm.service_transaction.1m-fallback@ilm
 template:
   settings:
     index:

diff --git a/...data/src/main/resources/index-templates/[email protected] b/...data/src/main/resources/index-templates/[email protected]
@@ -23,6 +23,7 @@ composed_of:
 ignore_missing_component_templates:
 - metrics@custom
 - metrics-apm.service_transaction.60m@custom
+- metrics-apm.service_transaction.60m-fallback@ilm
 template:
   settings:
     index:

diff --git a/...gin/apm-data/src/main/resources/index-templates/[email protected] b/...gin/apm-data/src/main/resources/index-templates/[email protected]
@@ -23,6 +23,7 @@ composed_of:
 ignore_missing_component_templates:
 - metrics@custom
 - metrics-apm.transaction.10m@custom
+- metrics-apm.transaction.10m-fallback@ilm
 template:
   settings:
     index:

diff --git a/...ugin/apm-data/src/main/resources/index-templates/[email protected] b/...ugin/apm-data/src/main/resources/index-templates/[email protected]
@@ -22,6 +22,7 @@ composed_of:
 ignore_missing_component_templates:
 - metrics@custom
 - metrics-apm.transaction.1m@custom
+- metrics-apm.transaction.1m-fallback@ilm
 template:
   settings:
     index:

diff --git a/...gin/apm-data/src/main/resources/index-templates/[email protected] b/...gin/apm-data/src/main/resources/index-templates/[email protected]
@@ -23,6 +23,7 @@ composed_of:
 ignore_missing_component_templates:
 - metrics@custom
 - metrics-apm.transaction.60m@custom
+- metrics-apm.transaction.60m-fallback@ilm
 template:
   settings:
     index:

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]
@@ -21,6 +21,7 @@ composed_of:
 ignore_missing_component_templates:
 - traces@custom
 - traces-apm.rum@custom
+- traces-apm.rum-fallback@ilm
 template:
   settings:
     index:

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]
@@ -18,6 +18,7 @@ composed_of:
 ignore_missing_component_templates:
 - traces@custom
 - traces-apm.sampled@custom
+- traces-apm.sampled-fallback@ilm
 template:
   lifecycle:
     data_retention: 1h

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,6 +20,7 @@ composed_of:
 ignore_missing_component_templates:
 - traces@custom
 - traces-apm@custom
+- traces-apm-fallback@ilm
 template:
   settings:
     index: