Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
* [CHANGE] Allow duplicate dimensions for span metrics and service graphs. This is a valid use case if using different instrumentation libraries, with spans having "deployment.environment" and others "deployment_environment", for example. [#6288](https://github.com/grafana/tempo/pull/6288) (@carles-grafana)
* [CHANGE] Updade default max duration for traceql metrics queries up to one day [#6285](https://github.com/grafana/tempo/pull/6285) (@javiermolinar)
* [CHANGE] Set traceQL query metrics checks by default in Vulture [#6275](https://github.com/grafana/tempo/pull/6275) (@javiermolinar)
* [CHANGE] Make tempo singlebinary example to use the local backend [#7033](https://github.com/grafana/tempo/pull/7033) (@javiermolinar)
* [CHANGE] TraceQL metrics - change default step intervals to align with new vParquet5 timestamp columns [#6413](https://github.com/grafana/tempo/pull/6413) (@mdisibio)
* [CHANGE] Remove all traces of ingesters from the dashboards [#6352](https://github.com/grafana/tempo/pull/6352) (@javiermolinar)
* [CHANGE] **BREAKING CHANGE** tempo-cli: Support relative time (now, now-1h) for start/end args and standardize on RFC3339 in all commands. [#6458](https://github.com/grafana/tempo/pull/6458) (@electron0zero)
Expand Down
1 change: 0 additions & 1 deletion docs/sources/tempo/docker-example.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ Redpanda provides the durable queue that Tempo uses to decouple its write and re
single-binary-alloy-1 "/bin/alloy run /etc…" alloy running 0.0.0.0:4319->4317/tcp, 0.0.0.0:12345->12345/tcp
single-binary-grafana-1 "/run.sh" grafana running 0.0.0.0:3000->3000/tcp
single-binary-k6-tracing-1 "/k6-tracing run /ex…" k6-tracing running
single-binary-minio-1 "sh -euc 'mkdir -p /…" minio running 0.0.0.0:9001->9001/tcp
single-binary-prometheus-1 "/bin/prometheus --c…" prometheus running 0.0.0.0:9090->9090/tcp
single-binary-redpanda-1 "/entrypoint.sh redp…" redpanda running 0.0.0.0:9092->9092/tcp
single-binary-redpanda-console-1 "/bin/sh -c 'echo \"$…" redpanda-console running 0.0.0.0:8080->8080/tcp
Expand Down
5 changes: 4 additions & 1 deletion example/docker-compose/debug/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
command: [ "-target=all", "-config.file=/etc/tempo.yaml" ]
volumes:
- ./tempo.yaml:/etc/tempo.yaml
- ./tempo-data:/var/tempo
- tempo-data:/var/tempo
environment:
- DEBUG_BLOCK=0
ports:
Expand Down Expand Up @@ -55,3 +55,6 @@ services:
]
depends_on:
- tempo

volumes:
tempo-data:
5 changes: 4 additions & 1 deletion example/docker-compose/multitenant/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
command: [ "-config.file=/etc/tempo.yaml", "-target=all"]
volumes:
- ./tempo.yaml:/etc/tempo.yaml
- ./tempo-data:/var/tempo
- tempo-data:/var/tempo
ports:
- "4317:4317" # otlp grpc
- "4318:4318" # otlpc http
Expand Down Expand Up @@ -70,3 +70,6 @@ services:
]
depends_on:
- tempo

volumes:
tempo-data:
2 changes: 1 addition & 1 deletion example/docker-compose/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ See below for a list of all examples and the features they demonstrate

| Example | Deployment | Tenancy | Trace Ingestion | Storage | Other Features |
|---------|------------|---------|-----------------|---------|------------------|
| [Single Binary](./single-binary/) | Single binary | Single tenant | Alloy | S3 (MinIO) | vulture for data integrity, metrics generator, streaming queries, mcp |
| [Single Binary](./single-binary/) | Single binary | Single tenant | Alloy | Local filesystem | vulture for data integrity, metrics generator, streaming queries, mcp |
| [Distributed](./distributed/) | Distributed microservices | Single tenant | Alloy | S3 (MinIO) | vulture for data integrity, metrics-generator, streaming queries, mcp |
| [Multitenant](./multitenant/) | Single binary | Multitenant | OTel Collector + Direct OTLP | Local filesystem | vulture for data integrity, multiple tenants (tenant-1, tenant-2), streaming queries, mcp |
| [Debug](./debug/) | Single binary | Single tenant | Direct OTLP | Local filesystem | vulture for data integrity, tempo-debug image for breakpoint debugging, streaming queries, mcp |
Expand Down
20 changes: 5 additions & 15 deletions example/docker-compose/single-binary/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,14 @@ services:
restart: always
volumes:
- ./tempo.yaml:/etc/tempo.yaml
- ./tempo-data:/var/tempo
- tempo-data:/var/tempo
ports:
- "3200:3200" # tempo
- "4317:4317" # Tempo OTLP GRPC
- "4318:4318" # Tempo OTLP HTTP
environment:
- OTEL_EXPORTER_OTLP_ENDPOINT=http://alloy:4318
- OTEL_EXPORTER_OTLP_ENDPOINT=http://alloy:4318

minio:
image: minio/minio:latest
environment:
- MINIO_ACCESS_KEY=tempo
- MINIO_SECRET_KEY=supersecret
ports:
- "9001:9001"
entrypoint:
- sh
- -euc
- mkdir -p /data/tempo && minio server /data --console-address ':9001'


# ingest pipeline
k6-tracing:
image: ghcr.io/grafana/xk6-client-tracing:v0.0.9
Expand Down Expand Up @@ -89,3 +76,6 @@ services:
]
depends_on:
- tempo

volumes:
tempo-data:
10 changes: 3 additions & 7 deletions example/docker-compose/single-binary/tempo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,11 @@ query_frontend:

storage:
trace:
backend: s3
s3:
bucket: tempo
endpoint: minio:9000
access_key: tempo
secret_key: supersecret
insecure: true
backend: local
wal:
path: /var/tempo/wal # where to store the wal locally
local:
path: /var/tempo/blocks
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Worth making it a named volume then - so it survives container update?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, good idea


overrides:
defaults:
Expand Down
Loading