Use index prefix for template index pattern in ElasticMeterRegistry (#…

…2197) Closes gh-2196
micrometer-metrics · Sep 17, 2020 · 17f5210 · 17f5210
1 parent 2f6558d
commit 17f5210
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/...micrometer-registry-elastic/src/main/java/io/micrometer/elastic/ElasticMeterRegistry.java b/...micrometer-registry-elastic/src/main/java/io/micrometer/elastic/ElasticMeterRegistry.java
@@ -38,6 +38,7 @@
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -90,9 +91,9 @@ public class ElasticMeterRegistry extends StepMeterRegistry {
             "    \"type\": \"double\"\n" +
             "  }\n" +
             "}";
-    private static final String TEMPLATE_BODY_BEFORE_VERSION_7 = "{\"template\":\"metrics*\",\"mappings\":{\"_default_\":{\"_all\":{\"enabled\":false}," + TEMPLATE_PROPERTIES + "}}}";
-    private static final String TEMPLATE_BODY_AFTER_VERSION_7 = "{\n" +
-            "  \"index_patterns\": [\"metrics*\"],\n" +
+    private static final Function<String, String> TEMPLATE_BODY_BEFORE_VERSION_7 = (indexPrefix) -> "{\"template\":\"" + indexPrefix + "*\",\"mappings\":{\"_default_\":{\"_all\":{\"enabled\":false}," + TEMPLATE_PROPERTIES + "}}}";
+    private static final Function<String, String> TEMPLATE_BODY_AFTER_VERSION_7 = (indexPrefix) -> "{\n" +
+            "  \"index_patterns\": [\"" + indexPrefix + "*\"],\n" +
             "  \"mappings\": {\n" +
             "    \"_source\": {\n" +
             "      \"enabled\": false\n" +
@@ -180,7 +181,7 @@ private void createIndexTemplateIfNeeded() {
     }
 
     private String getTemplateBody() {
-        return majorVersion < 7 ? TEMPLATE_BODY_BEFORE_VERSION_7 : TEMPLATE_BODY_AFTER_VERSION_7;
+        return majorVersion < 7 ? TEMPLATE_BODY_BEFORE_VERSION_7.apply(config.index()) : TEMPLATE_BODY_AFTER_VERSION_7.apply(config.index());
     }
 
     @Override