Merge pull request #2921 from javiplx/bugfix/tempo-attribute-columns

[tempo-distributed] Fix rendering for parquet dedicated columns value
grafana · Jan 25, 2024 · fbc608f · fbc608f
2 parents 91110c0 + 4caafa3
commit fbc608f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: tempo-distributed
 description: Grafana Tempo in MicroService mode
 type: application
-version: 1.8.1
+version: 1.8.2
 appVersion: 2.3.1
 engine: gotpl
 home: https://grafana.com/docs/tempo/latest/

diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md
@@ -1,6 +1,6 @@
 # tempo-distributed
 
-![Version: 1.8.1](https://img.shields.io/badge/Version-1.8.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square)
+![Version: 1.8.2](https://img.shields.io/badge/Version-1.8.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square)
 
 Grafana Tempo in MicroService mode
 

diff --git a/charts/tempo-distributed/ci/parquet-dedicated-columns.yaml b/charts/tempo-distributed/ci/parquet-dedicated-columns.yaml
@@ -0,0 +1,11 @@
+storage:
+  trace:
+    block:
+      version: vParquet3
+      dedicated_columns:
+        - name: cluster
+          type: string
+          scope: resource
+        - name: service.name
+          type: string
+          scope: resource
diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml
@@ -1253,7 +1253,7 @@ config: |
         version: {{.Values.storage.trace.block.version}}
         {{- if .Values.storage.trace.block.dedicated_columns}}
         parquet_dedicated_columns:
-          {{ .Values.storage.trace.block.dedicated_columns}}
+          {{ .Values.storage.trace.block.dedicated_columns | toYaml | nindent 8}}
         {{- end }}
       {{- end }}
       pool: