From 3555fdf776dd751a95186e2e75074124d7c3cb78 Mon Sep 17 00:00:00 2001 From: "A. Stoewer" Date: Thu, 13 Mar 2025 14:40:36 +1000 Subject: [PATCH] Update example images (#4842) * Examples: upgrade xk6-client-tracing to v0.0.7 * Upgrade grafana to 11.5.2 --- example/docker-compose/alloy/docker-compose.yaml | 4 ++-- example/docker-compose/alloy/readme.md | 4 ++-- example/docker-compose/cross-cluster/docker-compose.yaml | 2 +- example/docker-compose/debug/docker-compose.yaml | 2 +- example/docker-compose/distributed/docker-compose.yaml | 2 +- example/docker-compose/ingest-storage/docker-compose.yaml | 2 +- example/docker-compose/local/docker-compose.yaml | 4 ++-- example/docker-compose/multi-tenant/docker-compose.yaml | 6 +++--- .../otel-collector-multitenant/docker-compose.yaml | 4 ++-- example/docker-compose/otel-collector/docker-compose.yaml | 2 +- .../scalable-single-binary/docker-compose.yaml | 2 +- example/helm/microservices-extras.yaml | 2 +- example/helm/single-binary-extras.yaml | 2 +- example/tk/lib/synthetic-load-generator/main.libsonnet | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/example/docker-compose/alloy/docker-compose.yaml b/example/docker-compose/alloy/docker-compose.yaml index 3a8f1b777..e67a837e5 100644 --- a/example/docker-compose/alloy/docker-compose.yaml +++ b/example/docker-compose/alloy/docker-compose.yaml @@ -26,7 +26,7 @@ services: # Generate fake traces... k6-tracing: - image: ghcr.io/grafana/xk6-client-tracing:v0.0.5 + image: ghcr.io/grafana/xk6-client-tracing:v0.0.7 environment: - ENDPOINT=alloy:4317 restart: always @@ -63,7 +63,7 @@ services: - "9090:9090" grafana: - image: grafana/grafana:11.2.0 + image: grafana/grafana:11.5.2 volumes: - ../shared/grafana-datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml environment: diff --git a/example/docker-compose/alloy/readme.md b/example/docker-compose/alloy/readme.md index 4ff9da00b..281265040 100644 --- a/example/docker-compose/alloy/readme.md +++ b/example/docker-compose/alloy/readme.md @@ -15,8 +15,8 @@ docker compose ps ``` 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-grafana-1 grafana/grafana:11.2.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.5 "/k6-tracing run /ex…" k6-tracing 48 seconds ago Up 4 seconds +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.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: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 ``` diff --git a/example/docker-compose/cross-cluster/docker-compose.yaml b/example/docker-compose/cross-cluster/docker-compose.yaml index ea9d21080..91ec06b6b 100644 --- a/example/docker-compose/cross-cluster/docker-compose.yaml +++ b/example/docker-compose/cross-cluster/docker-compose.yaml @@ -151,7 +151,7 @@ services: - mkdir -p /data/tempo && minio server /data --console-address ':9001' k6-tracing: - image: ghcr.io/grafana/xk6-client-tracing:v0.0.5 + image: ghcr.io/grafana/xk6-client-tracing:v0.0.7 environment: - ENDPOINT=distributor-a:4317 restart: always diff --git a/example/docker-compose/debug/docker-compose.yaml b/example/docker-compose/debug/docker-compose.yaml index 39fd958be..c131f077d 100644 --- a/example/docker-compose/debug/docker-compose.yaml +++ b/example/docker-compose/debug/docker-compose.yaml @@ -28,7 +28,7 @@ services: - init k6-tracing: - image: ghcr.io/grafana/xk6-client-tracing:v0.0.5 + image: ghcr.io/grafana/xk6-client-tracing:v0.0.7 environment: - ENDPOINT=tempo:4317 restart: always diff --git a/example/docker-compose/distributed/docker-compose.yaml b/example/docker-compose/distributed/docker-compose.yaml index bec8a14e0..cb5ee52fc 100644 --- a/example/docker-compose/distributed/docker-compose.yaml +++ b/example/docker-compose/distributed/docker-compose.yaml @@ -109,7 +109,7 @@ services: - mkdir -p /data/tempo && minio server /data --console-address ':9001' k6-tracing: - image: ghcr.io/grafana/xk6-client-tracing:v0.0.5 + image: ghcr.io/grafana/xk6-client-tracing:v0.0.7 environment: - ENDPOINT=distributor:4317 restart: always diff --git a/example/docker-compose/ingest-storage/docker-compose.yaml b/example/docker-compose/ingest-storage/docker-compose.yaml index a74b960bd..7b9880eed 100644 --- a/example/docker-compose/ingest-storage/docker-compose.yaml +++ b/example/docker-compose/ingest-storage/docker-compose.yaml @@ -181,7 +181,7 @@ services: - mkdir -p /data/tempo && minio server /data --console-address ':9001' k6-tracing: - image: ghcr.io/grafana/xk6-client-tracing:v0.0.5 + image: ghcr.io/grafana/xk6-client-tracing:v0.0.7 environment: - ENDPOINT=distributor:4317 restart: always diff --git a/example/docker-compose/local/docker-compose.yaml b/example/docker-compose/local/docker-compose.yaml index 226c4f5d8..e4ded8b59 100644 --- a/example/docker-compose/local/docker-compose.yaml +++ b/example/docker-compose/local/docker-compose.yaml @@ -39,7 +39,7 @@ services: - memcached k6-tracing: - image: ghcr.io/grafana/xk6-client-tracing:v0.0.5 + image: ghcr.io/grafana/xk6-client-tracing:v0.0.7 environment: - ENDPOINT=tempo:4317 restart: always @@ -59,7 +59,7 @@ services: - "9090:9090" grafana: - image: grafana/grafana:11.2.0 + image: grafana/grafana:11.5.2 volumes: - ../shared/grafana-datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml environment: diff --git a/example/docker-compose/multi-tenant/docker-compose.yaml b/example/docker-compose/multi-tenant/docker-compose.yaml index bb4566930..65f2cf27f 100644 --- a/example/docker-compose/multi-tenant/docker-compose.yaml +++ b/example/docker-compose/multi-tenant/docker-compose.yaml @@ -31,7 +31,7 @@ services: - init k6-tracing: - image: ghcr.io/grafana/xk6-client-tracing:v0.0.5 + image: ghcr.io/grafana/xk6-client-tracing:v0.0.7 environment: - ENDPOINT=tempo:4317 - TEMPO_X_SCOPE_ORGID=test @@ -40,7 +40,7 @@ services: - tempo k6-tracing-2: - image: ghcr.io/grafana/xk6-client-tracing:v0.0.5 + image: ghcr.io/grafana/xk6-client-tracing:v0.0.7 environment: - ENDPOINT=tempo:4317 - TEMPO_X_SCOPE_ORGID=test2 @@ -49,7 +49,7 @@ services: - tempo grafana: - image: grafana/grafana:11.2.0 + image: grafana/grafana:11.5.2 volumes: - ./grafana-datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml environment: diff --git a/example/docker-compose/otel-collector-multitenant/docker-compose.yaml b/example/docker-compose/otel-collector-multitenant/docker-compose.yaml index 14b835f7c..f8bf55a18 100644 --- a/example/docker-compose/otel-collector-multitenant/docker-compose.yaml +++ b/example/docker-compose/otel-collector-multitenant/docker-compose.yaml @@ -26,7 +26,7 @@ services: # Generate fake traces... k6-tracing: - image: ghcr.io/grafana/xk6-client-tracing:v0.0.5 + image: ghcr.io/grafana/xk6-client-tracing:v0.0.7 environment: - ENDPOINT=otel-collector:4317 restart: always @@ -53,7 +53,7 @@ services: - "9090:9090" grafana: - image: grafana/grafana:11.2.0 + image: grafana/grafana:11.5.2 volumes: - ./grafana-datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml environment: diff --git a/example/docker-compose/otel-collector/docker-compose.yaml b/example/docker-compose/otel-collector/docker-compose.yaml index 687b63bbc..fa270e537 100644 --- a/example/docker-compose/otel-collector/docker-compose.yaml +++ b/example/docker-compose/otel-collector/docker-compose.yaml @@ -26,7 +26,7 @@ services: # Generate fake traces... k6-tracing: - image: ghcr.io/grafana/xk6-client-tracing:v0.0.5 + image: ghcr.io/grafana/xk6-client-tracing:v0.0.7 environment: - ENDPOINT=otel-collector:4317 restart: always diff --git a/example/docker-compose/scalable-single-binary/docker-compose.yaml b/example/docker-compose/scalable-single-binary/docker-compose.yaml index 1c873aef8..fc97c14a3 100644 --- a/example/docker-compose/scalable-single-binary/docker-compose.yaml +++ b/example/docker-compose/scalable-single-binary/docker-compose.yaml @@ -81,7 +81,7 @@ services: - 9001:9001 k6-tracing: - image: ghcr.io/grafana/xk6-client-tracing:v0.0.5 + image: ghcr.io/grafana/xk6-client-tracing:v0.0.7 environment: - ENDPOINT=tempo1:4317 restart: always diff --git a/example/helm/microservices-extras.yaml b/example/helm/microservices-extras.yaml index 0fcae0b8e..273ebe751 100644 --- a/example/helm/microservices-extras.yaml +++ b/example/helm/microservices-extras.yaml @@ -40,6 +40,6 @@ spec: - env: - name: ENDPOINT 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 name: xk6-tracing \ No newline at end of file diff --git a/example/helm/single-binary-extras.yaml b/example/helm/single-binary-extras.yaml index 89bd3dba0..f0a4ad8e0 100644 --- a/example/helm/single-binary-extras.yaml +++ b/example/helm/single-binary-extras.yaml @@ -40,6 +40,6 @@ spec: - env: - name: ENDPOINT 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 name: xk6-tracing \ No newline at end of file diff --git a/example/tk/lib/synthetic-load-generator/main.libsonnet b/example/tk/lib/synthetic-load-generator/main.libsonnet index 63294a420..08ec2805a 100644 --- a/example/tk/lib/synthetic-load-generator/main.libsonnet +++ b/example/tk/lib/synthetic-load-generator/main.libsonnet @@ -4,7 +4,7 @@ local deployment = k.apps.v1.deployment, 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({ ENDPOINT: 'http://tempo:4317', }),