Revert "Mark legacy stack templates as deprecated (elastic#101476)" (e…

…lastic#101935) * Revert "Mark legacy stack templates as deprecated (elastic#101476)" This reverts commit 16cce1f. * Remove test that was part of revert conflict --------- Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
n1v0lg · Nov 8, 2023 · 2ebd084 · 2ebd084
1 parent 57acc1c
commit 2ebd084
Show file tree

Hide file tree

Showing 33 changed files with 69 additions and 277 deletions.
diff --git a/docs/changelog/101476.yaml b/docs/changelog/101476.yaml
diff --git a/x-pack/plugin/apm-data/src/main/java/org/elasticsearch/xpack/apmdata/ResourceUtils.java b/x-pack/plugin/apm-data/src/main/java/org/elasticsearch/xpack/apmdata/ResourceUtils.java
@@ -13,20 +13,15 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
-import java.util.Map;
 
 public class ResourceUtils {
 
     public static final String APM_TEMPLATE_VERSION_VARIABLE = "xpack.apmdata.template.version";
 
     static byte[] loadVersionedResourceUTF8(String name, int version) {
-        return loadVersionedResourceUTF8(name, version, Map.of());
-    }
-
-    static byte[] loadVersionedResourceUTF8(String name, int version, Map<String, String> variables) {
         try {
             String content = loadResource(name);
-            content = TemplateUtils.replaceVariables(content, String.valueOf(version), APM_TEMPLATE_VERSION_VARIABLE, variables);
+            content = TemplateUtils.replaceVariable(content, APM_TEMPLATE_VERSION_VARIABLE, String.valueOf(version));
             return content.getBytes(StandardCharsets.UTF_8);
         } catch (IOException e) {
             throw new RuntimeException(e);

diff --git a/...ugin/apm-data/src/main/java/org/elasticsearch/xpack/apmdata/YamlIngestPipelineConfig.java b/...ugin/apm-data/src/main/java/org/elasticsearch/xpack/apmdata/YamlIngestPipelineConfig.java
@@ -31,6 +31,6 @@ public XContentType getXContentType() {
 
     @Override
     public BytesReference loadConfig() {
-        return new BytesArray(loadVersionedResourceUTF8("/ingest-pipelines/" + id + ".yaml", version, variables));
+        return new BytesArray(loadVersionedResourceUTF8("/ingest-pipelines/" + id + ".yaml", version));
     }
 }
diff --git a/...plugin/core/src/main/java/org/elasticsearch/xpack/core/template/IngestPipelineConfig.java b/...plugin/core/src/main/java/org/elasticsearch/xpack/core/template/IngestPipelineConfig.java
@@ -12,7 +12,6 @@
 
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -23,7 +22,6 @@ public abstract class IngestPipelineConfig {
     protected final String resource;
     protected final int version;
     protected final String versionProperty;
-    protected final Map<String, String> variables;
 
     /**
      * A list of this pipeline's dependencies, for example - such referred to through a pipeline processor.
@@ -37,23 +35,11 @@ public IngestPipelineConfig(String id, String resource, int version, String vers
     }
 
     public IngestPipelineConfig(String id, String resource, int version, String versionProperty, List<String> dependencies) {
-        this(id, resource, version, versionProperty, dependencies, Map.of());
-    }
-
-    public IngestPipelineConfig(
-        String id,
-        String resource,
-        int version,
-        String versionProperty,
-        List<String> dependencies,
-        Map<String, String> variables
-    ) {
         this.id = Objects.requireNonNull(id);
         this.resource = Objects.requireNonNull(resource);
         this.version = version;
         this.versionProperty = Objects.requireNonNull(versionProperty);
         this.dependencies = dependencies;
-        this.variables = Objects.requireNonNull(variables);
     }
 
     public String getId() {

diff --git a/...in/core/src/main/java/org/elasticsearch/xpack/core/template/JsonIngestPipelineConfig.java b/...in/core/src/main/java/org/elasticsearch/xpack/core/template/JsonIngestPipelineConfig.java
@@ -12,7 +12,6 @@
 import org.elasticsearch.xcontent.XContentType;
 
 import java.util.List;
-import java.util.Map;
 
 public class JsonIngestPipelineConfig extends IngestPipelineConfig {
     public JsonIngestPipelineConfig(String id, String resource, int version, String versionProperty) {
@@ -23,24 +22,13 @@ public JsonIngestPipelineConfig(String id, String resource, int version, String
         super(id, resource, version, versionProperty, dependencies);
     }
 
-    public JsonIngestPipelineConfig(
-        String id,
-        String resource,
-        int version,
-        String versionProperty,
-        List<String> dependencies,
-        Map<String, String> variables
-    ) {
-        super(id, resource, version, versionProperty, dependencies, variables);
-    }
-
     @Override
     public XContentType getXContentType() {
         return XContentType.JSON;
     }
 
     @Override
     public BytesReference loadConfig() {
-        return new BytesArray(TemplateUtils.loadTemplate(resource, String.valueOf(version), versionProperty, variables));
+        return new BytesArray(TemplateUtils.loadTemplate(resource, String.valueOf(version), versionProperty));
     }
 }
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/template/TemplateUtils.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/template/TemplateUtils.java
@@ -98,7 +98,7 @@ public static void validate(String source) {
         }
     }
 
-    public static String replaceVariables(String input, String version, String versionProperty, Map<String, String> variables) {
+    private static String replaceVariables(String input, String version, String versionProperty, Map<String, String> variables) {
         String template = replaceVariable(input, versionProperty, version);
         for (Map.Entry<String, String> variable : variables.entrySet()) {
             template = replaceVariable(template, variable.getKey(), variable.getValue());

diff --git a/x-pack/plugin/core/template-resources/src/main/resources/180-days@lifecycle.json b/x-pack/plugin/core/template-resources/src/main/resources/180-days@lifecycle.json
@@ -33,6 +33,5 @@
   "_meta": {
     "description": "built-in ILM policy using the hot, warm, and cold phases with a retention of 180 days",
     "managed": true
-  },
-  "deprecated": ${xpack.stack.template.deprecated}
+  }
 }
diff --git a/x-pack/plugin/core/template-resources/src/main/resources/30-days@lifecycle.json b/x-pack/plugin/core/template-resources/src/main/resources/30-days@lifecycle.json
@@ -29,6 +29,5 @@
   "_meta": {
     "description": "built-in ILM policy using the hot and warm phases with a retention of 30 days",
     "managed": true
-  },
-  "deprecated": ${xpack.stack.template.deprecated}
+  }
 }
diff --git a/x-pack/plugin/core/template-resources/src/main/resources/365-days@lifecycle.json b/x-pack/plugin/core/template-resources/src/main/resources/365-days@lifecycle.json
@@ -33,6 +33,5 @@
   "_meta": {
     "description": "built-in ILM policy using the hot, warm, and cold phases with a retention of 365 days",
     "managed": true
-  },
-  "deprecated": ${xpack.stack.template.deprecated}
+  }
 }
diff --git a/x-pack/plugin/core/template-resources/src/main/resources/7-days@lifecycle.json b/x-pack/plugin/core/template-resources/src/main/resources/7-days@lifecycle.json
@@ -29,6 +29,5 @@
   "_meta": {
     "description": "built-in ILM policy using the hot and warm phases with a retention of 7 days",
     "managed": true
-  },
-  "deprecated": ${xpack.stack.template.deprecated}
+  }
 }
diff --git a/x-pack/plugin/core/template-resources/src/main/resources/90-days@lifecycle.json b/x-pack/plugin/core/template-resources/src/main/resources/90-days@lifecycle.json
@@ -33,6 +33,5 @@
   "_meta": {
     "description": "built-in ILM policy using the hot, warm, and cold phases with a retention of 90 days",
     "managed": true
-  },
-  "deprecated": ${xpack.stack.template.deprecated}
+  }
 }
diff --git a/x-pack/plugin/core/template-resources/src/main/resources/data-streams@mappings.json b/x-pack/plugin/core/template-resources/src/main/resources/data-streams@mappings.json
@@ -63,6 +63,5 @@
     "description": "general mapping conventions for data streams",
     "managed": true
   },
-  "version": ${xpack.stack.template.version},
-  "deprecated": ${xpack.stack.template.deprecated}
+  "version": ${xpack.stack.template.version}
 }
diff --git a/x-pack/plugin/core/template-resources/src/main/resources/ecs@mappings.json b/x-pack/plugin/core/template-resources/src/main/resources/ecs@mappings.json
@@ -190,6 +190,5 @@
     "description": "dynamic mappings based on ECS, installed by x-pack",
     "managed": true
   },
-  "version": ${xpack.stack.template.version},
-  "deprecated": ${xpack.stack.template.deprecated}
+  "version": ${xpack.stack.template.version}
 }
diff --git a/x-pack/plugin/core/template-resources/src/main/resources/kibana-reporting@template.json b/x-pack/plugin/core/template-resources/src/main/resources/kibana-reporting@template.json
@@ -173,6 +173,5 @@
     "description": "default kibana reporting template installed by elasticsearch",
     "managed": true
   },
-  "version": ${xpack.stack.template.version},
-  "deprecated": ${xpack.stack.template.deprecated}
+  "version": ${xpack.stack.template.version}
 }
diff --git a/x-pack/plugin/core/template-resources/src/main/resources/logs@default-pipeline.json b/x-pack/plugin/core/template-resources/src/main/resources/logs@default-pipeline.json
@@ -20,6 +20,5 @@
     "description": "default pipeline for the logs index template installed by x-pack",
     "managed": true
   },
-  "version": ${xpack.stack.template.version},
-  "deprecated": ${xpack.stack.template.deprecated}
+  "version": ${xpack.stack.template.version}
 }
diff --git a/x-pack/plugin/core/template-resources/src/main/resources/logs@json-pipeline.json b/x-pack/plugin/core/template-resources/src/main/resources/logs@json-pipeline.json
@@ -44,6 +44,5 @@
     "description": "automatic parsing of JSON log messages",
     "managed": true
   },
-  "version": ${xpack.stack.template.version},
-  "deprecated": ${xpack.stack.template.deprecated}
+  "version": ${xpack.stack.template.version}
 }
diff --git a/x-pack/plugin/core/template-resources/src/main/resources/logs@lifecycle.json b/x-pack/plugin/core/template-resources/src/main/resources/logs@lifecycle.json
@@ -12,6 +12,5 @@
   "_meta": {
     "description": "default policy for the logs index template installed by x-pack",
     "managed": true
-  },
-  "deprecated": ${xpack.stack.template.deprecated}
+  }
 }
diff --git a/x-pack/plugin/core/template-resources/src/main/resources/logs@mappings.json b/x-pack/plugin/core/template-resources/src/main/resources/logs@mappings.json
@@ -23,6 +23,5 @@
     "description": "default mappings for the logs index template installed by x-pack",
     "managed": true
   },
-  "version": ${xpack.stack.template.version},
-  "deprecated": ${xpack.stack.template.deprecated}
+  "version": ${xpack.stack.template.version}
 }
diff --git a/x-pack/plugin/core/template-resources/src/main/resources/logs@settings.json b/x-pack/plugin/core/template-resources/src/main/resources/logs@settings.json
@@ -20,6 +20,5 @@
     "description": "default settings for the logs index template installed by x-pack",
     "managed": true
   },
-  "version": ${xpack.stack.template.version},
-  "deprecated": ${xpack.stack.template.deprecated}
+  "version": ${xpack.stack.template.version}
 }
diff --git a/x-pack/plugin/core/template-resources/src/main/resources/logs@template.json b/x-pack/plugin/core/template-resources/src/main/resources/logs@template.json
@@ -14,6 +14,5 @@
     "description": "default logs template installed by x-pack",
     "managed": true
   },
-  "version": ${xpack.stack.template.version},
-  "deprecated": ${xpack.stack.template.deprecated}
+  "version": ${xpack.stack.template.version}
 }
diff --git a/x-pack/plugin/core/template-resources/src/main/resources/metrics@lifecycle.json b/x-pack/plugin/core/template-resources/src/main/resources/metrics@lifecycle.json
@@ -12,6 +12,5 @@
   "_meta": {
     "description": "default policy for the metrics index template installed by x-pack",
     "managed": true
-  },
-  "deprecated": ${xpack.stack.template.deprecated}
+  }
 }
diff --git a/x-pack/plugin/core/template-resources/src/main/resources/metrics@mappings.json b/x-pack/plugin/core/template-resources/src/main/resources/metrics@mappings.json
@@ -53,6 +53,5 @@
     "description": "default mappings for the metrics index template installed by x-pack",
     "managed": true
   },
-  "version": ${xpack.stack.template.version},
-  "deprecated": ${xpack.stack.template.deprecated}
+  "version": ${xpack.stack.template.version}
 }
diff --git a/x-pack/plugin/core/template-resources/src/main/resources/metrics@settings.json b/x-pack/plugin/core/template-resources/src/main/resources/metrics@settings.json
@@ -16,6 +16,5 @@
     "description": "default settings for the metrics index template installed by x-pack",
     "managed": true
   },
-  "version": ${xpack.stack.template.version},
-  "deprecated": ${xpack.stack.template.deprecated}
+  "version": ${xpack.stack.template.version}
 }
diff --git a/x-pack/plugin/core/template-resources/src/main/resources/metrics@template.json b/x-pack/plugin/core/template-resources/src/main/resources/metrics@template.json
@@ -12,6 +12,5 @@
     "description": "default metrics template installed by x-pack",
     "managed": true
   },
-  "version": ${xpack.stack.template.version},
-  "deprecated": ${xpack.stack.template.deprecated}
+  "version": ${xpack.stack.template.version}
 }
diff --git a/x-pack/plugin/core/template-resources/src/main/resources/metrics@tsdb-settings.json b/x-pack/plugin/core/template-resources/src/main/resources/metrics@tsdb-settings.json
@@ -15,6 +15,5 @@
     "description": "default settings for the metrics index template installed by x-pack",
     "managed": true
   },
-  "version": ${xpack.stack.template.version},
-  "deprecated": ${xpack.stack.template.deprecated}
+  "version": ${xpack.stack.template.version}
 }
diff --git a/x-pack/plugin/core/template-resources/src/main/resources/synthetics@lifecycle.json b/x-pack/plugin/core/template-resources/src/main/resources/synthetics@lifecycle.json
@@ -12,6 +12,5 @@
   "_meta": {
     "description": "default policy for the synthetics index template installed by x-pack",
     "managed": true
-  },
-  "deprecated": ${xpack.stack.template.deprecated}
+  }
 }
diff --git a/x-pack/plugin/core/template-resources/src/main/resources/synthetics@mappings.json b/x-pack/plugin/core/template-resources/src/main/resources/synthetics@mappings.json
@@ -17,6 +17,5 @@
     "description": "default mappings for the synthetics index template installed by x-pack",
     "managed": true
   },
-  "version": ${xpack.stack.template.version},
-  "deprecated": ${xpack.stack.template.deprecated}
+  "version": ${xpack.stack.template.version}
 }
diff --git a/x-pack/plugin/core/template-resources/src/main/resources/synthetics@settings.json b/x-pack/plugin/core/template-resources/src/main/resources/synthetics@settings.json
@@ -13,6 +13,5 @@
     "description": "default settings for the synthetics index template installed by x-pack",
     "managed": true
   },
-  "version": ${xpack.stack.template.version},
-  "deprecated": ${xpack.stack.template.deprecated}
+  "version": ${xpack.stack.template.version}
 }
diff --git a/x-pack/plugin/core/template-resources/src/main/resources/synthetics@template.json b/x-pack/plugin/core/template-resources/src/main/resources/synthetics@template.json
@@ -12,6 +12,5 @@
     "description": "default synthetics template installed by x-pack",
     "managed": true
   },
-  "version": ${xpack.stack.template.version},
-  "deprecated": ${xpack.stack.template.deprecated}
+  "version": ${xpack.stack.template.version}
 }