[grafana] Re-enable Grafana, fix logo deployment

Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>

group_vars/grafana.yml

@@ -1,7 +1,13 @@
 ---
 glob_grafana:
   root_url: https://grafana.crans.org
-  icon: crans_icon_white.svg
   ldap_base: "{{ glob_ldap.base }}"
   ldap_master_ipv4: "{{ glob_ldap.servers[0] }}"
   ldap_user_tree: "ou=passwd,{{ glob_ldap.base }}"
+
+logos:
+  - which: crans_logo_white_small.svg
+    where: /usr/share/grafana/public/img/grafana_icon.svg
+    owner: root
+    group: root
+    mode: '0644'

plays/monitoring.yml

@@ -14,12 +14,12 @@
     - prometheus-snmp-exporter
     - ninjabot
 
-# # Deploy Grafana on monitoring server
+# Deploy Grafana on monitoring server
-# - hosts: grafana
+- hosts: grafana
-#   vars:
+  vars:
-#     grafana: "{{ glob_grafana | default({}) | combine(loc_grafana | default({})) }}"
+    grafana: "{{ glob_grafana | default({}) | combine(loc_grafana | default({})) }}"
-#   roles:
+  roles:
-#     - grafana
+    - grafana
 
 - hosts: blackbox
   roles:

roles/grafana/tasks/main.yml

@@ -78,14 +78,6 @@
     mode: 0640
   notify: Restart grafana
 
-- name: Change grafana logo
-  copy:
-    src: "{{ grafana.icon }}"
-    dest: /usr/share/grafana/public/img/grafana_icon.svg
-    owner: root
-    group: root
-    mode: 0664
-
 - name: Enable and start Grafana
   systemd:
     name: grafana-server