Merge pull request #38 from cloudalchemy/alerts

change alert rules name; take rules from wildcard
cloudalchemy · Dec 27, 2017 · af0becf · af0becf
2 parents b5361bf + 11062c2
commit af0becf
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/tasks/configure.yml b/tasks/configure.yml
@@ -2,7 +2,7 @@
 - name: alerting rules file
   template:
     src: "alert.rules.j2"
-    dest: "{{ prometheus_config_dir }}/rules/alert.rules"
+    dest: "{{ prometheus_config_dir }}/rules/basic.rules"
     owner: prometheus
     group: prometheus
     mode: 0644

diff --git a/templates/alert.rules.j2 b/templates/alert.rules.j2
@@ -1,7 +1,7 @@
 # {{ ansible_managed }}
 {% if prometheus_version | version_compare('2.0.0', '>=') %}
 groups:
-- name: /etc/prometheus/rules/alert.rules
+- name: ansible managed alert rules
   rules:
   {{ prometheus_alert_rules | to_nice_yaml(indent=2) | indent(2,False) }}
 {% else %}

diff --git a/templates/prometheus.yml.j2 b/templates/prometheus.yml.j2
@@ -9,7 +9,7 @@ global:
 
 {% if prometheus_alertmanager_config != [] and prometheus_alert_rules != [] %}
 rule_files:
-  - {{ prometheus_config_dir }}/rules/alert.rules
+  - {{ prometheus_config_dir }}/rules/*.rules
 {% endif %}
 
 {% if prometheus_alertmanager_config | length > 0 %}

diff --git a/tests/test_default.py b/tests/test_default.py
@@ -21,6 +21,7 @@ def test_directories(host):
 def test_files(host):
     present = [
         "/etc/prometheus/prometheus.yml",
+        "/etc/prometheus/rules/basic.rules",
         "/etc/systemd/system/prometheus.service",
         "/opt/prometheus/prometheus",
         "/opt/prometheus/promtool"