From 63b6addccd68b79ff86fd495be842e5139f8d2bd Mon Sep 17 00:00:00 2001
From: Stefan Prodan <stefan.prodan@gmail.com>
Date: Wed, 14 Nov 2018 09:52:21 +0200
Subject: [PATCH] Update Prometheus to v2.5.0

---
 .travis.yml             | 16 ++++++++--------
 alertmanager/Dockerfile |  2 +-
 docker-compose.yml      |  7 +------
 grafana/Dockerfile      |  2 +-
 prometheus/Dockerfile   |  6 ++----
 5 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a6b828b..d936667 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,12 +21,12 @@ after_success:
       echo "PR build, skipping Docker Hub push";
     else
     docker login -u "$DOCKER_USER" -p "$DOCKER_PASS";
-    docker tag stefanprodan/swarmprom-prometheus:$TRAVIS_BUILD_NUMBER stefanprodan/swarmprom-prometheus:v2.2.0-rc.0;
-    docker push stefanprodan/swarmprom-prometheus:v2.2.0-rc.0;
-    docker tag stefanprodan/swarmprom-node-exporter:$TRAVIS_BUILD_NUMBER stefanprodan/swarmprom-node-exporter:v0.15.2;
-    docker push stefanprodan/swarmprom-node-exporter:v0.15.2;
-    docker tag stefanprodan/swarmprom-alertmanager:$TRAVIS_BUILD_NUMBER stefanprodan/swarmprom-alertmanager:v0.14.0;
-    docker push stefanprodan/swarmprom-alertmanager:v0.14.0;
-    docker tag stefanprodan/swarmprom-grafana:$TRAVIS_BUILD_NUMBER stefanprodan/swarmprom-grafana:5.0.1;
-    docker push stefanprodan/swarmprom-grafana:5.0.1;
+    docker tag stefanprodan/swarmprom-prometheus:$TRAVIS_BUILD_NUMBER stefanprodan/swarmprom-prometheus:v2.5.0;
+    docker push stefanprodan/swarmprom-prometheus:v2.5.0;
+    docker tag stefanprodan/swarmprom-node-exporter:$TRAVIS_BUILD_NUMBER stefanprodan/swarmprom-node-exporter:v0.16.0;
+    docker push stefanprodan/swarmprom-node-exporter:v0.16.0;
+    docker tag stefanprodan/swarmprom-alertmanager:$TRAVIS_BUILD_NUMBER stefanprodan/swarmprom-alertmanager:v0.15.3;
+    docker push stefanprodan/swarmprom-alertmanager:v0.15.3;
+    docker tag stefanprodan/swarmprom-grafana:$TRAVIS_BUILD_NUMBER stefanprodan/swarmprom-grafana:5.3.4;
+    docker push stefanprodan/swarmprom-grafana:5.3.4;
     fi
diff --git a/alertmanager/Dockerfile b/alertmanager/Dockerfile
index fde35ac..972598d 100644
--- a/alertmanager/Dockerfile
+++ b/alertmanager/Dockerfile
@@ -1,4 +1,4 @@
-FROM prom/alertmanager:v0.14.0
+FROM prom/alertmanager:v0.15.3
 
 COPY conf /etc/alertmanager/
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 12d0521..c620525 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -137,9 +137,6 @@ services:
       - '--path.procfs=/host/proc'
       - '--collector.textfile.directory=/etc/node-exporter/'
       - '--collector.filesystem.ignored-mount-points=^/(sys|proc|dev|host|etc)($$|/)'
-      # no collectors are explicitely enabled here, because the defaults are just fine,
-      # see https://github.com/prometheus/node_exporter
-      # disable ipvs collector because it barfs the node-exporter logs full with errors on my centos 7 vm's
       - '--no-collector.ipvs'
     deploy:
       mode: global
@@ -150,13 +147,11 @@ services:
           memory: 64M
 
   prometheus:
-    image: stefanprodan/swarmprom-prometheus:v2.2.0-rc.0
+    image: stefanprodan/swarmprom-prometheus:v2.5.0
     networks:
       - net
     command:
       - '--config.file=/etc/prometheus/prometheus.yml'
-      - '--web.console.libraries=/etc/prometheus/console_libraries'
-      - '--web.console.templates=/etc/prometheus/consoles'
       - '--storage.tsdb.path=/prometheus'
       - '--storage.tsdb.retention=24h'
     volumes:
diff --git a/grafana/Dockerfile b/grafana/Dockerfile
index 6353967..1e6d7df 100644
--- a/grafana/Dockerfile
+++ b/grafana/Dockerfile
@@ -1,4 +1,4 @@
-FROM grafana/grafana:5.1.0
+FROM grafana/grafana:5.3.4
 # https://hub.docker.com/r/grafana/grafana/tags/
 
 COPY datasources /etc/grafana/provisioning/datasources/
diff --git a/prometheus/Dockerfile b/prometheus/Dockerfile
index 81542b8..cb31a08 100644
--- a/prometheus/Dockerfile
+++ b/prometheus/Dockerfile
@@ -1,4 +1,4 @@
-FROM prom/prometheus:v2.2.0-rc.0
+FROM prom/prometheus:v2.5.0
 # https://hub.docker.com/r/prom/prometheus/tags/
 
 ENV WEAVE_TOKEN=none
@@ -7,6 +7,4 @@ COPY conf /etc/prometheus/
 
 ENTRYPOINT [ "/etc/prometheus/docker-entrypoint.sh" ]
 CMD        [ "--config.file=/etc/prometheus/prometheus.yml", \
-             "--storage.tsdb.path=/prometheus", \
-             "--web.console.libraries=/etc/prometheus/console_libraries", \
-             "--web.console.templates=/etc/prometheus/consoles" ]
+             "--storage.tsdb.path=/prometheus" ]