chore

gesellix · Dec 4, 2023 · 7c7a33d · 7c7a33d
1 parent de1d86b
commit 7c7a33d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 21 deletions.
diff --git a/examples/grafana/docker-traefik-stack.yml b/examples/grafana/docker-traefik-stack.yml
@@ -187,7 +187,7 @@ services:
         condition: on-failure
 
   prometheus:
-    image: prom/prometheus:v2.13.1
+    image: prom/prometheus:v2.48.0
     volumes:
       - ./prometheus/:/etc/prometheus/
       - prometheus_data:/prometheus
@@ -210,18 +210,18 @@ services:
         condition: on-failure
 
   node-exporter:
-    image: prom/node-exporter
+    image: prom/node-exporter:v1.7.0
     volumes:
       - /proc:/host/proc:ro
       - /sys:/host/sys:ro
       - /:/rootfs:ro
     command:
       - '--path.procfs=/host/proc'
       - '--path.sysfs=/host/sys'
-      - --collector.filesystem.ignored-mount-points
+      - --collector.filesystem.mount-points-exclude
       - "^/(sys|proc|dev|host|etc|rootfs/var/lib/docker/containers|rootfs/var/lib/docker/overlay2|rootfs/run/docker/netns|rootfs/var/lib/docker/aufs)($$|/)"
     ports:
-      - 9100:9100
+      - "9100:9100"
     networks:
       - monitor-net
     deploy:
@@ -230,9 +230,9 @@ services:
         condition: on-failure
 
   alertmanager:
-    image: prom/alertmanager
+    image: prom/alertmanager:v0.26.0
     ports:
-      - 9093:9093
+      - "9093:9093"
     volumes:
       - "./alertmanager/:/etc/alertmanager/"
     networks:
@@ -248,7 +248,7 @@ services:
         condition: on-failure
 
   cadvisor:
-    image: google/cadvisor
+    image: gcr.io/cadvisor/cadvisor
     volumes:
       - /:/rootfs:ro
       - /var/run:/var/run:rw

diff --git a/examples/grafana/prometheus/prometheus.yml b/examples/grafana/prometheus/prometheus.yml
@@ -28,23 +28,13 @@ scrape_configs:
 
   - job_name: 'cadvisor'
     scrape_interval: 5s
-    dns_sd_configs:
-      - names:
-          - 'tasks.cadvisor'
-        type: 'A'
-        port: 8080
-  #    static_configs:
-  #      - targets: ['cadvisor:8080']
+    static_configs:
+      - targets: ['cadvisor:8080']
 
   - job_name: 'node-exporter'
     scrape_interval: 5s
-    dns_sd_configs:
-      - names:
-          - 'tasks.node-exporter'
-        type: 'A'
-        port: 9100
-  #    static_configs:
-  #      - targets: ['node-exporter:9100']
+    static_configs:
+      - targets: ['node-exporter:9100']
 
   - job_name: 'couchdb'
     static_configs: