Merge branch 'master' of github.com:blasebast/monitoring-grafana-influxdb-telegraf-prometheus

2018-06-17 13:12:23 +02:00
parent b6bc290f99 2e3d4e8e61
commit 50da5b4f55
7 changed files with 3764 additions and 6 deletions
--- a/prometheus/prometheus.yml
+++ b/prometheus/prometheus.yml
@ -36,3 +36,10 @@ scrape_configs:
    scrape_interval: "15s"
    static_configs:
      - targets: ['cadvisor:8080']
+
+alerting:
+  alertmanagers:
+  - scheme: http
+    static_configs:
+    - targets:
+      - "alertmanager:9093"