Skip to content

Commit d549eb7

Browse files
wildummarctcspartan0x117clayton-cornell
committed
update image versions and replace the sample traces generator (#4637)
* update image versions and replace the traces generator * replace cortex by mimir and uncomment logs config * flow: Add openstack discovery component (#4606) Co-authored-by: Mischa Thompson <[email protected]> Co-authored-by: Clayton Cornell <[email protected]> * reorder config in mimir.yaml to match previous file --------- Co-authored-by: Marc Tudurí <[email protected]> Co-authored-by: Mischa Thompson <[email protected]> Co-authored-by: Clayton Cornell <[email protected]>
1 parent 75fb435 commit d549eb7

File tree

6 files changed

+56
-694
lines changed

6 files changed

+56
-694
lines changed

example/docker-compose/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Grafana Agent.
55

66
By default, the following services are exposed:
77

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

5050
* The `Agent Prometheus Remote Write` dashboard visualizes the current state of
51-
writing metrics to Cortex.
51+
writing metrics to Mimir.
5252

5353
* The `Agent Tracing Pipeline` dashboard visualizes the current state of the
5454
tracing pipeline (if spans are being processed).

example/docker-compose/agent/config/agent.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ metrics:
2424
global:
2525
scrape_interval: 60s
2626
remote_write:
27-
- url: http://${REMOTE_WRITE_HOST:-localhost:9009}/api/prom/push
27+
- url: http://${REMOTE_WRITE_HOST:-localhost:9009}/api/v1/push
2828
configs:
2929
- name: default
3030
scrape_configs:
@@ -41,12 +41,12 @@ logs:
4141
filename: /tmp/positions.yaml
4242
scrape_configs:
4343
## Uncomment to read logs from /var/log
44-
#- job_name: system
45-
# static_configs:
46-
# - targets: [localhost]
47-
# labels:
48-
# job: varlogs
49-
# __path__: /var/log/*log
44+
- job_name: system
45+
static_configs:
46+
- targets: [localhost]
47+
labels:
48+
job: varlogs
49+
__path__: /var/log/*log
5050

5151
traces:
5252
configs:

example/docker-compose/docker-compose.yaml

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ services:
44
# Core services. These services allow a Grafana Agent to send data somewhere
55
# and visualize it in Grafana.
66
#
7-
# Backends: grafana, loki, cortex, tempo
7+
# Backends: grafana, loki, mimir, tempo
88
# Example services: avalanche
99
#
1010

1111
grafana:
12-
image: grafana/grafana:9.2.3
12+
image: grafana/grafana:10.0.3
1313
entrypoint:
1414
- /usr/share/grafana/bin/grafana-server
1515
- --homepath=/usr/share/grafana
@@ -23,25 +23,24 @@ services:
2323
- "3000:3000"
2424

2525
loki:
26-
image: grafana/loki:2.6.1
26+
image: grafana/loki:2.8.3
2727
command: -config.file=/etc/loki/local-config.yaml
2828
ports:
2929
- "3100:3100"
3030

31-
cortex:
32-
image: cortexproject/cortex:v1.8.1
31+
mimir:
32+
image: grafana/mimir:2.9.0
3333
volumes:
34-
- ./cortex/config:/etc/cortex-config
34+
- ./mimir/config:/etc/mimir-config
3535
entrypoint:
36-
- /bin/cortex
37-
- -config.file=/etc/cortex-config/cortex.yaml
36+
- /bin/mimir
37+
- -config.file=/etc/mimir-config/mimir.yaml
3838
ports:
3939
- "9009:9009"
4040

4141
tempo:
42-
image: grafana/tempo:1.5.0
42+
image: grafana/tempo:2.1.0
4343
command:
44-
- "-search.enabled=true"
4544
- "-storage.trace.backend=local" # tell tempo where to permanently put traces
4645
- "-storage.trace.local.path=/tmp/tempo/traces"
4746
- "-storage.trace.wal.path=/tmp/tempo/wal" # tell tempo where to store the wal
@@ -60,21 +59,20 @@ services:
6059
ports:
6160
- "9001:9001"
6261

63-
# tracing load generator
64-
synthetic-load-generator:
65-
profiles: [agent] # Should only be run if the Agent is present
66-
image: omnition/synthetic-load-generator:1.0.25
67-
volumes:
68-
- ./load-generator:/etc/load-generator
69-
environment:
70-
- TOPOLOGY_FILE=/etc/load-generator/load-generator.json
71-
- JAEGER_COLLECTOR_URL=http://agent:14268
62+
hotrod:
63+
profiles: [agent]
64+
image: yurishkuro/microsim:latest
65+
ports:
66+
- "8080:8080"
67+
command:
68+
- "-j=http://agent:14268/api/traces"
69+
- "-d=1h"
7270
depends_on:
7371
- agent
7472

7573
#
7674
# Optional Grafana Agent which can collect telemetry and send it to
77-
# Loki/Cortex/Tempo.
75+
# Loki/Mimir/Tempo.
7876
#
7977
# Enable with the "agent" profile.
8078
#
@@ -94,7 +92,7 @@ services:
9492
- -config.enable-read-api
9593
environment:
9694
HOSTNAME: agent
97-
REMOTE_WRITE_HOST: cortex:9009
95+
REMOTE_WRITE_HOST: mimir:9009
9896
LOKI_HOST: loki:3100
9997
TEMPO_HOST: tempo:4317
10098
AVALANCHE_HOST: avalanche:9001
@@ -110,7 +108,7 @@ services:
110108
ports:
111109
- "12345:12345"
112110
depends_on:
113-
- cortex
111+
- mimir
114112
- loki
115113
- tempo
116114

example/docker-compose/grafana/datasources/datasource.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
apiVersion: 1
22

33
deleteDatasources:
4-
- name: Cortex
4+
- name: Mimir
55

66
datasources:
7-
- name: Cortex
7+
- name: Mimir
88
type: prometheus
99
access: proxy
1010
orgId: 1
11-
url: http://cortex:9009/api/prom
11+
url: http://mimir:9009/prometheus
1212
basicAuth: false
1313
isDefault: false
1414
version: 1

0 commit comments

Comments
 (0)