Updating to Prometheus v1.7.1

Updated versions in stack
bvis · Aug 12, 2017 · bed56ef · bed56ef
1 parent 5523c5c
commit bed56ef
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM prom/prometheus:v1.6.3
+FROM prom/prometheus:v1.7.1
 
 ARG "version=0.1.0-dev"
 ARG "build_date=unknown"

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,7 +5,7 @@ networks:
 
 services:
   cadvisor:
-    image: google/cadvisor:${CADVISOR_VERSION:-v0.25.0}
+    image: google/cadvisor:${CADVISOR_VERSION:-v0.26.1}
     networks:
       - monitoring
     volumes:
@@ -25,14 +25,15 @@ services:
           memory: 64M
 
   node-exporter:
-    image: basi/node-exporter:${NODE_EXPORTER_VERSION:-v1.13.0}
+    image: basi/node-exporter:${NODE_EXPORTER_VERSION:-latest}
     networks:
       - monitoring
     volumes:
       - /proc:/host/proc
       - /sys:/host/sys
       - /:/rootfs
       - /etc/hostname:/etc/host_hostname
+    hostname: "{{.Node.ID}}"
     environment:
       HOST_HOSTNAME: /etc/host_hostname
     command: -collector.procfs "/host/proc" -collector.sysfs /host/sys -collector.textfile.directory /etc/node-exporter/ -collectors.enabled 'conntrack,diskstats,entropy,filefd,filesystem,loadavg,mdadm,meminfo,netdev,netstat,stat,textfile,time,vmstat,ipvs' -collector.filesystem.ignored-mount-points "^/(sys|proc|dev|host|etc)($$|/)"
@@ -61,7 +62,7 @@ services:
           memory: 4M
 
   alertmanager:
-    image: basi/alertmanager:${ALERTMANAGER_VERSION:-v0.1.0}
+    image: basi/alertmanager:${ALERTMANAGER_VERSION:-v0.8.0}
     networks:
       - monitoring
       # - logging
@@ -83,7 +84,7 @@ services:
           memory: 16M
 
   prometheus:
-    image: basi/prometheus-swarm:${PROMETHEUS_SWARM_VERSION:-v0.4.3}
+    image: basi/prometheus-swarm:${PROMETHEUS_SWARM_VERSION:-v1.7.1}
     ports:
       - "9090"
     networks:
@@ -101,7 +102,7 @@ services:
           memory: 128M
 
   grafana:
-    image: basi/grafana:${GRAFANA_VERSION:-v4.1.1}
+    image: basi/grafana:${GRAFANA_VERSION:-v4.4.3}
     ports:
       - "3000:3000"
     networks:

diff --git a/rootfs/etc/prometheus/prometheus.yml b/rootfs/etc/prometheus/prometheus.yml
@@ -2,10 +2,6 @@ global:
   scrape_interval:     30s
   evaluation_interval: 30s
 
-  labels:
-    cluster: swarm
-    replica: "1"
-
   # Attach these labels to any time series or alerts when communicating with
   # external systems (federation, remote storage, Alertmanager).
   external_labels: