diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21ce44d071d4f73c1531f57930b6452201fa687b..15be9be2e5c8549c2dfbc3975056ba1a757889a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,12 @@
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
---
+## [1.19.1-bb.0] - 2025-04-01
+### Updated
+
+- Updated tempo chart: `1.18.3` -> `1.19.0`
+- Updated gluon: `0.5.14` -> `0.5.15`
+
## [1.18.3-bb.0] - 2025-03-18
### Updated
diff --git a/README.md b/README.md
index 0eb30a1aa6efb365a0c078ff4bb881dac687a943..32dab028de702bf1f6ac14dc25c4903e20ce8405 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
<!-- Warning: Do not manually edit this file. See notes on gluon + helm-docs at the end of this file for more information. -->
# tempo
-   
+   
Grafana Tempo Single Binary Mode
@@ -66,8 +66,10 @@ helm install tempo chart/
| tempo.querier | object | `{}` | Configuration options for the querier |
| tempo.queryFrontend | object | `{}` | Configuration options for the query-fronted. Refers to: https://grafana.com/docs/tempo/latest/configuration/#query-frontend |
| tempo.retention | string | `"336h"` | |
-| tempo.global_overrides.per_tenant_override_config | string | `"/conf/overrides.yaml"` | |
-| tempo.overrides | object | `{}` | |
+| tempo.overrides | object | `{"defaults":{},"per_tenant_override_config":"/conf/overrides.yaml"}` | The standard overrides configuration section. This can include a `defaults` object for applying to all tenants (not to be confused with the `global` property of the same name, which overrides `max_byte_per_trace` for all tenants). For an example on how to enable the metrics generator using the `overrides` object, see the 'Activate metrics generator' section below. Refer to [Standard overrides](https://grafana.com/docs/tempo/latest/configuration/#standard-overrides) for more details. |
+| tempo.overrides.defaults | object | `{}` | Default config values for all tenants, can be overridden by per-tenant overrides. If a tenant's specific overrides are not found in the `per_tenant_overrides` block, the values in this `default` block will be used. Configs inside this block should follow the new overrides indentation format |
+| tempo.overrides.per_tenant_override_config | string | `"/conf/overrides.yaml"` | Path to the per tenant override config file. The values of the `per_tenant_overrides` config below will be written to the default path `/conf/overrides.yaml`. Users can set tenant-specific overrides settings in a separate file and point per_tenant_override_config to it if not using the per_tenant_overrides block below. |
+| tempo.per_tenant_overrides | object | `{}` | The `per tenant` aka `tenant-specific` runtime overrides. This allows overriding values set in the configuration on a per-tenant basis. Note that *all* values must be given for each per-tenant configuration block. Refer to [Runtime overrides](https://grafana.com/docs/tempo/latest/configuration/#runtime-overrides) and [Tenant-Specific overrides](https://grafana.com/docs/tempo/latest/configuration/#tenant-specific-overrides) documentation for more details. |
| tempo.server.http_listen_port | int | `3100` | HTTP server listen port |
| tempo.livenessProbe.httpGet.path | string | `"/ready"` | |
| tempo.livenessProbe.httpGet.port | int | `3100` | |
diff --git a/chart/Chart.lock b/chart/Chart.lock
index dbbedc085f8c5f05cf6eba2315082d577dbb8394..876adbfc49b15191b8cfcee2aceb3007e2cb5571 100644
--- a/chart/Chart.lock
+++ b/chart/Chart.lock
@@ -1,6 +1,6 @@
dependencies:
- name: gluon
repository: oci://registry1.dso.mil/bigbang
- version: 0.5.14
-digest: sha256:ca97065348736cfb1457f4d0e53021d2329c81bd34d3a489fd122493be4fa875
-generated: "2025-01-16T07:17:18.459944175Z"
+ version: 0.5.15
+digest: sha256:5dc607990c83d5075ab565b603f1f9deed55daa4d57907750b85ec93c977896e
+generated: "2025-04-01T06:16:05.474586834Z"
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index b011d8f68f2e0efa70e59e4e3f14f89d41486452..dc328feafd79ea81ce5e48c97d22b0b1a4191618 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
name: tempo
description: Grafana Tempo Single Binary Mode
type: application
-version: 1.18.3-bb.0
+version: 1.19.0-bb.0
appVersion: 2.7.1
engine: gotpl
home: https://grafana.net
@@ -22,7 +22,7 @@ maintainers:
email: sheikhabubaker761@gmail.com
dependencies:
- name: gluon
- version: "0.5.14"
+ version: "0.5.15"
repository: oci://registry1.dso.mil/bigbang
annotations:
bigbang.dev/maintenanceTrack: bb_integrated
diff --git a/chart/Kptfile b/chart/Kptfile
index 86888a9de535a1399c5ae6aabef44c4d5b38073c..14bbaafaca7ab08706bc9d60bf22f8c4f4c975a6 100644
--- a/chart/Kptfile
+++ b/chart/Kptfile
@@ -5,7 +5,7 @@ metadata:
upstream:
type: git
git:
- commit: 99d0b6cb9499cfba149a23a470e85b03e48fbabb
+ commit: 725417dbaf00d4274b274f40c7d6a671ef719984
repo: https://github.com/grafana/helm-charts
directory: /charts/tempo
- ref: tempo-1.18.3
+ ref: tempo-1.19.0
diff --git a/chart/README.md b/chart/README.md
index 6ec3165870262fc17f0299df993f36b018239cc6..9d6abc280eb79de4df7e54ffecca5caab305d605 100644
--- a/chart/README.md
+++ b/chart/README.md
@@ -1,6 +1,6 @@
# tempo
-  
+  
Grafana Tempo Single Binary Mode
@@ -61,7 +61,6 @@ Grafana Tempo Single Binary Mode
| tempo.extraEnv | list | `[]` | Environment variables to add |
| tempo.extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to the ingester pods |
| tempo.extraVolumeMounts | list | `[]` | Volume mounts to add |
-| tempo.global_overrides.per_tenant_override_config | string | `"/conf/overrides.yaml"` | |
| tempo.ingester | object | `{}` | Configuration options for the ingester. Refers to: https://grafana.com/docs/tempo/latest/configuration/#ingester |
| tempo.livenessProbe.failureThreshold | int | `3` | |
| tempo.livenessProbe.httpGet.path | string | `"/ready"` | |
@@ -74,7 +73,10 @@ Grafana Tempo Single Binary Mode
| tempo.metricsGenerator.enabled | bool | `false` | If true, enables Tempo's metrics generator (https://grafana.com/docs/tempo/next/metrics-generator/) |
| tempo.metricsGenerator.remoteWriteUrl | string | `"http://prometheus.monitoring:9090/api/v1/write"` | |
| tempo.multitenancyEnabled | bool | `false` | |
-| tempo.overrides | object | `{}` | |
+| tempo.overrides | object | `{"defaults":{},"per_tenant_override_config":"/conf/overrides.yaml"}` | The standard overrides configuration section. This can include a `defaults` object for applying to all tenants (not to be confused with the `global` property of the same name, which overrides `max_byte_per_trace` for all tenants). For an example on how to enable the metrics generator using the `overrides` object, see the 'Activate metrics generator' section below. Refer to [Standard overrides](https://grafana.com/docs/tempo/latest/configuration/#standard-overrides) for more details. |
+| tempo.overrides.defaults | object | `{}` | Default config values for all tenants, can be overridden by per-tenant overrides. If a tenant's specific overrides are not found in the `per_tenant_overrides` block, the values in this `default` block will be used. Configs inside this block should follow the new overrides indentation format |
+| tempo.overrides.per_tenant_override_config | string | `"/conf/overrides.yaml"` | Path to the per tenant override config file. The values of the `per_tenant_overrides` config below will be written to the default path `/conf/overrides.yaml`. Users can set tenant-specific overrides settings in a separate file and point per_tenant_override_config to it if not using the per_tenant_overrides block below. |
+| tempo.per_tenant_overrides | object | `{}` | The `per tenant` aka `tenant-specific` runtime overrides. This allows overriding values set in the configuration on a per-tenant basis. Note that *all* values must be given for each per-tenant configuration block. Refer to [Runtime overrides](https://grafana.com/docs/tempo/latest/configuration/#runtime-overrides) and [Tenant-Specific overrides](https://grafana.com/docs/tempo/latest/configuration/#tenant-specific-overrides) documentation for more details. |
| tempo.pullPolicy | string | `"IfNotPresent"` | |
| tempo.querier | object | `{}` | Configuration options for the querier. Refers to: https://grafana.com/docs/tempo/latest/configuration/#querier |
| tempo.queryFrontend | object | `{}` | Configuration options for the query-fronted. Refers to: https://grafana.com/docs/tempo/latest/configuration/#query-frontend |
@@ -153,6 +155,13 @@ 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.19.0
+* Breaking Change *
+In order to reduce confusion, the overrides configurations have been renamed as below.
+
+`global_overrides` => `overrides` (this is where the defaults for every tenant is set)
+`overrides` => `per_tenant_overrides` (this is where configurations for specific tenants can be set)
+
### From Chart versions < 1.17.0
Please be aware that we've updated the Tempo version to 2.7, which includes some breaking changes
diff --git a/chart/README.md.gotmpl b/chart/README.md.gotmpl
new file mode 100644
index 0000000000000000000000000000000000000000..6ec48ef17f153184056db7a6b446e791f44ca84a
--- /dev/null
+++ b/chart/README.md.gotmpl
@@ -0,0 +1,75 @@
+{{ template "chart.header" . }}
+
+{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }}
+
+{{ template "chart.description" . }}
+
+{{ template "chart.sourcesSection" . }}
+
+{{ template "chart.requirementsSection" . }}
+
+{{ template "chart.valuesSection" . }}
+
+## Chart Repo
+
+Add the following repo to use the chart:
+
+```console
+helm repo add grafana https://grafana.github.io/helm-charts
+```
+
+## Installing the Chart
+
+To install the chart with the release name `my-release`:
+
+```console
+helm install my-release grafana/tempo
+```
+
+## Uninstalling the Chart
+
+To uninstall/delete the my-release deployment:
+
+```console
+helm delete my-release
+```
+
+The command removes all the Kubernetes components associated with the chart and deletes the release.
+
+## Upgrading
+
+A major chart version change indicates that there is an incompatible breaking change needing manual actions.
+
+### From Chart versions < 1.19.0
+* Breaking Change *
+In order to reduce confusion, the overrides configurations have been renamed as below.
+
+`global_overrides` => `overrides` (this is where the defaults for every tenant is set)
+`overrides` => `per_tenant_overrides` (this is where configurations for specific tenants can be set)
+
+### From Chart versions < 1.17.0
+
+Please be aware that we've updated the Tempo version to 2.7, which includes some breaking changes
+We recommend reviewing the [release notes](https://grafana.com/docs/tempo/latest/release-notes/v2-7/) before upgrading.
+
+### From Chart versions < 1.12.0
+
+Upgrading to chart 1.12.0 will set the memberlist cluster_label config option. During rollout your cluster will temporarilly be split into two memberlist clusters until all components are rolled out.
+This will interrupt reads and writes. This config option is set to prevent cross talk between Tempo and other memberlist clusters.
+
+### From Chart versions < 1.2.0
+
+Please be aware that we've updated the minor version to Tempo 2.1, which includes breaking changes.
+We recommend reviewing the [release notes](https://github.com/grafana/tempo/releases/tag/v2.1.0/) before upgrading.
+
+### From Chart versions < 1.0.0
+
+Please note that we've incremented the major version when upgrading to Tempo 2.0. There were a large number of
+changes in this release (breaking and otherwise). It is encouraged to review the [release notes](https://grafana.com/docs/tempo/latest/release-notes/v2-0/)
+and [1.5 -> 2.0 upgrade guide](https://grafana.com/docs/tempo/latest/setup/upgrade/) before upgrading.
+
+### From Chart versions < 0.7.0
+
+Upgrading from pre 0.7.0 will, by default, move your trace storage from `/tmp/tempo/traces` to `/var/tempo/traces`.
+This will cause Tempo to lose trace history. If you would like to retain history just copy the contents from the
+old folder to the new.
\ No newline at end of file
diff --git a/chart/charts/gluon-0.5.14.tgz b/chart/charts/gluon-0.5.14.tgz
deleted file mode 100644
index c99d9e0f44b4d35311fda2b49ee005cbbea4fb67..0000000000000000000000000000000000000000
Binary files a/chart/charts/gluon-0.5.14.tgz and /dev/null differ
diff --git a/chart/charts/gluon-0.5.15.tgz b/chart/charts/gluon-0.5.15.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..6af0d042870684c713ca9438ff3a7f4270306a38
Binary files /dev/null and b/chart/charts/gluon-0.5.15.tgz differ
diff --git a/chart/templates/configmap-tempo.yaml b/chart/templates/configmap-tempo.yaml
index e79f00ed71991769480aeb96120571d56a42ec78..ef9ff03bb3fab14df42e43fd36bf2919543e8fcf 100644
--- a/chart/templates/configmap-tempo.yaml
+++ b/chart/templates/configmap-tempo.yaml
@@ -8,6 +8,6 @@ metadata:
data:
overrides.yaml: |
overrides:
- {{- toYaml .Values.tempo.overrides | nindent 6 }}
+ {{- toYaml .Values.tempo.per_tenant_overrides | nindent 6 }}
tempo.yaml: |
{{- tpl .Values.config . | nindent 4 }}
diff --git a/chart/values.yaml b/chart/values.yaml
index a02f78273f98fd3bb205878fe200f80588bcf606..be07bc5a48b261544b063e88045c4916174ce022 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -63,11 +63,27 @@ tempo:
# -- Configuration options for the query-fronted.
# Refers to: https://grafana.com/docs/tempo/latest/configuration/#query-frontend
queryFrontend: {}
+ # search:
+ # concurrent_jobs: 2000
retention: 336h # 2 weeks retention
- # Global overrides
- global_overrides:
+ # -- The standard overrides configuration section. This can include a `defaults` object for applying to all tenants (not to be confused with the `global` property of the same name, which overrides `max_byte_per_trace` for all tenants). For an example on how to enable the metrics generator using the `overrides` object, see the 'Activate metrics generator' section below. Refer to [Standard overrides](https://grafana.com/docs/tempo/latest/configuration/#standard-overrides) for more details.
+ overrides:
+ # -- Default config values for all tenants, can be overridden by per-tenant overrides. If a tenant's specific overrides are not found in the `per_tenant_overrides` block, the values in this `default` block will be used. Configs inside this block should follow the new overrides indentation format
+ defaults: {}
+ # metrics_generator:
+ # processors:
+ # - service-graphs
+ # - span-metrics
+
+ # -- Path to the per tenant override config file. The values of the `per_tenant_overrides` config below will be written to the default path `/conf/overrides.yaml`. Users can set tenant-specific overrides settings in a separate file and point per_tenant_override_config to it if not using the per_tenant_overrides block below.
per_tenant_override_config: /conf/overrides.yaml
- overrides: {}
+ # -- The `per tenant` aka `tenant-specific` runtime overrides. This allows overriding values set in the configuration on a per-tenant basis. Note that *all* values must be given for each per-tenant configuration block. Refer to [Runtime overrides](https://grafana.com/docs/tempo/latest/configuration/#runtime-overrides) and [Tenant-Specific overrides](https://grafana.com/docs/tempo/latest/configuration/#tenant-specific-overrides) documentation for more details.
+ per_tenant_overrides: {}
+ # 'tenant-id':
+ # metrics_generator:
+ # processors:
+ # - service-graphs
+ # - span-metrics
# Tempo server configuration.
# Refers to: https://grafana.com/docs/tempo/latest/configuration/#server
@@ -181,11 +197,8 @@ config: |
query_frontend:
{{- toYaml .Values.tempo.queryFrontend | nindent 6 }}
overrides:
- {{- toYaml .Values.tempo.global_overrides | nindent 6 }}
+ {{- toYaml .Values.tempo.overrides | nindent 6 }}
{{- if .Values.tempo.metricsGenerator.enabled }}
- metrics_generator_processors:
- - 'service-graphs'
- - 'span-metrics'
metrics_generator:
storage:
path: "/tmp/tempo"