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 { 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 %}