From 36d292326ac0963ba2add5d515903551b8f9903f Mon Sep 17 00:00:00 2001 From: Vishal Raj Date: Wed, 11 Sep 2024 18:46:26 +0100 Subject: [PATCH] Ignore fallback component templates if not found --- .../main/resources/index-templates/logs-apm.app@template.yaml | 1 + .../main/resources/index-templates/logs-apm.error@template.yaml | 1 + .../main/resources/index-templates/metrics-apm.app@template.yaml | 1 + .../resources/index-templates/metrics-apm.internal@template.yaml | 1 + .../metrics-apm.service_destination.10m@template.yaml | 1 + .../metrics-apm.service_destination.1m@template.yaml | 1 + .../metrics-apm.service_destination.60m@template.yaml | 1 + .../metrics-apm.service_summary.10m@template.yaml | 1 + .../index-templates/metrics-apm.service_summary.1m@template.yaml | 1 + .../metrics-apm.service_summary.60m@template.yaml | 1 + .../metrics-apm.service_transaction.10m@template.yaml | 1 + .../metrics-apm.service_transaction.1m@template.yaml | 1 + .../metrics-apm.service_transaction.60m@template.yaml | 1 + .../index-templates/metrics-apm.transaction.10m@template.yaml | 1 + .../index-templates/metrics-apm.transaction.1m@template.yaml | 1 + .../index-templates/metrics-apm.transaction.60m@template.yaml | 1 + .../main/resources/index-templates/traces-apm.rum@template.yaml | 1 + .../resources/index-templates/traces-apm.sampled@template.yaml | 1 + .../src/main/resources/index-templates/traces-apm@template.yaml | 1 + 19 files changed, 19 insertions(+) diff --git a/x-pack/plugin/apm-data/src/main/resources/index-templates/logs-apm.app@template.yaml b/x-pack/plugin/apm-data/src/main/resources/index-templates/logs-apm.app@template.yaml index a84d5b899d75c..ff9fe7df03ab0 100644 --- a/x-pack/plugin/apm-data/src/main/resources/index-templates/logs-apm.app@template.yaml +++ b/x-pack/plugin/apm-data/src/main/resources/index-templates/logs-apm.app@template.yaml @@ -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/logs-apm.error@template.yaml b/x-pack/plugin/apm-data/src/main/resources/index-templates/logs-apm.error@template.yaml index 71b7859230d16..5f510df4ee065 100644 --- a/x-pack/plugin/apm-data/src/main/resources/index-templates/logs-apm.error@template.yaml +++ b/x-pack/plugin/apm-data/src/main/resources/index-templates/logs-apm.error@template.yaml @@ -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/metrics-apm.app@template.yaml b/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.app@template.yaml index e8f8ce3b25760..ff40c533aad66 100644 --- a/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.app@template.yaml +++ b/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.app@template.yaml @@ -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/metrics-apm.internal@template.yaml b/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.internal@template.yaml index 7e73dde13156d..4d1466f743672 100644 --- a/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.internal@template.yaml +++ b/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.internal@template.yaml @@ -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/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_destination.10m@template.yaml b/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_destination.10m@template.yaml index f10da8d87e025..d42f55ed0e67d 100644 --- a/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_destination.10m@template.yaml +++ b/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_destination.10m@template.yaml @@ -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/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_destination.1m@template.yaml b/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_destination.1m@template.yaml index 7e5ab0f2d87b2..1c2920febc159 100644 --- a/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_destination.1m@template.yaml +++ b/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_destination.1m@template.yaml @@ -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/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_destination.60m@template.yaml b/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_destination.60m@template.yaml index a087e8ea8b403..44948e820a7b7 100644 --- a/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_destination.60m@template.yaml +++ b/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_destination.60m@template.yaml @@ -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/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_summary.10m@template.yaml b/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_summary.10m@template.yaml index 37781991d9c4d..ad18d23a2d928 100644 --- a/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_summary.10m@template.yaml +++ b/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_summary.10m@template.yaml @@ -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/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_summary.1m@template.yaml b/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_summary.1m@template.yaml index 0609b6af02d05..8f0faa960ff48 100644 --- a/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_summary.1m@template.yaml +++ b/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_summary.1m@template.yaml @@ -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/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_summary.60m@template.yaml b/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_summary.60m@template.yaml index f9eca377482c3..97438c80bb92e 100644 --- a/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_summary.60m@template.yaml +++ b/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_summary.60m@template.yaml @@ -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/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_transaction.10m@template.yaml b/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_transaction.10m@template.yaml index 47605b19424c3..a941e3b41d775 100644 --- a/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_transaction.10m@template.yaml +++ b/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_transaction.10m@template.yaml @@ -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/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_transaction.1m@template.yaml b/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_transaction.1m@template.yaml index ad8a983535d3c..51d06f8bbbec7 100644 --- a/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_transaction.1m@template.yaml +++ b/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_transaction.1m@template.yaml @@ -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/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_transaction.60m@template.yaml b/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_transaction.60m@template.yaml index dea2c3382ecca..f1432e7208776 100644 --- a/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_transaction.60m@template.yaml +++ b/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_transaction.60m@template.yaml @@ -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/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.transaction.10m@template.yaml b/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.transaction.10m@template.yaml index 08c0494d4cf58..21ed837d2107e 100644 --- a/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.transaction.10m@template.yaml +++ b/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.transaction.10m@template.yaml @@ -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/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.transaction.1m@template.yaml b/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.transaction.1m@template.yaml index 221a988e2371f..8dc59895cdbbd 100644 --- a/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.transaction.1m@template.yaml +++ b/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.transaction.1m@template.yaml @@ -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/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.transaction.60m@template.yaml b/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.transaction.60m@template.yaml index 2f50fe63875fe..e0d8db2c3481f 100644 --- a/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.transaction.60m@template.yaml +++ b/x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.transaction.60m@template.yaml @@ -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/traces-apm.rum@template.yaml b/x-pack/plugin/apm-data/src/main/resources/index-templates/traces-apm.rum@template.yaml index a6aeaff2b6f40..6421fcca80275 100644 --- a/x-pack/plugin/apm-data/src/main/resources/index-templates/traces-apm.rum@template.yaml +++ b/x-pack/plugin/apm-data/src/main/resources/index-templates/traces-apm.rum@template.yaml @@ -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/traces-apm.sampled@template.yaml b/x-pack/plugin/apm-data/src/main/resources/index-templates/traces-apm.sampled@template.yaml index 9ec276fdad580..9170306f3e8c3 100644 --- a/x-pack/plugin/apm-data/src/main/resources/index-templates/traces-apm.sampled@template.yaml +++ b/x-pack/plugin/apm-data/src/main/resources/index-templates/traces-apm.sampled@template.yaml @@ -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/traces-apm@template.yaml b/x-pack/plugin/apm-data/src/main/resources/index-templates/traces-apm@template.yaml index 3808f132d0106..d431c9c2a17eb 100644 --- a/x-pack/plugin/apm-data/src/main/resources/index-templates/traces-apm@template.yaml +++ b/x-pack/plugin/apm-data/src/main/resources/index-templates/traces-apm@template.yaml @@ -20,6 +20,7 @@ composed_of: ignore_missing_component_templates: - traces@custom - traces-apm@custom +- traces-apm-fallback@ilm template: settings: index: