roles/grafana/defaults/main.yaml

@@ -8,8 +8,6 @@ grafana_service_state: started
 grafana_service_enabled: true
 
 grafana_etc_path: /etc/grafana
-grafana_var_path: /var/lib/grafana
-grafana_dashboard_path: "{{ grafana_var_path }}/dashboards"
 grafana_config_path: "{{ grafana_etc_path }}/grafana.ini"
 grafana_provisioning_path: /etc/grafana/provisioning
 
@@ -30,11 +28,11 @@ grafana_ssl_certificate: "/etc/letsencrypt/live/{{ grafana_domain }}/fullchain.p
 grafana_ssl_certificate_key: "/etc/letsencrypt/live/{{ grafana_domain }}/privkey.pem"
 # grafana_ssl_dhparam: "/etc/letsencrypt/ssl-dhparams.pem"
 
-
-grafana_user_dashboard_path: files/grafana/dashboards/
-
 grafana_datasources:
   {}
 
 grafana_dashboards:
   {}
+
+grafana_dashboard_files:
+  []

roles/grafana/tasks/main.yaml

@@ -55,7 +55,7 @@
 
 - name: provision datasources
   ansible.builtin.copy:
-    dest: "{{ grafana_provisioning_path }}/datasources/ansible.yaml"
+    dest: "{{ grafana_provisioning_path }}/datasources/datasource.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/ansible.yaml"
+    dest: "{{ grafana_provisioning_path }}/dashboards/dashboards.yaml"
     content: "{{ grafana_dashboards | to_nice_yaml }}"
     owner: root
     group: "{{ grafana_group }}"
@@ -80,12 +80,13 @@
   notify: restart grafana
 
 - name: upload user dashboards
-  ansible.posix.synchronize:
-    src: "{{ grafana_user_dashboard_path }}"
-    dest: "{{ grafana_dashboard_path }}/"
-    owner: false
-    group: false
-    delete: true
+  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([]) }}"
   notify: restart grafana
 
 - name: manage service