fix linter errors

roles/grafana/tasks/dashboards.yml

@@ -1,7 +1,7 @@
 ---
 - name: "Create dashboard directory"
   ansible.builtin.file:
-    path: "{{ dashboard_dir }}"
+    path: "{{ grafana_dashboard_dir }}"
     state: directory
     owner: "{{ grafana_user }}"
     group: "{{ grafana_group }}"
@@ -10,7 +10,7 @@
 - name: "Copy dashboard files from source to target"
   ansible.builtin.copy:
     src: "{{ item }}"
-    dest: "{{ dashboard_dir }}/{{ item | basename }}"
+    dest: "{{ grafana_dashboard_dir }}/{{ item | basename }}"
     mode: "0644"
     owner: "{{ grafana_user }}"
     group: "{{ grafana_group }}"
@@ -25,7 +25,7 @@
     state: present
     commit_message: Updated by ansible
     overwrite: false
-    path: "{{ dashboard_dir }}/{{ item | basename }}"
+    path: "{{ grafana_dashboard_dir }}/{{ item | basename }}"
   with_fileglob:
     - "{{ dashboard_source_path }}/*.json"
 

roles/grafana/tasks/datasources.yml

@@ -1,7 +1,7 @@
 ---
 - name: "Create datasource directory"
   ansible.builtin.file:
-    path: "{{ datasource_dir }}"
+    path: "{{ grafana_datasource_dir }}"
     state: directory
     owner: "{{ grafana_user }}"
     group: "{{ grafana_group }}"
@@ -10,7 +10,7 @@
 - name: "Configure | provision datasources for Grafana"
   ansible.builtin.copy:
     src: "{{ datasource_source_path }}/{{ item | basename }}"
-    dest: "{{ datasource_dir }}/{{ item | basename }}"
+    dest: "{{ grafana_datasource_dir }}/{{ item | basename }}"
     owner: "{{ grafana_user }}"
     group: "{{ grafana_group }}"
     mode: "0660"

roles/grafana/tasks/install.yml

@@ -37,9 +37,9 @@
         group: "{{ grafana_group }}"
         mode: '0775'
       with_items:
-        - "{{ log_dir }}"
-        - "{{ data_dir }}"
-        - "{{ plugins_dir }}"
+        - "{{ grafana_log_dir }}"
+        - "{{ grafana_data_dir }}"
+        - "{{ grafana_plugins_dir }}"
 
     - name: "Download Grafana DEB package"
       ansible.builtin.get_url:
@@ -48,12 +48,12 @@
         owner: "{{ grafana_user }}"
         group: "{{ grafana_group }}"
         mode: "0644"
-      register: package_tmp
+      register: grafana_package_tmp
 
     - name: "Install DEB package"
       notify: "(Re)start and enable Grafana"
       ansible.builtin.apt:
-        deb: "{{ package_tmp.dest }}"
+        deb: "{{ grafana_package_tmp.dest }}"
         state: present
         update_cache: true
 

roles/grafana/tasks/plugins.yml

@@ -1,7 +1,7 @@
 ---
 - name: "Create plugin directory"
   ansible.builtin.file:
-    path: "{{ plugins_dir }}"
+    path: "{{ grafana_plugins_dir }}"
     state: directory
     owner: "{{ grafana_user }}"
     group: "{{ grafana_group }}"
@@ -11,6 +11,6 @@
   community.grafana.grafana_plugin:
     name: "{{ plugin.name }}"
     version: "{{ plugin.version }}"
-    grafana_plugins_dir: "{{ plugins_dir }}"
+    grafana_plugins_dir: "{{ grafana_plugins_dir }}"
     state: "{{ plugin.state | default('present') }}"
   notify: "(Re)start and enable Grafana"