synced/tempo
1
0
Fork 0
mirror of https://github.com/grafana/tempo.git synced 2025-03-14 03:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update example images (#4842)

Browse Source 
* Examples: upgrade xk6-client-tracing to v0.0.7

* Upgrade grafana to 11.5.2
This commit is contained in:
A. Stoewer
2025-03-13 14:40:36 +10:00
committed by GitHub
parent a8e4330287
commit 3555fdf776
14 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
example/docker-compose/alloy/docker-compose.yaml
View File

@ -26,7 +26,7 @@ services:
# Generate fake traces... # Generate fake traces...
k6-tracing: k6-tracing:
image: ghcr.io/grafana/xk6-client-tracing:v0.0.5 image: ghcr.io/grafana/xk6-client-tracing:v0.0.7
environment: environment:
- ENDPOINT=alloy:4317 - ENDPOINT=alloy:4317
restart: always restart: always
@ -63,7 +63,7 @@ services:
- "9090:9090" - "9090:9090"
grafana: grafana:
image: grafana/grafana:11.2.0 image: grafana/grafana:11.5.2
volumes: volumes:
- ../shared/grafana-datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml - ../shared/grafana-datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml
environment: environment:

4
example/docker-compose/alloy/readme.md
View File

@ -15,8 +15,8 @@ docker compose ps
``` ```
NAME IMAGE COMMAND SERVICE CREATED STATUS PORTS NAME IMAGE COMMAND SERVICE CREATED STATUS PORTS
alloy-alloy-1 grafana/alloy:v1.3.1 "/bin/alloy run /etc…" alloy 48 seconds ago Up 5 seconds 0.0.0.0:4319->4319/tcp, 0.0.0.0:12345->12345/tcp alloy-alloy-1 grafana/alloy:v1.3.1 "/bin/alloy run /etc…" alloy 48 seconds ago Up 5 seconds 0.0.0.0:4319->4319/tcp, 0.0.0.0:12345->12345/tcp
alloy-grafana-1 grafana/grafana:11.2.0 "/run.sh" grafana 48 seconds ago Up 5 seconds 0.0.0.0:3000->3000/tcp alloy-grafana-1 grafana/grafana:11.5.2 "/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.5 "/k6-tracing run /ex…" k6-tracing 48 seconds ago Up 4 seconds 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-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:latest "/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:latest "/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
example/docker-compose/cross-cluster/docker-compose.yaml
View File

@ -151,7 +151,7 @@ services:
- mkdir -p /data/tempo && minio server /data --console-address ':9001' - mkdir -p /data/tempo && minio server /data --console-address ':9001'
k6-tracing: k6-tracing:
image: ghcr.io/grafana/xk6-client-tracing:v0.0.5 image: ghcr.io/grafana/xk6-client-tracing:v0.0.7
environment: environment:
- ENDPOINT=distributor-a:4317 - ENDPOINT=distributor-a:4317
restart: always restart: always

2
example/docker-compose/debug/docker-compose.yaml
View File

@ -28,7 +28,7 @@ services:
- init - init
k6-tracing: k6-tracing:
image: ghcr.io/grafana/xk6-client-tracing:v0.0.5 image: ghcr.io/grafana/xk6-client-tracing:v0.0.7
environment: environment:
- ENDPOINT=tempo:4317 - ENDPOINT=tempo:4317
restart: always restart: always

2
example/docker-compose/distributed/docker-compose.yaml
View File

@ -109,7 +109,7 @@ services:
- mkdir -p /data/tempo && minio server /data --console-address ':9001' - mkdir -p /data/tempo && minio server /data --console-address ':9001'
k6-tracing: k6-tracing:
image: ghcr.io/grafana/xk6-client-tracing:v0.0.5 image: ghcr.io/grafana/xk6-client-tracing:v0.0.7
environment: environment:
- ENDPOINT=distributor:4317 - ENDPOINT=distributor:4317
restart: always restart: always

2
example/docker-compose/ingest-storage/docker-compose.yaml
View File

@ -181,7 +181,7 @@ services:
- mkdir -p /data/tempo && minio server /data --console-address ':9001' - mkdir -p /data/tempo && minio server /data --console-address ':9001'
k6-tracing: k6-tracing:
image: ghcr.io/grafana/xk6-client-tracing:v0.0.5 image: ghcr.io/grafana/xk6-client-tracing:v0.0.7
environment: environment:
- ENDPOINT=distributor:4317 - ENDPOINT=distributor:4317
restart: always restart: always

4
example/docker-compose/local/docker-compose.yaml
View File

