Parcourir la source

Rename logstash management index template (#36626)

The logstash management template was named in such a way as to confuse
users, who misunderstood it to be a template for indices created by
logstash. It is now renamed to more clearly communicate its purpose and
match the format of the other templates for system indices.
Gordon Brown il y a 6 ans
Parent
commit
7bd7f022ef

+ 0 - 0
x-pack/plugin/core/src/main/resources/logstash-index-template.json → x-pack/plugin/core/src/main/resources/logstash-management.json


+ 5 - 2
x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/Logstash.java

@@ -28,7 +28,9 @@ import java.util.regex.Pattern;
  */
 public class Logstash extends Plugin implements ActionPlugin {
 
-    private static final String LOGSTASH_TEMPLATE_NAME = "logstash-index-template";
+    private static final String LOGSTASH_TEMPLATE_FILE_NAME = "logstash-management";
+    private static final String LOGSTASH_INDEX_NAME = ".logstash-management";
+    private static final String OLD_LOGSTASH_INDEX_NAME = "logstash-index-template";
     private static final String TEMPLATE_VERSION_PATTERN =
             Pattern.quote("${logstash.template.version}");
 
@@ -58,7 +60,8 @@ public class Logstash extends Plugin implements ActionPlugin {
 
     public UnaryOperator<Map<String, IndexTemplateMetaData>> getIndexTemplateMetaDataUpgrader() {
         return templates -> {
-            TemplateUtils.loadTemplateIntoMap("/" + LOGSTASH_TEMPLATE_NAME + ".json", templates, LOGSTASH_TEMPLATE_NAME,
+            templates.keySet().removeIf(OLD_LOGSTASH_INDEX_NAME::equals);
+            TemplateUtils.loadTemplateIntoMap("/" + LOGSTASH_TEMPLATE_FILE_NAME + ".json", templates, LOGSTASH_INDEX_NAME,
                     Version.CURRENT.toString(), TEMPLATE_VERSION_PATTERN, LogManager.getLogger(Logstash.class));
             return templates;
         };