From f1dfb3a91afb5a6b79f7f517dede62ae43856999 Mon Sep 17 00:00:00 2001 From: Shawn Date: Fri, 5 Jun 2026 10:19:18 -0700 Subject: [PATCH] chore: prepare v2.9.3 release Add the v2.9.3 changelog section and bump the tempo image tag to 2.9.3 in example configs and compiled jsonnet. v2.9.3 collects the security dependency updates (golang.org/x/net, golang.org/x/crypto, golang.org/x/sys, github.com/apache/thrift), the busybox removal (CVE-2025-60876), the Prometheus/OTel dependency bump, a metrics-generator panic fix, and the OpenCensus receiver removal backported to release-v2.9. --- .chloggen/_migrated_00_7338.yaml | 6 ----- .chloggen/_migrated_01_7323.yaml | 6 ----- .chloggen/_migrated_02_7338.yaml | 6 ----- .chloggen/backport-5717-to-release-v2.9.yaml | 6 ----- CHANGELOG.md | 22 +++++++++++++++++++ .../setup-tempo/deploy/kubernetes/tanka.md | 2 +- .../docker-compose/alloy/docker-compose.yaml | 2 +- example/docker-compose/alloy/readme.md | 2 +- .../cross-cluster/docker-compose.yaml | 2 +- .../distributed/docker-compose.yaml | 2 +- .../ingest-storage/docker-compose.yaml | 2 +- .../docker-compose/local/docker-compose.yaml | 2 +- .../multi-tenant/docker-compose.yaml | 2 +- .../docker-compose.yaml | 2 +- .../otel-collector/docker-compose.yaml | 2 +- example/docker-compose/readme.md | 2 +- .../docker-compose.yaml | 6 ++--- .../vulture/docker-compose.yaml | 2 +- example/docker-compose/vulture/readme.md | 2 +- example/tk/readme.md | 2 +- .../Deployment-compactor.yaml | 2 +- .../Deployment-distributor.yaml | 2 +- .../Deployment-metrics-generator.yaml | 2 +- .../jsonnet-compiled/Deployment-querier.yaml | 2 +- .../Deployment-query-frontend.yaml | 2 +- .../StatefulSet-backend-scheduler.yaml | 2 +- .../StatefulSet-backend-worker.yaml | 2 +- .../StatefulSet-block-builder.yaml | 2 +- .../StatefulSet-ingester.yaml | 2 +- .../StatefulSet-live-store-zone-a.yaml | 2 +- .../StatefulSet-live-store-zone-b.yaml | 2 +- .../StatefulSet-metrics-generator.yaml | 2 +- .../util/example/main.jsonnet | 2 +- .../jsonnet/microservices/config.libsonnet | 2 +- .../jsonnet/single-binary/config.libsonnet | 2 +- 35 files changed, 54 insertions(+), 56 deletions(-) delete mode 100644 .chloggen/_migrated_00_7338.yaml delete mode 100644 .chloggen/_migrated_01_7323.yaml delete mode 100644 .chloggen/_migrated_02_7338.yaml delete mode 100644 .chloggen/backport-5717-to-release-v2.9.yaml diff --git a/.chloggen/_migrated_00_7338.yaml b/.chloggen/_migrated_00_7338.yaml deleted file mode 100644 index 40faa8e43fd..00000000000 --- a/.chloggen/_migrated_00_7338.yaml +++ /dev/null @@ -1,6 +0,0 @@ -change_type: change -component: deps -note: Updated Prometheus to v0.311.3 and the OpenTelemetry Collector dependencies to v1.52, along with related transitive dependencies (dskit and others). -issues: [7338] -subtext: -user: zhxiaogg diff --git a/.chloggen/_migrated_01_7323.yaml b/.chloggen/_migrated_01_7323.yaml deleted file mode 100644 index 89dc370524c..00000000000 --- a/.chloggen/_migrated_01_7323.yaml +++ /dev/null @@ -1,6 +0,0 @@ -change_type: breaking -component: distributor -note: Dropped support for the OpenCensus receiver. -issues: [7323] -subtext: -user: zhxiaogg diff --git a/.chloggen/_migrated_02_7338.yaml b/.chloggen/_migrated_02_7338.yaml deleted file mode 100644 index 778ad3ea907..00000000000 --- a/.chloggen/_migrated_02_7338.yaml +++ /dev/null @@ -1,6 +0,0 @@ -change_type: bug_fix -component: metrics-generator -note: Fix panic when `write_relabel_configs` is configured on remote write endpoints. -issues: [7338] -subtext: -user: carles-grafana diff --git a/.chloggen/backport-5717-to-release-v2.9.yaml b/.chloggen/backport-5717-to-release-v2.9.yaml deleted file mode 100644 index 8c4a86ebbe1..00000000000 --- a/.chloggen/backport-5717-to-release-v2.9.yaml +++ /dev/null @@ -1,6 +0,0 @@ -change_type: change -component: tempo -note: Remove busybox from Tempo image to make it more minimal and prevent future vulnerabilities. -issues: [5717] -subtext: -user: carles-grafana diff --git a/CHANGELOG.md b/CHANGELOG.md index cf36ad8eb83..8b5b2a5d8fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,27 @@ +# v2.9.3 + +## 🔒 Security 🔒 + +- `deps`: Update github.com/apache/thrift to v0.23.0 to pick up upstream security fixes. ([#7119](https://github.com/grafana/tempo/issues/7119)) (@renovate) +- `deps`: Update golang.org/x/crypto to v0.52.0 to pick up upstream security fixes. ([#7258](https://github.com/grafana/tempo/issues/7258), [#7343](https://github.com/grafana/tempo/issues/7343)) (@renovate) +- `deps`: Update golang.org/x/net to v0.55.0 to pick up upstream security fixes. ([#7128](https://github.com/grafana/tempo/issues/7128), [#7259](https://github.com/grafana/tempo/issues/7259), [#7371](https://github.com/grafana/tempo/issues/7371)) (@renovate) +- `deps`: Update golang.org/x/sys to v0.44.0 to pick up upstream security fixes. ([#7260](https://github.com/grafana/tempo/issues/7260)) (@renovate) + +## 🛑 Breaking changes 🛑 + +- `distributor`: Dropped support for the OpenCensus receiver. ([#7323](https://github.com/grafana/tempo/issues/7323)) (@zhxiaogg) + +## 🧰 Bug fixes 🧰 + +- `metrics-generator`: Fix panic when `write_relabel_configs` is configured on remote write endpoints. ([#7338](https://github.com/grafana/tempo/issues/7338)) (@carles-grafana) + +## 🔧 Changes 🔧 + +- `deps`: Updated Prometheus to v0.311.3 and the OpenTelemetry Collector dependencies to v1.52, along with related transitive dependencies (dskit and others). ([#7338](https://github.com/grafana/tempo/issues/7338)) (@zhxiaogg) +- `tempo`: Remove busybox from Tempo image to make it more minimal and prevent future vulnerabilities. ([#5717](https://github.com/grafana/tempo/issues/5717)) (@carles-grafana) + # v2.9.2 * [BUGFIX] updated go version to 1.26.2 for CVE-2026-25679 fix [#6779](https://github.com/grafana/tempo/pull/6779) (@ie-pham) diff --git a/docs/sources/tempo/set-up-for-tracing/setup-tempo/deploy/kubernetes/tanka.md b/docs/sources/tempo/set-up-for-tracing/setup-tempo/deploy/kubernetes/tanka.md index b4f0c3041cf..0e962c45659 100644 --- a/docs/sources/tempo/set-up-for-tracing/setup-tempo/deploy/kubernetes/tanka.md +++ b/docs/sources/tempo/set-up-for-tracing/setup-tempo/deploy/kubernetes/tanka.md @@ -227,7 +227,7 @@ Install the `k.libsonnet`, Jsonnet, and Memcachd libraries. tempo { _images+:: { - tempo: 'grafana/tempo:2.9.2', + tempo: 'grafana/tempo:2.9.3', tempo_query: 'grafana/tempo-query:latest', }, diff --git a/example/docker-compose/alloy/docker-compose.yaml b/example/docker-compose/alloy/docker-compose.yaml index e08e2cf114b..1532fcbd5d4 100644 --- a/example/docker-compose/alloy/docker-compose.yaml +++ b/example/docker-compose/alloy/docker-compose.yaml @@ -13,7 +13,7 @@ services: - ./tempo-data:/var/tempo tempo: - image: grafana/tempo:2.9.2 + image: grafana/tempo:2.9.3 command: [ "-config.file=/etc/tempo.yaml" ] volumes: - ../shared/tempo.yaml:/etc/tempo.yaml diff --git a/example/docker-compose/alloy/readme.md b/example/docker-compose/alloy/readme.md index 6b7375adffe..ce156983538 100644 --- a/example/docker-compose/alloy/readme.md +++ b/example/docker-compose/alloy/readme.md @@ -18,7 +18,7 @@ alloy-alloy-1 grafana/alloy:v1.3.1 "/bin/alloy run alloy-grafana-1 grafana/grafana:12.0.0 "/run.sh" grafana 48 seconds ago Up 5 seconds 0.0.0.0:3000->3000/tcp alloy-k6-tracing-1 ghcr.io/grafana/xk6-client-tracing:v0.0.7 "/k6-tracing run /ex…" k6-tracing 48 seconds ago Up 4 seconds alloy-prometheus-1 prom/prometheus:latest "/bin/prometheus --c…" prometheus 48 seconds ago Up 5 seconds 0.0.0.0:9090->9090/tcp -alloy-tempo-1 grafana/tempo:2.9.2 "/tempo -config.file…" tempo 48 seconds ago Up 5 seconds 0.0.0.0:57508->3200/tcp, 0.0.0.0:57509->4317/tcp, 0.0.0.0:57505->4318/tcp, 0.0.0.0:57506->9411/tcp, 0.0.0.0:57507->14268/tcp +alloy-tempo-1 grafana/tempo:2.9.3 "/tempo -config.file…" tempo 48 seconds ago Up 5 seconds 0.0.0.0:57508->3200/tcp, 0.0.0.0:57509->4317/tcp, 0.0.0.0:57505->4318/tcp, 0.0.0.0:57506->9411/tcp, 0.0.0.0:57507->14268/tcp ``` 2. If you're interested you can see the wal/blocks as they are being created. diff --git a/example/docker-compose/cross-cluster/docker-compose.yaml b/example/docker-compose/cross-cluster/docker-compose.yaml index 0cc7e741f20..325b3714cfc 100644 --- a/example/docker-compose/cross-cluster/docker-compose.yaml +++ b/example/docker-compose/cross-cluster/docker-compose.yaml @@ -2,7 +2,7 @@ services: # tempo - a distributor-a: - image: &tempoImage grafana/tempo:2.9.2 + image: &tempoImage grafana/tempo:2.9.3 command: "-target=distributor -config.file=/etc/tempo.yaml" restart: always volumes: diff --git a/example/docker-compose/distributed/docker-compose.yaml b/example/docker-compose/distributed/docker-compose.yaml index 9b77f64f349..16278acffcd 100644 --- a/example/docker-compose/distributed/docker-compose.yaml +++ b/example/docker-compose/distributed/docker-compose.yaml @@ -1,7 +1,7 @@ services: distributor: - image: &tempoImage grafana/tempo:2.9.2 + image: &tempoImage grafana/tempo:2.9.3 command: "-target=distributor -config.file=/etc/tempo.yaml" restart: always volumes: diff --git a/example/docker-compose/ingest-storage/docker-compose.yaml b/example/docker-compose/ingest-storage/docker-compose.yaml index d1873780d9a..8c4161ffc08 100644 --- a/example/docker-compose/ingest-storage/docker-compose.yaml +++ b/example/docker-compose/ingest-storage/docker-compose.yaml @@ -12,7 +12,7 @@ services: - ./tempo-data:/var/tempo distributor: - image: &tempoImage grafana/tempo:2.9.2 + image: &tempoImage grafana/tempo:2.9.3 depends_on: - kafka command: "-target=distributor -config.file=/etc/tempo.yaml" diff --git a/example/docker-compose/local/docker-compose.yaml b/example/docker-compose/local/docker-compose.yaml index 25110669523..531151f5994 100644 --- a/example/docker-compose/local/docker-compose.yaml +++ b/example/docker-compose/local/docker-compose.yaml @@ -21,7 +21,7 @@ services: - MEMCACHED_THREADS=4 # Number of threads to use tempo: - image: grafana/tempo:2.9.2 + image: grafana/tempo:2.9.3 command: ["-config.file=/etc/tempo.yaml"] volumes: - ./tempo.yaml:/etc/tempo.yaml diff --git a/example/docker-compose/multi-tenant/docker-compose.yaml b/example/docker-compose/multi-tenant/docker-compose.yaml index 643d7e5a820..41745064c48 100644 --- a/example/docker-compose/multi-tenant/docker-compose.yaml +++ b/example/docker-compose/multi-tenant/docker-compose.yaml @@ -13,7 +13,7 @@ services: - ./tempo-data:/var/tempo tempo: - image: grafana/tempo:2.9.2 + image: grafana/tempo:2.9.3 command: [ "-config.file=/etc/tempo.yaml" ] environment: - GRPC_TRACE=api diff --git a/example/docker-compose/otel-collector-multitenant/docker-compose.yaml b/example/docker-compose/otel-collector-multitenant/docker-compose.yaml index f9a8d93d853..5999fceca4c 100644 --- a/example/docker-compose/otel-collector-multitenant/docker-compose.yaml +++ b/example/docker-compose/otel-collector-multitenant/docker-compose.yaml @@ -13,7 +13,7 @@ services: - ./tempo-data:/var/tempo tempo: - image: grafana/tempo:2.9.2 + image: grafana/tempo:2.9.3 command: [ "-multitenancy.enabled=true", "-config.file=/etc/tempo.yaml" ] volumes: - ../shared/tempo.yaml:/etc/tempo.yaml diff --git a/example/docker-compose/otel-collector/docker-compose.yaml b/example/docker-compose/otel-collector/docker-compose.yaml index 9df18b15de6..efc81a70188 100644 --- a/example/docker-compose/otel-collector/docker-compose.yaml +++ b/example/docker-compose/otel-collector/docker-compose.yaml @@ -13,7 +13,7 @@ services: - ./tempo-data:/var/tempo tempo: - image: grafana/tempo:2.9.2 + image: grafana/tempo:2.9.3 command: [ "-config.file=/etc/tempo.yaml" ] volumes: - ../shared/tempo.yaml:/etc/tempo.yaml diff --git a/example/docker-compose/readme.md b/example/docker-compose/readme.md index 09087e8d285..27dc756e13c 100644 --- a/example/docker-compose/readme.md +++ b/example/docker-compose/readme.md @@ -32,7 +32,7 @@ This example uses the `local` backend, suitable for local testing and developmen This step is not necessary, but it can be nice for local testing. For any of the above examples rebuilding these images will cause docker compose to use your local code when running the examples. -Run the following from the project root folder to build the `grafana/tempo:2.9.2` image that is used in all the examples: +Run the following from the project root folder to build the `grafana/tempo:2.9.3` image that is used in all the examples: ```console make docker-images diff --git a/example/docker-compose/scalable-single-binary/docker-compose.yaml b/example/docker-compose/scalable-single-binary/docker-compose.yaml index 045a2ddee73..aba7cf119a3 100644 --- a/example/docker-compose/scalable-single-binary/docker-compose.yaml +++ b/example/docker-compose/scalable-single-binary/docker-compose.yaml @@ -1,7 +1,7 @@ services: tempo1: - image: grafana/tempo:2.9.2 + image: grafana/tempo:2.9.3 command: "-target=scalable-single-binary -config.file=/etc/tempo.yaml" volumes: - ./tempo-scalable-single-binary.yaml:/etc/tempo.yaml @@ -16,7 +16,7 @@ services: - 3200:3200 tempo2: - image: grafana/tempo:2.9.2 + image: grafana/tempo:2.9.3 command: "-target=scalable-single-binary -config.file=/etc/tempo.yaml" volumes: - ./tempo-scalable-single-binary.yaml:/etc/tempo.yaml @@ -29,7 +29,7 @@ services: - minio tempo3: - image: grafana/tempo:2.9.2 + image: grafana/tempo:2.9.3 command: "-target=scalable-single-binary -config.file=/etc/tempo.yaml" volumes: - ./tempo-scalable-single-binary.yaml:/etc/tempo.yaml diff --git a/example/docker-compose/vulture/docker-compose.yaml b/example/docker-compose/vulture/docker-compose.yaml index 50239298b4f..f8d3eeebfc5 100644 --- a/example/docker-compose/vulture/docker-compose.yaml +++ b/example/docker-compose/vulture/docker-compose.yaml @@ -12,7 +12,7 @@ services: - ./tempo-data:/var/tempo tempo: - image: grafana/tempo:2.9.2 + image: grafana/tempo:2.9.3 command: ["-config.file=/etc/tempo.yaml"] volumes: - ../shared/tempo.yaml:/etc/tempo.yaml diff --git a/example/docker-compose/vulture/readme.md b/example/docker-compose/vulture/readme.md index 8707cd65aff..7b4703b8d3d 100644 --- a/example/docker-compose/vulture/readme.md +++ b/example/docker-compose/vulture/readme.md @@ -16,7 +16,7 @@ docker compose ps ``` ``` NAME IMAGE COMMAND SERVICE CREATED STATUS PORTS -vulture-tempo-1 grafana/tempo:2.9.2 "/tempo -config.file…" tempo 2 minutes ago Up 2 minutes 0.0.0.0:3200->3200/tcp, 0.0.0.0:14250->14250/tcp +vulture-tempo-1 grafana/tempo:2.9.3 "/tempo -config.file…" tempo 2 minutes ago Up 2 minutes 0.0.0.0:3200->3200/tcp, 0.0.0.0:14250->14250/tcp vulture-vulture-1 grafana/tempo-vulture:latest "/tempo-vulture -tem…" vulture 2 minutes ago Up 2 minutes ``` diff --git a/example/tk/readme.md b/example/tk/readme.md index 7f0c46a62d4..dee91ac2761 100644 --- a/example/tk/readme.md +++ b/example/tk/readme.md @@ -22,7 +22,7 @@ k3d cluster create tempo --api-port 6443 --port "3000:80@loadbalancer" If you wish to use a local image, you can import these into k3d ```console -k3d image import grafana/tempo:2.9.2 --cluster tempo +k3d image import grafana/tempo:2.9.3 --cluster tempo ``` Next either deploy the microservices or the single binary. You can also use tanka [inline environments](https://tanka.dev/inline-environments) to deploy Tempo with either of the two. diff --git a/operations/jsonnet-compiled/Deployment-compactor.yaml b/operations/jsonnet-compiled/Deployment-compactor.yaml index db1b834907c..32ffe1c523b 100644 --- a/operations/jsonnet-compiled/Deployment-compactor.yaml +++ b/operations/jsonnet-compiled/Deployment-compactor.yaml @@ -31,7 +31,7 @@ spec: env: - name: GOMEMLIMIT value: 5GiB - image: grafana/tempo:2.9.2 + image: grafana/tempo:2.9.3 imagePullPolicy: IfNotPresent name: compactor ports: diff --git a/operations/jsonnet-compiled/Deployment-distributor.yaml b/operations/jsonnet-compiled/Deployment-distributor.yaml index 9f47d5f48e5..8c379da4d01 100644 --- a/operations/jsonnet-compiled/Deployment-distributor.yaml +++ b/operations/jsonnet-compiled/Deployment-distributor.yaml @@ -30,7 +30,7 @@ spec: - -config.file=/conf/tempo.yaml - -mem-ballast-size-mbs=1024 - -target=distributor - image: grafana/tempo:2.9.2 + image: grafana/tempo:2.9.3 imagePullPolicy: IfNotPresent name: distributor ports: diff --git a/operations/jsonnet-compiled/Deployment-metrics-generator.yaml b/operations/jsonnet-compiled/Deployment-metrics-generator.yaml index 3aa278230bb..e409a5ca950 100644 --- a/operations/jsonnet-compiled/Deployment-metrics-generator.yaml +++ b/operations/jsonnet-compiled/Deployment-metrics-generator.yaml @@ -28,7 +28,7 @@ spec: - -config.file=/conf/tempo.yaml - -mem-ballast-size-mbs=1024 - -target=metrics-generator - image: grafana/tempo:2.9.2 + image: grafana/tempo:2.9.3 name: metrics-generator ports: - containerPort: 3200 diff --git a/operations/jsonnet-compiled/Deployment-querier.yaml b/operations/jsonnet-compiled/Deployment-querier.yaml index c14bd628188..496133d9290 100644 --- a/operations/jsonnet-compiled/Deployment-querier.yaml +++ b/operations/jsonnet-compiled/Deployment-querier.yaml @@ -30,7 +30,7 @@ spec: - -config.file=/conf/tempo.yaml - -mem-ballast-size-mbs=1024 - -target=querier - image: grafana/tempo:2.9.2 + image: grafana/tempo:2.9.3 imagePullPolicy: IfNotPresent name: querier ports: diff --git a/operations/jsonnet-compiled/Deployment-query-frontend.yaml b/operations/jsonnet-compiled/Deployment-query-frontend.yaml index 1c2140090d5..3840421ed4a 100644 --- a/operations/jsonnet-compiled/Deployment-query-frontend.yaml +++ b/operations/jsonnet-compiled/Deployment-query-frontend.yaml @@ -28,7 +28,7 @@ spec: - -config.file=/conf/tempo.yaml - -mem-ballast-size-mbs=1024 - -target=query-frontend - image: grafana/tempo:2.9.2 + image: grafana/tempo:2.9.3 imagePullPolicy: IfNotPresent name: query-frontend ports: diff --git a/operations/jsonnet-compiled/StatefulSet-backend-scheduler.yaml b/operations/jsonnet-compiled/StatefulSet-backend-scheduler.yaml index 425d611e405..2a875a434e4 100644 --- a/operations/jsonnet-compiled/StatefulSet-backend-scheduler.yaml +++ b/operations/jsonnet-compiled/StatefulSet-backend-scheduler.yaml @@ -24,7 +24,7 @@ spec: - -config.file=/conf/tempo.yaml - -mem-ballast-size-mbs=1024 - -target=backend-scheduler - image: grafana/tempo:2.9.2 + image: grafana/tempo:2.9.3 imagePullPolicy: IfNotPresent name: backend-scheduler ports: diff --git a/operations/jsonnet-compiled/StatefulSet-backend-worker.yaml b/operations/jsonnet-compiled/StatefulSet-backend-worker.yaml index ed378dcd4c5..1c69d58bfd7 100644 --- a/operations/jsonnet-compiled/StatefulSet-backend-worker.yaml +++ b/operations/jsonnet-compiled/StatefulSet-backend-worker.yaml @@ -24,7 +24,7 @@ spec: - -config.file=/conf/tempo.yaml - -mem-ballast-size-mbs=1024 - -target=backend-worker - image: grafana/tempo:2.9.2 + image: grafana/tempo:2.9.3 imagePullPolicy: IfNotPresent name: backend-worker ports: diff --git a/operations/jsonnet-compiled/StatefulSet-block-builder.yaml b/operations/jsonnet-compiled/StatefulSet-block-builder.yaml index 80281d48385..440f7fba125 100644 --- a/operations/jsonnet-compiled/StatefulSet-block-builder.yaml +++ b/operations/jsonnet-compiled/StatefulSet-block-builder.yaml @@ -24,7 +24,7 @@ spec: - -config.file=/conf/tempo.yaml - -mem-ballast-size-mbs=1024 - -target=block-builder - image: grafana/tempo:2.9.2 + image: grafana/tempo:2.9.3 imagePullPolicy: IfNotPresent name: block-builder ports: diff --git a/operations/jsonnet-compiled/StatefulSet-ingester.yaml b/operations/jsonnet-compiled/StatefulSet-ingester.yaml index 17befb9718e..949765260f4 100644 --- a/operations/jsonnet-compiled/StatefulSet-ingester.yaml +++ b/operations/jsonnet-compiled/StatefulSet-ingester.yaml @@ -33,7 +33,7 @@ spec: - -config.file=/conf/tempo.yaml - -mem-ballast-size-mbs=1024 - -target=ingester - image: grafana/tempo:2.9.2 + image: grafana/tempo:2.9.3 name: ingester ports: - containerPort: 3200 diff --git a/operations/jsonnet-compiled/StatefulSet-live-store-zone-a.yaml b/operations/jsonnet-compiled/StatefulSet-live-store-zone-a.yaml index 21bc3785299..4d192771a8b 100644 --- a/operations/jsonnet-compiled/StatefulSet-live-store-zone-a.yaml +++ b/operations/jsonnet-compiled/StatefulSet-live-store-zone-a.yaml @@ -43,7 +43,7 @@ spec: - -live-store.instance-availability-zone=zone-a - -mem-ballast-size-mbs=1024 - -target=live-store - image: grafana/tempo:2.9.2 + image: grafana/tempo:2.9.3 imagePullPolicy: IfNotPresent name: live-store ports: diff --git a/operations/jsonnet-compiled/StatefulSet-live-store-zone-b.yaml b/operations/jsonnet-compiled/StatefulSet-live-store-zone-b.yaml index f2d4f7e67bf..a05cd984c94 100644 --- a/operations/jsonnet-compiled/StatefulSet-live-store-zone-b.yaml +++ b/operations/jsonnet-compiled/StatefulSet-live-store-zone-b.yaml @@ -43,7 +43,7 @@ spec: - -live-store.instance-availability-zone=zone-b - -mem-ballast-size-mbs=1024 - -target=live-store - image: grafana/tempo:2.9.2 + image: grafana/tempo:2.9.3 imagePullPolicy: IfNotPresent name: live-store ports: diff --git a/operations/jsonnet-compiled/StatefulSet-metrics-generator.yaml b/operations/jsonnet-compiled/StatefulSet-metrics-generator.yaml index 4a063662594..7a457a8f4f2 100644 --- a/operations/jsonnet-compiled/StatefulSet-metrics-generator.yaml +++ b/operations/jsonnet-compiled/StatefulSet-metrics-generator.yaml @@ -33,7 +33,7 @@ spec: - -config.file=/conf/tempo.yaml - -mem-ballast-size-mbs=1024 - -target=metrics-generator - image: grafana/tempo:2.9.2 + image: grafana/tempo:2.9.3 name: metrics-generator ports: - containerPort: 3200 diff --git a/operations/jsonnet-compiled/util/example/main.jsonnet b/operations/jsonnet-compiled/util/example/main.jsonnet index 13fc958857e..1699002eccf 100644 --- a/operations/jsonnet-compiled/util/example/main.jsonnet +++ b/operations/jsonnet-compiled/util/example/main.jsonnet @@ -4,7 +4,7 @@ local tempo = import 'microservices/tempo.libsonnet'; tempo { _images+:: { - tempo: 'grafana/tempo:2.9.2', + tempo: 'grafana/tempo:2.9.3', tempo_vulture: 'grafana/tempo-vulture:latest', tempo_query: 'grafana/tempo-query:latest', }, diff --git a/operations/jsonnet/microservices/config.libsonnet b/operations/jsonnet/microservices/config.libsonnet index c70a1745519..a1c1062fbb4 100644 --- a/operations/jsonnet/microservices/config.libsonnet +++ b/operations/jsonnet/microservices/config.libsonnet @@ -1,6 +1,6 @@ { _images+:: { - tempo: 'grafana/tempo:2.9.2', + tempo: 'grafana/tempo:2.9.3', tempo_query: 'grafana/tempo-query:latest', tempo_vulture: 'grafana/tempo-vulture:latest', rollout_operator: 'grafana/rollout-operator:v0.23.0', diff --git a/operations/jsonnet/single-binary/config.libsonnet b/operations/jsonnet/single-binary/config.libsonnet index 6975ed5ea8f..485b8c3adc2 100644 --- a/operations/jsonnet/single-binary/config.libsonnet +++ b/operations/jsonnet/single-binary/config.libsonnet @@ -1,6 +1,6 @@ { _images+:: { - tempo: 'grafana/tempo:2.9.2', + tempo: 'grafana/tempo:2.9.3', tempo_query: 'grafana/tempo-query:latest', tempo_vulture: 'grafana/tempo-vulture:latest', },