Skip to content

Commit cc4a5ab

Browse files
authored
chore: prepare v3.0.1 release (#7411)
1 parent 3ef34f0 commit cc4a5ab

32 files changed

Lines changed: 41 additions & 32 deletions

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
<!-- next version -->
22

3+
# v3.0.1
4+
5+
## 🔒 Security 🔒
6+
7+
- `deps`: Build Tempo with Go 1.26.3, which includes upstream security and bug fixes. ([#7423](https://github.com/grafana/tempo/issues/7423)) (@ie-pham)
8+
39
# v3.0.0
410

511
* [CHANGE] **BREAKING CHANGE** Recent data queries guarantee complete results by failing when an instance is lagging. Defaults `query_frontend.query_end_cutoff` to `30s` and `live_store.fail_on_high_lag` to `true`. [#7210](https://github.com/grafana/tempo/pull/7210) (@mapno)

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,8 @@ generate-manifest: ## Generate manifest.md file
395395
##@ Release
396396

397397
TEMPO_IMAGE_TAG ?=
398+
# The migrate-to-3 example intentionally pins distinct v2 and v3 tempo image
399+
# tags to demonstrate a 2.x -> 3.0 migration, so it is excluded from the bump.
398400
.PHONY: bump-tempo-image-tag
399401
bump-tempo-image-tag: ## Bump grafana/tempo image tag in docker-compose and jsonnet files. Usage: make bump-tempo-image-tag TEMPO_IMAGE_TAG=2.10.2
400402
@test -n "$(TEMPO_IMAGE_TAG)" || (echo "ERROR: TEMPO_IMAGE_TAG is required. Usage: make bump-tempo-image-tag TEMPO_IMAGE_TAG=<tag>"; exit 1)
@@ -405,6 +407,7 @@ bump-tempo-image-tag: ## Bump grafana/tempo image tag in docker-compose and json
405407
-not -path './.git/*' \
406408
-not -path './vendor/*' \
407409
-not -path './.worktrees/*' \
410+
-not -path './example/docker-compose/migrate-to-3/*' \
408411
\( -name "*.yaml" -o -name "*.libsonnet" -o -name "*.jsonnet" -o -name "*.md" \) \
409412
-print0 \
410413
| xargs -0 grep -l "grafana/tempo:" \

docs/sources/tempo/set-up-for-tracing/setup-tempo/deploy/kubernetes/tanka.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ Install the `k.libsonnet`, Jsonnet, and Memcached libraries.
227227
228228
tempo {
229229
_images+:: {
230-
tempo: 'grafana/tempo:3.0.0',
230+
tempo: 'grafana/tempo:3.0.1',
231231
},
232232
233233
tempo_distributor_container+:: container.withPorts([

example/docker-compose/distributed/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
services:
22
# tempo, backend and kafka
33
distributor:
4-
image: &tempoImage grafana/tempo:3.0.0
4+
image: &tempoImage grafana/tempo:3.0.1
55
depends_on:
66
- redpanda
77
command: "-target=distributor -config.file=/etc/tempo.yaml"

example/docker-compose/multitenant/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
tempo:
3-
image: grafana/tempo:3.0.0
3+
image: grafana/tempo:3.0.1
44
command: [ "-config.file=/etc/tempo.yaml", "-target=all"]
55
volumes:
66
- ./tempo.yaml:/etc/tempo.yaml

example/docker-compose/readme.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ See below for a list of all examples and the features they demonstrate
3333
### Build images (optional)
3434

3535
This step is not necessary, but it can be nice for local testing. The examples use the released
36-
`grafana/tempo:3.0.0` image by default. To test local code, run the following from the project root
37-
folder and either update the compose files to use `grafana/tempo:latest` or tag the locally built image
38-
as `grafana/tempo:3.0.0`:
36+
`grafana/tempo:3.0.1` image by default. To test local code, run the following from the project root
37+
folder and either update the compose files to use `grafana/tempo:3.0.1` or tag the locally built image
38+
as `grafana/tempo:3.0.1`:
3939

4040
```console
4141
make docker-images

example/docker-compose/single-binary/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
tempo:
3-
image: grafana/tempo:3.0.0
3+
image: grafana/tempo:3.0.1
44
command: "-target=all -config.file=/etc/tempo.yaml"
55
restart: always
66
volumes:

example/tk/readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ k3d cluster create tempo --api-port 6443 --port "3000:80@loadbalancer"
2222
If you wish to use a local image, you can import these into k3d
2323

2424
```console
25-
k3d image import grafana/tempo:latest --cluster tempo
25+
k3d image import grafana/tempo:3.0.1 --cluster tempo
2626
```
2727

2828
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.

operations/jsonnet-compiled/microservices-with-extras/gen/Deployment-distributor.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
- args:
3030
- -config.file=/conf/tempo.yaml
3131
- -target=distributor
32-
image: grafana/tempo:3.0.0
32+
image: grafana/tempo:3.0.1
3333
imagePullPolicy: IfNotPresent
3434
name: distributor
3535
ports:

operations/jsonnet-compiled/microservices-with-extras/gen/Deployment-metrics-generator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
- args:
2828
- -config.file=/conf/tempo.yaml
2929
- -target=metrics-generator
30-
image: grafana/tempo:3.0.0
30+
image: grafana/tempo:3.0.1
3131
name: metrics-generator
3232
ports:
3333
- containerPort: 3200

0 commit comments

Comments
 (0)