From 32fd4d40d7b5ebf0b722527bede0d9bef6824c21 Mon Sep 17 00:00:00 2001
From: seba <sebastian.blasiak@gmail.com>
Date: Sun, 17 Jun 2018 13:20:33 +0200
Subject: [PATCH] dashboards are working now

---
 deploy_all.sh      |  6 ++++--
 docker-compose.yml | 32 ++++++++++++++++++++++++--------
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/deploy_all.sh b/deploy_all.sh
index c154daf..c9513e5 100755
--- a/deploy_all.sh
+++ b/deploy_all.sh
@@ -82,8 +82,8 @@ docker exec -it -u 0 grafana /var/lib/grafana/ds/add_dashboards.sh
 
 ## NOW LET'S SECURE GRAFANA
 # CHECKING OUT ORIGINAL FILE
-echo -e "checking out original docker-compose.yml"
-git checkout docker-compose.yml
+#echo -e "checking out original docker-compose.yml"
+#git checkout docker-compose.yml
 
 ## STOPPING and REMOVING GRAFANA CONTAINER
 echo -e "stopping & removing grafana container"
@@ -95,3 +95,5 @@ docker rm $container_id
 echo -e "changing http to https"
 sed -i 's/GF_SERVER_PROTOCOL: "http"/GF_SERVER_PROTOCOL: "https"/g' docker-compose.yml
 docker-compose up -d grafana
+echo -e "reverting: changing https to http"
+sed -i 's/GF_SERVER_PROTOCOL: "https"/GF_SERVER_PROTOCOL: "http"/g' docker-compose.yml
diff --git a/docker-compose.yml b/docker-compose.yml
index ecc1b94..b5a5710 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -89,23 +89,39 @@ services:
       - private
     environment:
       DOGSNAME:      "GULA,BODKA"
-    command:
-      - "--collectors.enabled=textfile"
-      - "--collector.textfile.directory=/var/lib/node_exporter/textfile_collector/"
     expose:
       - 9100
     ports:
       - 9101:9100
+
   cadvisor:
-    image: google/cadvisor
+    image: google/cadvisor:v0.28.3
+    container_name: cadvisor
     volumes:
       - /:/rootfs:ro
       - /var/run:/var/run:rw
       - /sys:/sys:ro
       - /var/lib/docker/:/var/lib/docker:ro
-    ports:
-      - 18080:8080
+      #- /cgroup:/cgroup:ro #doesn't work on MacOS only for Linux
+    restart: unless-stopped
+    expose:
+      - 8080
     networks:
-      - private 
+      - private
       - public
-    restart: unless-stopped 
+    labels:
+      org.label-schema.group: "monitoring"
+
+  alertmanager:
+    image: prom/alertmanager
+    container_name: alertmanager
+    ports:
+      - 9093:9093
+    volumes:
+      - ./alertmanager/:/etc/alertmanager/
+    networks:
+      - private
+    restart: unless-stopped
+    command:
+      - '--config.file=/etc/alertmanager/config.yml'
+      - '--storage.path=/alertmanager'