Fixes ES integration tests

openzipkin · Dec 16, 2018 · cc09c54 · cc09c54
1 parent f0a2928
commit cc09c54
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/...n-storage/elasticsearch/src/main/java/zipkin2/elasticsearch/VersionSpecificTemplates.java b/...n-storage/elasticsearch/src/main/java/zipkin2/elasticsearch/VersionSpecificTemplates.java
@@ -260,7 +260,7 @@ private String versionSpecificTagIndexTemplate(float version) {
           + "\"not_analyzed\"");
     } else if (version >= 5) {
       return tagIndexTemplate
-        .replace("TEMPLATE","index_patterns")
+        .replace("TEMPLATE", version >= 6 ? "index_patterns" : "template")
         .replace("KEYWORD", "\"type\": \"text\",\"fielddata\": true\n");
     }else {
       throw new IllegalStateException(

diff --git a/...asticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV2.java b/...asticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV2.java
@@ -34,7 +34,7 @@
 public class ITElasticsearchStorageV2 {
 
   static ElasticsearchStorageRule classRule() {
-    return new ElasticsearchStorageRule("openzipkin/zipkin-elasticsearch:2.11.6",
+    return new ElasticsearchStorageRule("openzipkin/zipkin-elasticsearch:2.11.12",
       "test_elasticsearch3");
   }
 

diff --git a/...asticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV5.java b/...asticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV5.java
@@ -34,7 +34,7 @@
 public class ITElasticsearchStorageV5 {
 
   static ElasticsearchStorageRule classRule() {
-    return new ElasticsearchStorageRule("openzipkin/zipkin-elasticsearch5:2.11.6",
+    return new ElasticsearchStorageRule("openzipkin/zipkin-elasticsearch5:2.11.12",
       "test_elasticsearch3");
   }
 

diff --git a/...asticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV6.java b/...asticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV6.java
@@ -34,7 +34,7 @@
 public class ITElasticsearchStorageV6 {
 
   static ElasticsearchStorageRule classRule() {
-    return new ElasticsearchStorageRule("openzipkin/zipkin-elasticsearch6:2.11.6",
+    return new ElasticsearchStorageRule("openzipkin/zipkin-elasticsearch6:2.11.12",
       "test_elasticsearch3");
   }