Fix

Signed-off-by: Pavol Loffay <[email protected]>

plugin/storage/es/mappings/mapping.go

@@ -49,7 +49,7 @@ func (mb *MappingBuilder) GetMapping(mapping string) (string, error) {
 	} else if mb.EsVersion == 7 {
 		return mb.fixMapping(mapping + "-7.json")
 	}
-	return mb.fixMapping(mapping + ".json")
+	return mb.fixMapping(mapping + "-6.json")
 }
 
 // GetSpanServiceMappings returns span and service mappings

plugin/storage/es/mappings/mapping_test.go

@@ -83,13 +83,13 @@ func TestMappingBuilder_loadMapping(t *testing.T) {
 	tests := []struct {
 		name string
 	}{
-		{name: "jaeger-span.json"},
+		{name: "jaeger-span-6.json"},
 		{name: "jaeger-span-7.json"},
 		{name: "jaeger-span-8.json"},
-		{name: "jaeger-service.json"},
+		{name: "jaeger-service-6.json"},
 		{name: "jaeger-service-7.json"},
 		{name: "jaeger-service-8.json"},
-		{name: "jaeger-dependencies.json"},
+		{name: "jaeger-dependencies-6.json"},
 		{name: "jaeger-dependencies-7.json"},
 		{name: "jaeger-dependencies-8.json"},
 	}

plugin/storage/integration/elasticsearch_test.go

@@ -201,7 +201,14 @@ func TestElasticsearchStorage_IndexTemplates(t *testing.T) {
 	esVersion, err := s.getVersion()
 	require.NoError(t, err)
 	// TODO abstract this into pkg/es/client.IndexManagementLifecycleAPI
-	if esVersion == 7 {
+	if esVersion == 6 {
+		serviceTemplateExists, err := s.client.IndexTemplateExists(indexPrefix + "-jaeger-service").Do(context.Background())
+		require.NoError(t, err)
+		assert.True(t, serviceTemplateExists)
+		spanTemplateExists, err := s.client.IndexTemplateExists(indexPrefix + "-jaeger-span").Do(context.Background())
+		require.NoError(t, err)
+		assert.True(t, spanTemplateExists)
+	} else if esVersion == 7 {
 		serviceTemplateExists, err := s.client.IndexTemplateExists(indexPrefix + "-jaeger-service").Do(context.Background())
 		require.NoError(t, err)
 		assert.True(t, serviceTemplateExists)

plugin/storage/integration/es_index_cleaner_test.go

@@ -33,7 +33,7 @@ const (
 	spanIndexName         = "jaeger-span-2019-01-01"
 	serviceIndexName      = "jaeger-service-2019-01-01"
 	indexCleanerImage     = "jaegertracing/jaeger-es-index-cleaner:latest"
-	rolloverImage         = "jaegertracing/jaeger-es-rollover:latest"
+	rolloverImage         = "pavolloffay/jaeger-es-rollover:PR5704"
 	rolloverNowEnvVar     = `CONDITIONS='{"max_age":"0s"}'`
 )