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.

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

update image versions and replace the sample traces generator #4637

Merged
merged 5 commits into from
Aug 7, 2023
Merged
Show file tree
Hide file tree
Changes from all 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
4 changes: 2 additions & 2 deletions example/docker-compose/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Grafana Agent.

By default, the following services are exposed:

1. Cortex for storing metrics (localhost:9009)
1. Mimir for storing metrics (localhost:9009)
2. Grafana for visualizing telemetry (localhost:3000)
3. Loki for storing logs (localhost:3100)
4. Tempo for storing traces (localhost:3200)
Expand Down Expand Up @@ -48,7 +48,7 @@ dashboards:
* The `Agent` dashboard gives a very high-level overview of running agents.

* The `Agent Prometheus Remote Write` dashboard visualizes the current state of
writing metrics to Cortex.
writing metrics to Mimir.

* The `Agent Tracing Pipeline` dashboard visualizes the current state of the
tracing pipeline (if spans are being processed).
Expand Down
14 changes: 7 additions & 7 deletions example/docker-compose/agent/config/agent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ metrics:
global:
scrape_interval: 60s
remote_write:
- url: http://${REMOTE_WRITE_HOST:-localhost:9009}/api/prom/push
- url: http://${REMOTE_WRITE_HOST:-localhost:9009}/api/v1/push
configs:
- name: default
scrape_configs:
Expand All @@ -41,12 +41,12 @@ logs:
filename: /tmp/positions.yaml
scrape_configs:
## Uncomment to read logs from /var/log
#- job_name: system
# static_configs:
# - targets: [localhost]
# labels:
# job: varlogs
# __path__: /var/log/*log
- job_name: system
static_configs:
- targets: [localhost]
labels:
job: varlogs
__path__: /var/log/*log

traces:
configs:
Expand Down
42 changes: 20 additions & 22 deletions example/docker-compose/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ services:
# Core services. These services allow a Grafana Agent to send data somewhere
# and visualize it in Grafana.
#
# Backends: grafana, loki, cortex, tempo
# Backends: grafana, loki, mimir, tempo
# Example services: avalanche
#

grafana:
image: grafana/grafana:9.2.3
image: grafana/grafana:10.0.3
entrypoint:
- /usr/share/grafana/bin/grafana-server
- --homepath=/usr/share/grafana
Expand All @@ -23,25 +23,24 @@ services:
- "3000:3000"

loki:
image: grafana/loki:2.6.1
image: grafana/loki:2.8.3
command: -config.file=/etc/loki/local-config.yaml
ports:
- "3100:3100"

cortex:
image: cortexproject/cortex:v1.8.1
mimir:
image: grafana/mimir:2.9.0
volumes:
- ./cortex/config:/etc/cortex-config
- ./mimir/config:/etc/mimir-config
entrypoint:
- /bin/cortex
- -config.file=/etc/cortex-config/cortex.yaml
- /bin/mimir
- -config.file=/etc/mimir-config/mimir.yaml
ports:
- "9009:9009"

tempo:
image: grafana/tempo:1.5.0
image: grafana/tempo:2.1.0
command:
- "-search.enabled=true"
- "-storage.trace.backend=local" # tell tempo where to permanently put traces
- "-storage.trace.local.path=/tmp/tempo/traces"
- "-storage.trace.wal.path=/tmp/tempo/wal" # tell tempo where to store the wal
Expand All @@ -60,21 +59,20 @@ services:
ports:
- "9001:9001"

# tracing load generator
synthetic-load-generator:
profiles: [agent] # Should only be run if the Agent is present
image: omnition/synthetic-load-generator:1.0.25
volumes:
- ./load-generator:/etc/load-generator
environment:
- TOPOLOGY_FILE=/etc/load-generator/load-generator.json
- JAEGER_COLLECTOR_URL=http://agent:14268
hotrod:
Copy link
Contributor

Choose a reason for hiding this comment

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

Might be good to dogfood xk6-client-tracing like the Tempo repo does.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah, I didn't know about this one. Maybe we can leave this upgrade for another PR, because we've been creeping scope in this one for a bit already.

profiles: [agent]
image: yurishkuro/microsim:latest
ports:
- "8080:8080"
command:
- "-j=http://agent:14268/api/traces"
- "-d=1h"
depends_on:
- agent

#
# Optional Grafana Agent which can collect telemetry and send it to
# Loki/Cortex/Tempo.
# Loki/Mimir/Tempo.
#
# Enable with the "agent" profile.
#
Expand All @@ -94,7 +92,7 @@ services:
- -config.enable-read-api
environment:
HOSTNAME: agent
REMOTE_WRITE_HOST: cortex:9009
REMOTE_WRITE_HOST: mimir:9009
LOKI_HOST: loki:3100
TEMPO_HOST: tempo:4317
AVALANCHE_HOST: avalanche:9001
Expand All @@ -110,7 +108,7 @@ services:
ports:
- "12345:12345"
depends_on:
- cortex
- mimir
- loki
- tempo

Expand Down
6 changes: 3 additions & 3 deletions example/docker-compose/grafana/datasources/datasource.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
apiVersion: 1

deleteDatasources:
- name: Cortex
- name: Mimir

datasources:
- name: Cortex
- name: Mimir
type: prometheus
access: proxy
orgId: 1
url: http://cortex:9009/api/prom
url: http://mimir:9009/prometheus
basicAuth: false
isDefault: false
version: 1
Expand Down
Loading