Merge pull request 'merge dev to master' (#2) from dev into master

Reviewed-on: jhummel/monitoring-grafana-influxdb-telegraf-prometheus#2

alertmanager/config.yml

@@ -5,6 +5,6 @@ receivers:
     - name: 'slack'
       slack_configs:
           - send_resolved: true
-            username: 'sebastian.blasaik'
+            username: 'yourusername'
             channel: '#channel_name'
             api_url: 'https://hooks.slack.com/services/'

deploy_all.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+#  Deployment Script for docker and all containers
+
 NC='\033[0m'
 
 RED='\033[00;31m'

undeploy_all.sh

@@ -1,4 +1,7 @@
 # START docker-compose
+
+# Undeploy docker and containers
+
 do_cleanup () {
 	docker-compose down