@ -39,7 +39,7 @@ services:
- memcached - memcached
k6-tracing: k6-tracing:
image: ghcr.io/grafana/xk6-client-tracing:v0.0.5 image: ghcr.io/grafana/xk6-client-tracing:v0.0.7
environment: environment:
- ENDPOINT=tempo:4317 - ENDPOINT=tempo:4317
restart: always restart: always
@ -59,7 +59,7 @@ services:
- "9090:9090" - "9090:9090"
grafana: grafana:
image: grafana/grafana:11.2.0 image: grafana/grafana:11.5.2
volumes: volumes:
- ../shared/grafana-datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml - ../shared/grafana-datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml
environment: environment:

6
example/docker-compose/multi-tenant/docker-compose.yaml
View File

@ -31,7 +31,7 @@ services:
- init - init
k6-tracing: k6-tracing:
image: ghcr.io/grafana/xk6-client-tracing:v0.0.5 image: ghcr.io/grafana/xk6-client-tracing:v0.0.7
environment: environment:
- ENDPOINT=tempo:4317 - ENDPOINT=tempo:4317
- TEMPO_X_SCOPE_ORGID=test - TEMPO_X_SCOPE_ORGID=test
@ -40,7 +40,7 @@ services:
- tempo - tempo
k6-tracing-2: k6-tracing-2:
image: ghcr.io/grafana/xk6-client-tracing:v0.0.5 image: ghcr.io/grafana/xk6-client-tracing:v0.0.7
environment: environment:
- ENDPOINT=tempo:4317 - ENDPOINT=tempo:4317
- TEMPO_X_SCOPE_ORGID=test2 - TEMPO_X_SCOPE_ORGID=test2
@ -49,7 +49,7 @@ services:
- tempo - tempo
grafana: grafana:
image: grafana/grafana:11.2.0 image: grafana/grafana:11.5.2
volumes: volumes:
- ./grafana-datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml - ./grafana-datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml
environment: environment:

4
example/docker-compose/otel-collector-multitenant/docker-compose.yaml
View File

@ -26,7 +26,7 @@ services:
# Generate fake traces... # Generate fake traces...
k6-tracing: k6-tracing:
image: ghcr.io/grafana/xk6-client-tracing:v0.0.5 image: ghcr.io/grafana/xk6-client-tracing:v0.0.7
environment: environment:
- ENDPOINT=otel-collector:4317 - ENDPOINT=otel-collector:4317
restart: always restart: always
@ -53,7 +53,7 @@ services:
- "9090:9090" - "9090:9090"
grafana: grafana:
image: grafana/grafana:11.2.0 image: grafana/grafana:11.5.2
volumes: volumes:
- ./grafana-datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml - ./grafana-datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml
environment: environment:

2
example/docker-compose/otel-collector/docker-compose.yaml
View File

@ -26,7 +26,7 @@ services:
# Generate fake traces... # Generate fake traces...
k6-tracing: k6-tracing:
image: ghcr.io/grafana/xk6-client-tracing:v0.0.5 image: ghcr.io/grafana/xk6-client-tracing:v0.0.7
environment: environment:
- ENDPOINT=otel-collector:4317 - ENDPOINT=otel-collector:4317
restart: always restart: always

2
example/docker-compose/scalable-single-binary/docker-compose.yaml
View File

@ -81,7 +81,7 @@ services:
- 9001:9001 - 9001:9001
k6-tracing: k6-tracing:
image: ghcr.io/grafana/xk6-client-tracing:v0.0.5 image: ghcr.io/grafana/xk6-client-tracing:v0.0.7
environment: environment:
- ENDPOINT=tempo1:4317 - ENDPOINT=tempo1:4317
restart: always restart: always

2
example/helm/microservices-extras.yaml
View File

@ -40,6 +40,6 @@ spec:
- env: - env:
- name: ENDPOINT - name: ENDPOINT
value: tempo-distributor:4317 value: tempo-distributor:4317
image: ghcr.io/grafana/xk6-client-tracing:v0.0.5 image: ghcr.io/grafana/xk6-client-tracing:v0.0.7
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
name: xk6-tracing name: xk6-tracing

2
example/helm/single-binary-extras.yaml
View File

@ -40,6 +40,6 @@ spec:
- env: - env:
- name: ENDPOINT - name: ENDPOINT
value: tempo:4317 value: tempo:4317
image: ghcr.io/grafana/xk6-client-tracing:v0.0.5 image: ghcr.io/grafana/xk6-client-tracing:v0.0.7
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
name: xk6-tracing name: xk6-tracing

2
example/tk/lib/synthetic-load-generator/main.libsonnet
View File

@ -4,7 +4,7 @@
local deployment = k.apps.v1.deployment, local deployment = k.apps.v1.deployment,
synthetic_load_generator_container:: synthetic_load_generator_container::
container.new('synthetic-load-gen', 'ghcr.io/grafana/xk6-client-tracing:v0.0.5') + container.new('synthetic-load-gen', 'ghcr.io/grafana/xk6-client-tracing:v0.0.7') +
container.withEnvMap({ container.withEnvMap({
ENDPOINT: 'http://tempo:4317', ENDPOINT: 'http://tempo:4317',
}), }),