fix jaeger-v2 config file

Signed-off-by: Harshvir Potpose <hpotpose62@gmail.com>
jaegertracing · May 23, 2024 · 2f3d649 · 2f3d649
1 parent feaddb4
commit 2f3d649
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 15 deletions.
diff --git a/cmd/jaeger/config-elasticsearch.yaml b/cmd/jaeger/config-elasticsearch.yaml
@@ -17,15 +17,19 @@ extensions:
       es_main:
         server_urls: http://localhost:9200
         log_level: "error"
-        index_prefix: "jaeger-main"
-        use_aliases: false
-        create_mappings: true
+        index:
+          prefix: "jaeger-main"
+        aliases:
+          enabled: false
+          create_mappings: true
       es_archive:
         server_urls: http://localhost:9200
         log_level: "error"
-        index_prefix: "jaeger-archive"
-        use_aliases: false
-        create_mappings: true
+        index:
+          prefix: "jaeger-archive"
+        aliases:
+          enabled: false
+          create_mappings: true
 
 receivers:
   otlp:

diff --git a/cmd/jaeger/config-opensearch.yaml b/cmd/jaeger/config-opensearch.yaml
@@ -17,16 +17,19 @@ extensions:
       os_main:
         server_urls: http://localhost:9200
         log_level: "error"
-        index_prefix: "jaeger-main"
-        use_aliases: false
-        create_mappings: true
-
+        index:
+          prefix: "jaeger-main"
+        aliases:
+          enabled: false
+          create_mappings: true
       os_archive:
         server_urls: http://localhost:9200
         log_level: "error"
-        index_prefix: "jaeger-main"
-        use_aliases: false
-        create_mappings: true
+        index:
+          prefix: "jaeger-main"
+        aliases:
+          enabled: false
+          create_mappings: true
 
 receivers:
   otlp:

diff --git a/pkg/es/config/config.go b/pkg/es/config/config.go
@@ -107,7 +107,7 @@ type Sniffer struct {
 }
 
 type Aliases struct {
-	UseReadWriteAliases  bool `mapstructure:"use_aliases"`
+	UseReadWriteAliases  bool `mapstructure:"enabled"`
 	CreateIndexTemplates bool `mapstructure:"create_mappings"`
 	UseILM               bool `mapstructure:"use_ilm"`
 }

diff --git a/plugin/storage/es/options.go b/plugin/storage/es/options.go
@@ -426,7 +426,8 @@ func getDefaultConfig() config.Configuration {
 			PriorityTemplate: config.PriorityTemplate{
 				Span:         0,
 				Service:      0,
-				Dependencies: 0},
+				Dependencies: 0,
+			},
 		},
 		BulkProcessing: config.BulkProcessing{
 			Size:          5 * 1000 * 1000,