Merge branch 'main' into promtail-tpl-extraVolumes

charts/tempo-distributed/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: tempo-distributed
 description: Grafana Tempo in MicroService mode
 type: application
-version: 1.17.0
-appVersion: 2.5.0
+version: 1.18.0
+appVersion: 2.6.0
 engine: gotpl
 home: https://grafana.com/docs/tempo/latest/
 icon: https://raw.githubusercontent.com/grafana/tempo/master/docs/tempo/website/logo_and_name.png

charts/tempo-distributed/README.md

@@ -1,6 +1,6 @@
 # tempo-distributed
 
-![Version: 1.17.0](https://img.shields.io/badge/Version-1.17.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square)
+![Version: 1.18.0](https://img.shields.io/badge/Version-1.18.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square)
 
 Grafana Tempo in MicroService mode
 
@@ -46,6 +46,11 @@ The command removes all the Kubernetes components associated with the chart and
 
 A major chart version change indicates that there is an incompatible breaking change needing manual actions.
 
+### From Chart versions < 1.18.0
+
+Please be aware that we've updated the minor version to Tempo 2.6, which includes breaking changes.
+We recommend reviewing the [release notes](https://github.com/grafana/tempo/releases/tag/v2.6.0/) before upgrading.
+
 ### From Chart versions < 1.15.2
 
 Switch to new overrides format, see https://grafana.com/docs/tempo/latest/configuration/#overrides.

charts/tempo-distributed/README.md.gotmpl

@@ -39,6 +39,11 @@ The command removes all the Kubernetes components associated with the chart and
 
 A major chart version change indicates that there is an incompatible breaking change needing manual actions.
 
+### From Chart versions < 1.18.0
+
+Please be aware that we've updated the minor version to Tempo 2.6, which includes breaking changes.
+We recommend reviewing the [release notes](https://github.com/grafana/tempo/releases/tag/v2.6.0/) before upgrading.
+
 ### From Chart versions < 1.15.2
 
 Switch to new overrides format, see https://grafana.com/docs/tempo/latest/configuration/#overrides.

charts/tempo-distributed/ci/parquet-dedicated-columns.yaml

@@ -1,7 +1,7 @@
 storage:
   trace:
     block:
-      version: vParquet3
+      version: vParquet4
       dedicated_columns:
         - name: cluster
           type: string