Skip to content

Commit b4a28a6

Browse files
committed
chore
1 parent 15bc86a commit b4a28a6

File tree

2 files changed

+11
-21
lines changed

2 files changed

+11
-21
lines changed

examples/grafana/docker-traefik-stack.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ services:
187187
condition: on-failure
188188

189189
prometheus:
190-
image: prom/prometheus:v2.13.1
190+
image: prom/prometheus:v2.48.0
191191
volumes:
192192
- ./prometheus/:/etc/prometheus/
193193
- prometheus_data:/prometheus
@@ -210,18 +210,18 @@ services:
210210
condition: on-failure
211211

212212
node-exporter:
213-
image: prom/node-exporter
213+
image: prom/node-exporter:v1.7.0
214214
volumes:
215215
- /proc:/host/proc:ro
216216
- /sys:/host/sys:ro
217217
- /:/rootfs:ro
218218
command:
219219
- '--path.procfs=/host/proc'
220220
- '--path.sysfs=/host/sys'
221-
- --collector.filesystem.ignored-mount-points
221+
- --collector.filesystem.mount-points-exclude
222222
- "^/(sys|proc|dev|host|etc|rootfs/var/lib/docker/containers|rootfs/var/lib/docker/overlay2|rootfs/run/docker/netns|rootfs/var/lib/docker/aufs)($$|/)"
223223
ports:
224-
- 9100:9100
224+
- "9100:9100"
225225
networks:
226226
- monitor-net
227227
deploy:
@@ -230,9 +230,9 @@ services:
230230
condition: on-failure
231231

232232
alertmanager:
233-
image: prom/alertmanager
233+
image: prom/alertmanager:v0.26.0
234234
ports:
235-
- 9093:9093
235+
- "9093:9093"
236236
volumes:
237237
- "./alertmanager/:/etc/alertmanager/"
238238
networks:
@@ -248,7 +248,7 @@ services:
248248
condition: on-failure
249249

250250
cadvisor:
251-
image: google/cadvisor
251+
image: gcr.io/cadvisor/cadvisor
252252
volumes:
253253
- /:/rootfs:ro
254254
- /var/run:/var/run:rw

examples/grafana/prometheus/prometheus.yml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,13 @@ scrape_configs:
2828

2929
- job_name: 'cadvisor'
3030
scrape_interval: 5s
31-
dns_sd_configs:
32-
- names:
33-
- 'tasks.cadvisor'
34-
type: 'A'
35-
port: 8080
36-
# static_configs:
37-
# - targets: ['cadvisor:8080']
31+
static_configs:
32+
- targets: ['cadvisor:8080']
3833

3934
- job_name: 'node-exporter'
4035
scrape_interval: 5s
41-
dns_sd_configs:
42-
- names:
43-
- 'tasks.node-exporter'
44-
type: 'A'
45-
port: 9100
46-
# static_configs:
47-
# - targets: ['node-exporter:9100']
36+
static_configs:
37+
- targets: ['node-exporter:9100']
4838

4939
- job_name: 'couchdb'
5040
static_configs:

0 commit comments

Comments
 (0)