Allow alert resource provisioning (#110)

grafana · Sep 27, 2023 · dfc6f6f · dfc6f6f
1 parent d80fd5a
commit dfc6f6f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/roles/grafana/defaults/main.yml b/roles/grafana/defaults/main.yml
@@ -240,6 +240,9 @@ grafana_alert_notifications: []
 #    settings:
 #      addresses: "[email protected]"
 
+# Alert resources channels to configure
+grafana_alert_resources: {}
+
 # Datasources to configure
 grafana_datasources: []
 #  - name: "Prometheus"

diff --git a/roles/grafana/tasks/main.yml b/roles/grafana/tasks/main.yml
@@ -105,7 +105,7 @@
         - grafana_configure
         - grafana_notifications
         - grafana_run
-  when: "grafana_alert_notifications | length > 0"
+  when: "grafana_alert_notifications | length > 0 or grafana_alert_resources | length > 0"
 
 - name: Dashboards
   ansible.builtin.include_tasks:

diff --git a/roles/grafana/tasks/notifications.yml b/roles/grafana/tasks/notifications.yml
@@ -1,13 +1,28 @@
 ---
+# legacy config
 - name: "Create/Delete/Update alert notifications channels (provisioning)"
   ansible.builtin.copy:
     content: |
       apiVersion: 1
       {{ grafana_alert_notifications | to_nice_yaml }}
-    dest: /etc/grafana/provisioning/notifiers/ansible.yml
+    dest: /etc/grafana/provisioning/notification/ansible.yml
     owner: root
     group: grafana
     mode: 0640
   become: true
   notify: restart_grafana
-  when: grafana_use_provisioning
+  when: grafana_use_provisioning and grafana_alert_notifications | length > 0
+
+# new alert resources
+- name: "Create/Delete/Update alert resources (provisioning)"
+  ansible.builtin.copy:
+    content: |
+      apiVersion: 1
+      {{ grafana_alert_resources | to_nice_yaml }}
+    dest: /etc/grafana/provisioning/alerting/ansible.yml
+    owner: root
+    group: grafana
+    mode: 0640
+  become: true
+  notify: restart_grafana
+  when: grafana_use_provisioning and grafana_alert_resources | length > 0