Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use xk6-client-tracing in examples to generate traces #1920

Merged
merged 5 commits into from
Dec 1, 2022
Merged

Use xk6-client-tracing in examples to generate traces #1920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dac7c6d
Use xk6-client-tracing in examples to generate traces
stoewer Nov 30, 2022
8b95ea1
Move load-generator.json to grafana7.4 example
stoewer Nov 30, 2022
7cbdaac
Pin xk6-client-tracing version to v0.0.2
stoewer Dec 1, 2022
2721a0a
Mention fix for #902 in change log
stoewer Dec 1, 2022
8428d88
Upgrade to Grafana 9.3.0 in docker-compose examples
stoewer Dec 1, 2022
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ Internal types are updated to use `scope` instead of `instrumentation_library`.
* [BUGFIX] Fix failing SearchTagValues endpoint after startup [#1813](https://github.com/grafana/tempo/pull/1813) (@stoewer)
* [BUGFIX] tempo-mixin: tweak dashboards to support metrics without `cluster` label present [#1913](https://github.com/grafana/tempo/pull/1913) (@kvrhdn)
* [ENHANCEMENT] New tenant dashboard [#1901](https://github.com/grafana/tempo/pull/1901) (@mapno)
* [BUGFIX] Fix docker-compose examples not running on Apple M1 hardware [#1920](https://github.com/grafana/tempo/pull/1920) (@stoewer)

## v1.5.0 / 2022-08-17

Expand Down
4 changes: 2 additions & 2 deletions example/docker-compose/agent/agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ traces:
configs:
- name: default
receivers:
jaeger:
otlp:
protocols:
thrift_http:
grpc:
remote_write:
- endpoint: tempo:4317
insecure: true
Expand Down
14 changes: 7 additions & 7 deletions example/docker-compose/agent/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ version: "3"
services:

# Generate fake traces...
synthetic-load-generator:
image: omnition/synthetic-load-generator:1.0.29
volumes:
- ../shared/load-generator.json:/etc/load-generator.json
k6-tracing:
image: ghcr.io/grafana/xk6-client-tracing:v0.0.2
environment:
- TOPOLOGY_FILE=/etc/load-generator.json
- JAEGER_COLLECTOR_URL=http://agent:14268
- ENDPOINT=agent:4317
restart: always
depends_on:
- tempo

# And put them in a Grafana Agent pipeline...
agent:
Expand Down Expand Up @@ -45,7 +45,7 @@ services:
- "9090:9090"

grafana:
image: grafana/grafana:9.1.6
image: grafana/grafana:9.3.0
volumes:
- ../shared/grafana-datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml
environment:
Expand Down
12 changes: 5 additions & 7 deletions example/docker-compose/azure/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,11 @@ services:
depends_on:
- azurite

synthetic-load-generator:
image: omnition/synthetic-load-generator:1.0.29
volumes:
- ../shared/load-generator.json:/etc/load-generator.json
k6-tracing:
image: ghcr.io/grafana/xk6-client-tracing:v0.0.2
environment:
- TOPOLOGY_FILE=/etc/load-generator.json
- JAEGER_COLLECTOR_URL=http://tempo:14268
- ENDPOINT=tempo:4317
restart: always
depends_on:
- tempo

Expand All @@ -49,7 +47,7 @@ services:
- "9090:9090"

grafana:
image: grafana/grafana:9.1.6
image: grafana/grafana:9.3.0
volumes:
- ../shared/grafana-datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml
environment:
Expand Down
14 changes: 7 additions & 7 deletions example/docker-compose/distributed/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,13 @@ services:
- -euc
- mkdir -p /data/tempo && minio server /data --console-address ':9001'

synthetic-load-generator:
image: omnition/synthetic-load-generator:1.0.29
volumes:
- ../shared/load-generator.json:/etc/load-generator.json
k6-tracing:
image: ghcr.io/grafana/xk6-client-tracing:v0.0.2
environment:
- TOPOLOGY_FILE=/etc/load-generator.json
- JAEGER_COLLECTOR_URL=http://distributor:14268
- ENDPOINT=distributor:4317
restart: always
depends_on:
- distributor

prometheus:
image: prom/prometheus:latest
Expand All @@ -105,7 +105,7 @@ services:
- "9090:9090"

grafana:
image: grafana/grafana:9.1.6
image: grafana/grafana:9.3.0
volumes:
- ./grafana-datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml
environment:
Expand Down
12 changes: 5 additions & 7 deletions example/docker-compose/gcs/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ services:
# This creates an empty tempo bucket
- ./gcs-data/:/data/tempo/

synthetic-load-generator:
image: omnition/synthetic-load-generator:1.0.29
volumes:
- ../shared/load-generator.json:/etc/load-generator.json
k6-tracing:
image: ghcr.io/grafana/xk6-client-tracing:v0.0.2
environment:
- TOPOLOGY_FILE=/etc/load-generator.json
- JAEGER_COLLECTOR_URL=http://tempo:14268
- ENDPOINT=tempo:4317
restart: always
depends_on:
- tempo

Expand All @@ -44,7 +42,7 @@ services:
- "9090:9090"

grafana:
image: grafana/grafana:9.1.6
image: grafana/grafana:9.3.0
volumes:
- ../shared/grafana-datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml
environment:
Expand Down
2 changes: 1 addition & 1 deletion example/docker-compose/grafana7.4/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ services:
synthetic-load-generator:
image: omnition/synthetic-load-generator:1.0.25
volumes:
- ../shared/load-generator.json:/etc/load-generator.json
- ./load-generator.json:/etc/load-generator.json
environment:
- TOPOLOGY_FILE=/etc/load-generator.json
- JAEGER_COLLECTOR_URL=http://tempo:14268
Expand Down
0 ...docker-compose/shared/load-generator.json → ...er-compose/grafana7.4/load-generator.json
View file
Open in desktop
File renamed without changes.
12 changes: 5 additions & 7 deletions example/docker-compose/local/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,11 @@ services:
- "4318:4318" # otlp http
- "9411:9411" # zipkin

synthetic-load-generator:
image: omnition/synthetic-load-generator:1.0.29
volumes:
- ../shared/load-generator.json:/etc/load-generator.json
k6-tracing:
image: ghcr.io/grafana/xk6-client-tracing:v0.0.2
environment:
- TOPOLOGY_FILE=/etc/load-generator.json
- JAEGER_COLLECTOR_URL=http://tempo:14268
- ENDPOINT=tempo:4317
restart: always
depends_on:
- tempo

Expand All @@ -36,7 +34,7 @@ services:
- "9090:9090"

grafana:
image: grafana/grafana:9.1.6
image: grafana/grafana:9.3.0
volumes:
- ../shared/grafana-datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml
environment:
Expand Down
2 changes: 1 addition & 1 deletion example/docker-compose/loki/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ services:
loki-url: 'http://localhost:3100/loki/api/v1/push'

grafana:
image: grafana/grafana:9.1.6
image: grafana/grafana:9.3.0
volumes:
- ./grafana-datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml
environment:
Expand Down
14 changes: 7 additions & 7 deletions example/docker-compose/otel-collector-multitenant/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ version: "3"
services:

# Generate fake traces...
synthetic-load-generator:
image: omnition/synthetic-load-generator:1.0.29
volumes:
- ../shared/load-generator.json:/etc/load-generator.json
k6-tracing:
image: ghcr.io/grafana/xk6-client-tracing:v0.0.2
environment:
- TOPOLOGY_FILE=/etc/load-generator.json
- JAEGER_COLLECTOR_URL=http://otel-collector:14268
- ENDPOINT=otel-collector:4317
restart: always
depends_on:
- otel-collector

# And put them in an OTEL collector pipeline...
otel-collector:
Expand Down Expand Up @@ -43,7 +43,7 @@ services:
- "9090:9090"

grafana:
image: grafana/grafana:9.1.6
image: grafana/grafana:9.3.0
volumes:
- ./grafana-datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml
environment:
Expand Down
8 changes: 4 additions & 4 deletions example/docker-compose/otel-collector-multitenant/otel-collector.multitenant.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
receivers:
jaeger:
receivers:
otlp:
protocols:
thrift_http:
grpc:
exporters:
otlp:
endpoint: tempo:4317
Expand All @@ -12,5 +12,5 @@ exporters:
service:
pipelines:
traces:
receivers: [jaeger]
receivers: [otlp]
exporters: [otlp]
14 changes: 7 additions & 7 deletions example/docker-compose/otel-collector/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ version: "3"
services:

# Generate fake traces...
synthetic-load-generator:
image: omnition/synthetic-load-generator:1.0.29
volumes:
- ../shared/load-generator.json:/etc/load-generator.json
k6-tracing:
image: ghcr.io/grafana/xk6-client-tracing:v0.0.2
environment:
- TOPOLOGY_FILE=/etc/load-generator.json
- JAEGER_COLLECTOR_URL=http://otel-collector:14268
- ENDPOINT=otel-collector:4317
restart: always
depends_on:
- otel-collector

# And put them in an OTEL collector pipeline...
otel-collector:
Expand Down Expand Up @@ -43,7 +43,7 @@ services:
- "9090:9090"

grafana:
image: grafana/grafana:9.1.6
image: grafana/grafana:9.3.0
volumes:
- ../shared/grafana-datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml
environment:
Expand Down
10 changes: 5 additions & 5 deletions example/docker-compose/otel-collector/otel-collector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
receivers:
jaeger:
receivers:
otlp:
protocols:
thrift_http:
grpc:
exporters:
otlp:
endpoint: tempo:4317
Expand All @@ -10,5 +10,5 @@ exporters:
service:
pipelines:
traces:
receivers: [jaeger]
exporters: [otlp]
receivers: [otlp]
exporters: [otlp]
12 changes: 5 additions & 7 deletions example/docker-compose/s3/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,11 @@ services:
- -euc
- mkdir -p /data/tempo && /opt/bin/minio server /data --console-address ':9001'

synthetic-load-generator:
image: omnition/synthetic-load-generator:1.0.29
volumes:
- ../shared/load-generator.json:/etc/load-generator.json
k6-tracing:
image: ghcr.io/grafana/xk6-client-tracing:v0.0.2
environment:
- TOPOLOGY_FILE=/etc/load-generator.json
- JAEGER_COLLECTOR_URL=http://tempo:14268
- ENDPOINT=tempo:4317
restart: always
depends_on:
- tempo

Expand All @@ -48,7 +46,7 @@ services:
- "9090:9090"

grafana:
image: grafana/grafana:9.1.6
image: grafana/grafana:9.3.0
volumes:
- ../shared/grafana-datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml
environment:
Expand Down
14 changes: 7 additions & 7 deletions example/docker-compose/scalable-single-binary/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ services:
- ./prometheus.yaml:/etc/prometheus.yaml

grafana:
image: grafana/grafana:9.1.6
image: grafana/grafana:9.3.0
volumes:
- ./grafana-datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml
environment:
Expand All @@ -82,10 +82,10 @@ services:
ports:
- 9001:9001

synthetic-load-generator:
image: omnition/synthetic-load-generator:1.0.29
volumes:
- ../shared/load-generator.json:/etc/load-generator.json
k6-tracing:
image: ghcr.io/grafana/xk6-client-tracing:v0.0.2
environment:
- TOPOLOGY_FILE=/etc/load-generator.json
- JAEGER_COLLECTOR_URL=http://tempo1:14268
- ENDPOINT=tempo1:4317
restart: always
depends_on:
- tempo1
10 changes: 4 additions & 6 deletions example/docker-compose/tempo-search/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,11 @@ services:
# depends_on:
# - tempo

synthetic-load-generator:
image: omnition/synthetic-load-generator:1.0.25
volumes:
- ../shared/load-generator.json:/etc/load-generator.json
k6-tracing:
image: ghcr.io/grafana/xk6-client-tracing:v0.0.2
environment:
- TOPOLOGY_FILE=/etc/load-generator.json
- JAEGER_COLLECTOR_URL=http://tempo:14268
- ENDPOINT=tempo:4317
restart: always
depends_on:
- tempo

Expand Down