Merge branch 'master' of github.com:vegasbrianc/prometheus

README.md

@@ -138,5 +138,6 @@ Several projects utilize this Prometheus stack. Here's the list of projects:
 * [GitHub Monitoring](https://github.com/vegasbrianc/github-monitoring) - Monitor your GitHub projects with Prometheus
 * [Traefik Reverse Proxy/Load Balancer Monitoring](https://github.com/vegasbrianc/docker-traefik-prometheus) - Monitor the popular Reverse Proxy/Load Balancer Traefik with Prometheus
 * [internet monitoring](https://github.com/maxandersen/internet-monitoring) - Monitor your local network, internet connection and speed with Prometheus.
+* [Dockerize Your Dev](https://github.com/RiFi2k/dockerize-your-dev) - Docker compose a VM to get LetsEncrypt / NGINX proxy auto provisioning, ELK logging, Prometheus / Grafana monitoring, Portainer GUI, and more...
 
 *Have an intersting Project which use this Repo? Submit yours to the list*

docker-stack.yml

@@ -83,7 +83,7 @@ services:
       mode: global
 
   grafana:
-    image: grafana/grafana
+    image: grafana/grafana:5.4.4
     depends_on:
       - prometheus
     ports:
@@ -96,4 +96,8 @@ services:
     networks:
       - monitor-net
     restart: always
+    deploy:
+      placement:
+        constraints:
+          - node.role==manager
 

prometheus/alert.rules

@@ -2,7 +2,7 @@ groups:
 - name: example
   rules:
 
-  # Alert for any instance that is unreachable for >5 minutes.
+  # Alert for any instance that is unreachable for >2 minutes.
   - alert: service_down
     expr: up == 0
     for: 2m
@@ -19,4 +19,4 @@ groups:
       severity: page
     annotations:
       summary: "Instance {{ $labels.instance }} under high load"
-      description: "{{ $labels.instance }} of job {{ $labels.job }} is under high load."
+      description: "{{ $labels.instance }} of job {{ $labels.job }} is under high load."