[plugin/apm-data] Allow fallback of templates to template-resources

x-pack/plugin/apm-data/src/main/resources/index-templates/logs-apm.app@template.yaml

@@ -12,6 +12,7 @@ composed_of:
 - apm@settings
 - apm-10d@lifecycle
 - logs-apm@settings
+- logs-apm.app-fallback@lifecycle
 - logs@custom
 - logs-apm.app@custom
 - ecs@mappings

x-pack/plugin/apm-data/src/main/resources/index-templates/logs-apm.error@template.yaml

@@ -14,6 +14,7 @@ composed_of:
 - apm-10d@lifecycle
 - logs-apm@settings
 - logs-apm.error@mappings
+- logs-apm.error-fallback@lifecycle
 - logs@custom
 - logs-apm.error@custom
 - ecs@mappings

x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.app@template.yaml

@@ -13,6 +13,7 @@ composed_of:
 - apm-90d@lifecycle
 - metrics-apm@mappings
 - metrics-apm@settings
+- metrics-apm.app-fallback@lifecycle
 - metrics@custom
 - metrics-apm.app@custom
 - ecs@mappings

x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.internal@template.yaml

@@ -14,6 +14,7 @@ composed_of:
 - apm-90d@lifecycle
 - metrics-apm@mappings
 - metrics-apm@settings
+- metrics-apm.internal-fallback@lifecycle
 - metrics@custom
 - metrics-apm.internal@custom
 - ecs@mappings

x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_destination.10m@template.yaml

@@ -16,6 +16,7 @@ composed_of:
 - metrics-apm@mappings
 - metrics-apm@settings
 - metrics-apm.service_destination@mappings
+- metrics-apm.service_destination.10m-fallback@lifecycle
 - metrics@custom
 - metrics-apm.service_destination.10m@custom
 - ecs@mappings

x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_destination.1m@template.yaml

@@ -15,6 +15,7 @@ composed_of:
 - metrics-apm@mappings
 - metrics-apm@settings
 - metrics-apm.service_destination@mappings
+- metrics-apm.service_destination.1m-fallback@lifecycle
 - metrics@custom
 - metrics-apm.service_destination.1m@custom
 - ecs@mappings

x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_destination.60m@template.yaml

@@ -16,6 +16,7 @@ composed_of:
 - metrics-apm@mappings
 - metrics-apm@settings
 - metrics-apm.service_destination@mappings
+- metrics-apm.service_destination.60m-fallback@lifecycle
 - metrics@custom
 - metrics-apm.service_destination.60m@custom
 - ecs@mappings

x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_summary.10m@template.yaml

@@ -16,6 +16,7 @@ composed_of:
 - metrics-apm@mappings
 - metrics-apm@settings
 - metrics-apm.service_summary@mappings
+- metrics-apm.service_summary.10m-fallback@lifecycle
 - metrics@custom
 - metrics-apm.service_summary.10m@custom
 - ecs@mappings

x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_summary.1m@template.yaml

@@ -15,6 +15,7 @@ composed_of:
 - metrics-apm@mappings
 - metrics-apm@settings
 - metrics-apm.service_summary@mappings
+- metrics-apm.service_summary.1m-fallback@lifecycle
 - metrics@custom
 - metrics-apm.service_summary.1m@custom
 - ecs@mappings

x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_summary.60m@template.yaml

@@ -16,6 +16,7 @@ composed_of:
 - metrics-apm@mappings
 - metrics-apm@settings
 - metrics-apm.service_summary@mappings
+- metrics-apm.service_summary.60m-fallback@lifecycle
 - metrics@custom
 - metrics-apm.service_summary.60m@custom
 - ecs@mappings

x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_transaction.10m@template.yaml

@@ -16,6 +16,7 @@ composed_of:
 - metrics-apm@mappings
 - metrics-apm@settings
 - metrics-apm.service_transaction@mappings
+- metrics-apm.service_transaction.10m-fallback@lifecycle
 - metrics@custom
 - metrics-apm.service_transaction.10m@custom
 - ecs@mappings

x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_transaction.1m@template.yaml

@@ -15,6 +15,7 @@ composed_of:
 - metrics-apm@mappings
 - metrics-apm@settings
 - metrics-apm.service_transaction@mappings
+- metrics-apm.service_transaction.1m-fallback@lifecycle
 - metrics@custom
 - metrics-apm.service_transaction.1m@custom
 - ecs@mappings

x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.service_transaction.60m@template.yaml

