From c69ab99626ecc2f103ac8bf0d5c66c32276b43dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Kut=C3=BD?= <6du1ro.n@gmail.com>
Date: Tue, 16 May 2017 16:14:40 +0200
Subject: [PATCH 1/2] Include collectd_exoporter in the init.

---
 prometheus/init.sls | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/prometheus/init.sls b/prometheus/init.sls
index aac7d25..3454c33 100644
--- a/prometheus/init.sls
+++ b/prometheus/init.sls
@@ -10,4 +10,7 @@ include:
   {%- if pillar.prometheus.pushgateway is defined %}
   - prometheus.pushgateway
   {%- endif %}
+  {%- if pillar.prometheus.collectd_exporter is defined %}
+  - prometheus.collectd_exporter
+  {%- endif %}
 {%- endif %}

From b6af59c7e3cf2045eae6e5c8d9d334547a2c7966 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Kut=C3=BD?= <6du1ro.n@gmail.com>
Date: Tue, 16 May 2017 16:38:40 +0200
Subject: [PATCH 2/2] Fix double for statement.

---
 prometheus/files/alerts.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/prometheus/files/alerts.yml b/prometheus/files/alerts.yml
index 89792bc..97d0dde 100644
--- a/prometheus/files/alerts.yml
+++ b/prometheus/files/alerts.yml
@@ -31,9 +31,6 @@
   {%- if alert.get('enabled', True) %}
     ALERT {{ alertname }}
       IF {{ alert.if }}
-      {%- if alert.for is defined %}
-      FOR {{ alert.for }}
-      {%- endif %}
       {%- if alert.for is defined %}FOR {{ alert.for }}{%- endif %}
       {%- if alert.labels is defined %}
       LABELS {