fixed versions and small bugs

vegasbrianc · Jun 21, 2022 · a471a24 · a471a24
1 parent 24f0b36
commit a471a24
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -11,7 +11,7 @@ networks:
 services:
 
   prometheus:
-    image: prom/prometheus:v2.1.0
+    image: prom/prometheus:v2.36.2
     volumes:
       - ./prometheus/:/etc/prometheus/
       - prometheus_data:/prometheus
@@ -38,12 +38,14 @@ services:
 #          - node.hostname == ${HOSTNAME}
 
   node-exporter:
-    image: prom/node-exporter
+    image: quay.io/prometheus/node-exporter:latest
     volumes:
       - /proc:/host/proc:ro
       - /sys:/host/sys:ro
       - /:/rootfs:ro
+      - /:/host:ro,rslave
     command: 
+      - '--path.rootfs=/host'
       - '--path.procfs=/host/proc' 
       - '--path.sysfs=/host/sys'
       - --collector.filesystem.ignored-mount-points

diff --git a/docker-stack.yml b/docker-stack.yml
@@ -10,7 +10,7 @@ networks:
 services:
 
   prometheus:
-    image: prom/prometheus
+    image: prom/prometheus:v2.36.2
     volumes:
       - ./prometheus/:/etc/prometheus/
       - prometheus_data:/prometheus
@@ -36,7 +36,7 @@ services:
         condition: on-failure
 
   node-exporter:
-    image: prom/node-exporter
+    image: quay.io/prometheus/node-exporter:latest
     volumes:
       - /proc:/host/proc:ro
       - /sys:/host/sys:ro

diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml
@@ -31,7 +31,7 @@ scrape_configs:
   - job_name: 'prometheus'
 
     # Override the global default and scrape targets from this job every 5 seconds.
-    scrape_interval: 5s
+    scrape_interval: 15s
 
     static_configs:
          - targets: ['localhost:9090']
@@ -40,7 +40,7 @@ scrape_configs:
   - job_name: 'cadvisor'
 
     # Override the global default and scrape targets from this job every 5 seconds.
-    scrape_interval: 5s
+    scrape_interval: 15s
 
     dns_sd_configs:
     - names:
@@ -54,8 +54,8 @@ scrape_configs:
   - job_name: 'node-exporter'
 
     # Override the global default and scrape targets from this job every 5 seconds.
-    scrape_interval: 5s
-
+    scrape_interval: 15s
+  
     dns_sd_configs:
     - names:
       - 'tasks.node-exporter'