@@ -16,6 +16,7 @@ composed_of:
 - metrics-apm@mappings
 - metrics-apm@settings
 - metrics-apm.service_transaction@mappings
+- metrics-apm.service_transaction.60m-fallback@lifecycle
 - metrics@custom
 - metrics-apm.service_transaction.60m@custom
 - ecs@mappings

x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.transaction.10m@template.yaml

@@ -16,6 +16,7 @@ composed_of:
 - metrics-apm@mappings
 - metrics-apm@settings
 - metrics-apm.transaction@mappings
+- metrics-apm.transaction.10m-fallback@lifecycle
 - metrics@custom
 - metrics-apm.transaction.10m@custom
 - ecs@mappings

x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.transaction.1m@template.yaml

@@ -15,6 +15,7 @@ composed_of:
 - metrics-apm@mappings
 - metrics-apm@settings
 - metrics-apm.transaction@mappings
+- metrics-apm.transaction.1m-fallback@lifecycle
 - metrics@custom
 - metrics-apm.transaction.1m@custom
 - ecs@mappings

x-pack/plugin/apm-data/src/main/resources/index-templates/metrics-apm.transaction.60m@template.yaml

@@ -16,6 +16,7 @@ composed_of:
 - metrics-apm@mappings
 - metrics-apm@settings
 - metrics-apm.transaction@mappings
+- metrics-apm.transaction.60m-fallback@lifecycle
 - metrics@custom
 - metrics-apm.transaction.60m@custom
 - ecs@mappings

x-pack/plugin/apm-data/src/main/resources/index-templates/traces-apm.rum@template.yaml

@@ -14,6 +14,7 @@ composed_of:
 - apm-90d@lifecycle
 - traces-apm@mappings
 - traces-apm.rum@mappings
+- traces-apm.rum-fallback@lifecycle
 - traces@custom
 - traces-apm.rum@custom
 - ecs@mappings

x-pack/plugin/apm-data/src/main/resources/index-templates/traces-apm.sampled@template.yaml

@@ -11,6 +11,7 @@ composed_of:
 - traces@mappings
 - apm@mappings
 - apm@settings
+- traces-apm.sampled-fallback@lifecycle
 - traces@custom
 - traces-apm.sampled@custom
 - ecs@mappings

x-pack/plugin/apm-data/src/main/resources/index-templates/traces-apm@template.yaml

@@ -13,6 +13,7 @@ composed_of:
 - apm@settings
 - apm-10d@lifecycle
 - traces-apm@mappings
+- traces-apm-fallback@lifecycle
 - traces@custom
 - traces-apm@custom
 - ecs@mappings

x-pack/plugin/apm-data/src/main/resources/resources.yaml

@@ -25,6 +25,26 @@ component-templates:
   - metrics-apm.transaction@mappings
   - traces-apm@mappings
   - traces-apm.rum@mappings
+  # Fallback to ILM if DSL configurations are not present
+  - logs-apm.app-fallback@lifecycle
+  - logs-apm.error-fallback@lifecycle
+  - metrics-apm.app-fallback@lifecycle
+  - metrics-apm.internal-fallback@lifecycle
+  - metrics-apm.service_destination.10m-fallback@lifecycle
+  - metrics-apm.service_destination.1m-fallback@lifecycle
+  - metrics-apm.service_destination.60m-fallback@lifecycle
+  - metrics-apm.service_summary.10m-fallback@lifecycle
+  - metrics-apm.service_summary.1m-fallback@lifecycle
+  - metrics-apm.service_summary.60m-fallback@lifecycle
+  - metrics-apm.service_transaction.10m-fallback@lifecycle
+  - metrics-apm.service_transaction.1m-fallback@lifecycle
+  - metrics-apm.service_transaction.60m-fallback@lifecycle
+  - metrics-apm.transaction.10m-fallback@lifecycle
+  - metrics-apm.transaction.1m-fallback@lifecycle
+  - metrics-apm.transaction.60m-fallback@lifecycle
+  - traces-apm-fallback@lifecycle
+  - traces-apm.rum-fallback@lifecycle
+  - traces-apm.sampled-fallback@lifecycle
 
 index-templates:
   - logs-apm.app@template

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/template/ResourceUtils.java

@@ -7,12 +7,15 @@
 
 package org.elasticsearch.xpack.core.template;
 
+import org.elasticsearch.xpack.core.template.resources.TemplateResources;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
 public class ResourceUtils {
+
     static byte[] loadVersionedResourceUTF8(Class<?> clazz, String name, int version, String versionProperty) {
         return loadVersionedResourceUTF8(clazz, name, version, versionProperty, Map.of());
     }
@@ -25,16 +28,19 @@ static byte[] loadVersionedResourceUTF8(
         Map<String, String> variables
     ) {
         try {
-            String content = loadResource(clazz, name);
+            String content = loadResourceWithFallback(clazz, name);
             content = TemplateUtils.replaceVariables(content, String.valueOf(version), versionProperty, variables);
             return content.getBytes(StandardCharsets.UTF_8);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
     }
 
-    public static String loadResource(Class<?> clazz, String name) throws IOException {
+    static String loadResourceWithFallback(Class<?> clazz, String name) throws IOException {
         InputStream is = clazz.getResourceAsStream(name);
+        if (is == null) {
+            is = TemplateResources.class.getResourceAsStream("/"+clazz.getPackageName()+name);
+        }
         if (is == null) {
             throw new IOException("Resource [" + name + "] not found in classpath.");
         }

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/template/YamlTemplateRegistry.java

@@ -31,7 +31,7 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import static org.elasticsearch.xpack.core.template.ResourceUtils.loadResource;
+import static org.elasticsearch.xpack.core.template.ResourceUtils.loadResourceWithFallback;
 import static org.elasticsearch.xpack.core.template.ResourceUtils.loadVersionedResourceUTF8;
 
 /**
@@ -64,7 +64,7 @@ public YamlTemplateRegistry(
         try {
             final Map<String, Object> resources = XContentHelper.convertToMap(
                 YamlXContent.yamlXContent,
-                loadResource(this.getClass(), "/resources.yaml"),
+                loadResourceWithFallback(this.getClass(), "/resources.yaml"),
                 false
             );
             version = (((Number) resources.get("version")).intValue());

x-pack/plugin/core/template-resources/src/main/resources/org.elasticsearch.xpack.apmdata/component-templates/logs-apm.app-fallback@lifecycle.yaml

@@ -0,0 +1,11 @@
+---
+version: ${xpack.apmdata.template.version}
+_meta:
+  description: Fallback to ILM policy for logs-apm.app if DSL not defined
+  managed: true
+template:
+  settings:
+    index:
+      lifecycle:
+        name: logs-apm.app_logs-default_policy
+        prefer_ilm: false

x-pack/plugin/core/template-resources/src/main/resources/org.elasticsearch.xpack.apmdata/component-templates/logs-apm.error-fallback@lifecycle.yaml

@@ -0,0 +1,11 @@
+---
+version: ${xpack.apmdata.template.version}
+_meta:
+  description: Fallback to ILM policy for logs-apm.error if DSL not defined
+  managed: true
+template:
+  settings:
+    index:
+      lifecycle:
+        name: logs-apm.error_logs-default_policy
+        prefer_ilm: false

x-pack/plugin/core/template-resources/src/main/resources/org.elasticsearch.xpack.apmdata/component-templates/metrics-apm.app-fallback@lifecycle.yaml

@@ -0,0 +1,11 @@
+---
+version: ${xpack.apmdata.template.version}
+_meta:
+  description: Fallback to ILM policy for metrics-apm.app if DSL not defined
+  managed: true
+template:
+  settings:
+    index:
+      lifecycle:
+        name: metrics-apm.app_metrics-default_policy
+        prefer_ilm: false

x-pack/plugin/core/template-resources/src/main/resources/org.elasticsearch.xpack.apmdata/component-templates/metrics-apm.internal-fallback@lifecycle.yaml

@@ -0,0 +1,11 @@
+---
+version: ${xpack.apmdata.template.version}
+_meta:
+  description: Fallback to ILM policy for metrics-apm.internal if DSL not defined
+  managed: true
+template:
+  settings:
+    index:
+      lifecycle:
+        name: metrics-apm.internal_metrics-default_policy
+        prefer_ilm: false

x-pack/plugin/core/template-resources/src/main/resources/org.elasticsearch.xpack.apmdata/component-templates/metrics-apm.service_destination.10m-fallback@lifecycle.yaml

@@ -0,0 +1,11 @@
+---
+version: ${xpack.apmdata.template.version}
+_meta:
+  description: Fallback to ILM policy for metrics-apm.service_destination.10m if DSL not defined
+  managed: true
+template:
+  settings:
+    index:
+      lifecycle:
+        name: metrics-apm.service_destination_10m_metrics-default_policy
+        prefer_ilm: false

x-pack/plugin/core/template-resources/src/main/resources/org.elasticsearch.xpack.apmdata/component-templates/metrics-apm.service_destination.1m-fallback@lifecycle.yaml

@@ -0,0 +1,11 @@
+---
+version: ${xpack.apmdata.template.version}
+_meta:
+  description: Fallback to ILM policy for metrics-apm.service_destination.1m if DSL not defined
+  managed: true
+template:
+  settings:
+    index:
+      lifecycle:
+        name: metrics-apm.service_destination_1m_metrics-default_policy
+        prefer_ilm: false

x-pack/plugin/core/template-resources/src/main/resources/org.elasticsearch.xpack.apmdata/component-templates/metrics-apm.service_destination.60m-fallback@lifecycle.yaml

@@ -0,0 +1,11 @@
+---
+version: ${xpack.apmdata.template.version}
+_meta:
+  description: Fallback to ILM policy for metrics-apm.service_destination.60m if DSL not defined
+  managed: true
+template:
+  settings:
+    index:
+      lifecycle:
+        name: metrics-apm.service_destination_60m_metrics-default_policy
+        prefer_ilm: false

x-pack/plugin/core/template-resources/src/main/resources/org.elasticsearch.xpack.apmdata/component-templates/metrics-apm.service_summary.10m-fallback@lifecycle.yaml

@@ -0,0 +1,11 @@
+---
+version: ${xpack.apmdata.template.version}
+_meta:
+  description: Fallback to ILM policy for metrics-apm.service_summary.10m if DSL not defined
+  managed: true
+template:
+  settings:
+    index:
+      lifecycle:
+        name: metrics-apm.service_summary_10m_metrics-default_policy
+        prefer_ilm: false

x-pack/plugin/core/template-resources/src/main/resources/org.elasticsearch.xpack.apmdata/component-templates/metrics-apm.service_summary.1m-fallback@lifecycle.yaml

@@ -0,0 +1,11 @@
+---
+version: ${xpack.apmdata.template.version}
+_meta:
+  description: Fallback to ILM policy for metrics-apm.service_summary.1m if DSL not defined
+  managed: true
+template:
+  settings:
+    index:
+      lifecycle:
+        name: metrics-apm.service_summary_1m_metrics-default_policy
+        prefer_ilm: false

x-pack/plugin/core/template-resources/src/main/resources/org.elasticsearch.xpack.apmdata/component-templates/metrics-apm.service_summary.60m-fallback@lifecycle.yaml

@@ -0,0 +1,11 @@
+---
+version: ${xpack.apmdata.template.version}
+_meta:
+  description: Fallback to ILM policy for metrics-apm.service_summary.60m if DSL not defined
+  managed: true
+template:
+  settings:
+    index:
+      lifecycle:
+        name: metrics-apm.service_summary_60m_metrics-default_policy
+        prefer_ilm: false

x-pack/plugin/core/template-resources/src/main/resources/org.elasticsearch.xpack.apmdata/component-templates/metrics-apm.service_transaction.10m-fallback@lifecycle.yaml

@@ -0,0 +1,11 @@
+---
+version: ${xpack.apmdata.template.version}
+_meta:
+  description: Fallback to ILM policy for metrics-apm.service_transaction.10m if DSL not defined
+  managed: true
+template:
+  settings:
+    index:
+      lifecycle:
+        name: metrics-apm.service_transaction_10m_metrics-default_policy
+        prefer_ilm: false

x-pack/plugin/core/template-resources/src/main/resources/org.elasticsearch.xpack.apmdata/component-templates/metrics-apm.service_transaction.1m-fallback@lifecycle.yaml

@@ -0,0 +1,11 @@
+---
+version: ${xpack.apmdata.template.version}
+_meta:
+  description: Fallback to ILM policy for metrics-apm.service_transaction.1m if DSL not defined
+  managed: true
+template:
+  settings:
+    index:
+      lifecycle:
+        name: metrics-apm.service_transaction_1m_metrics-default_policy
+        prefer_ilm: false

x-pack/plugin/core/template-resources/src/main/resources/org.elasticsearch.xpack.apmdata/component-templates/metrics-apm.service_transaction.60m-fallback@lifecycle.yaml

@@ -0,0 +1,11 @@
+---
+version: ${xpack.apmdata.template.version}
+_meta:
+  description: Fallback to ILM policy for metrics-apm.service_transaction.60m if DSL not defined
+  managed: true
+template:
+  settings:
+    index:
+      lifecycle:
+        name: metrics-apm.service_transaction_60m_metrics-default_policy
+        prefer_ilm: false