From d5ec01ecba8306b2a79dacfb622c9bb3bc1ed72f Mon Sep 17 00:00:00 2001
From: Ryan Cavicchioni <ryan@cavi.cc>
Date: Wed, 31 Aug 2022 20:50:09 -0500
Subject: [PATCH] grafana: sync dashboards from the controller

---
 roles/grafana/defaults/main.yaml |  3 ---
 roles/grafana/tasks/main.yaml    | 17 ++++++++---------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/roles/grafana/defaults/main.yaml b/roles/grafana/defaults/main.yaml
index 4685c2a..0745987 100644
--- a/roles/grafana/defaults/main.yaml
+++ b/roles/grafana/defaults/main.yaml
@@ -38,6 +38,3 @@ grafana_datasources:
 
 grafana_dashboards:
   {}
-
-grafana_dashboard_files:
-  []
diff --git a/roles/grafana/tasks/main.yaml b/roles/grafana/tasks/main.yaml
index 10b71b1..8f573fb 100644
--- a/roles/grafana/tasks/main.yaml
+++ b/roles/grafana/tasks/main.yaml
@@ -55,7 +55,7 @@
 
 - name: provision datasources
   ansible.builtin.copy:
-    dest: "{{ grafana_provisioning_path }}/datasources/datasource.yaml"
+    dest: "{{ grafana_provisioning_path }}/datasources/ansible.yaml"
     content: "{{ grafana_datasources | to_nice_yaml }}"
     owner: root
     group: "{{ grafana_group }}"
@@ -72,7 +72,7 @@
 
 - name: provision dashboards
   ansible.builtin.copy:
-    dest: "{{ grafana_provisioning_path }}/dashboards/dashboards.yaml"
+    dest: "{{ grafana_provisioning_path }}/dashboards/ansible.yaml"
     content: "{{ grafana_dashboards | to_nice_yaml }}"
     owner: root
     group: "{{ grafana_group }}"
@@ -80,13 +80,12 @@
   notify: restart grafana
 
 - name: upload user dashboards
-  ansible.builtin.copy:
-    src: "files/grafana/dashboards/{{ item }}"
-    dest: "/var/lib/grafana/dashboards/{{ item | basename }}"
-    owner: "{{ grafana_user }}"
-    group: "{{ grafana_group }}"
-    mode: 0644
-  loop: "{{ grafana_dashboard_files | default([]) }}"
+  ansible.posix.synchronize:
+    src: "{{ grafana_user_dashboard_path }}"
+    dest: "{{ grafana_dashboard_path }}/"
+    owner: false
+    group: false
+    delete: true
   notify: restart grafana
 
 - name: manage service