diff --git a/group_vars/grafana.yml b/group_vars/grafana.yml index 1cb40d06..254405df 100644 --- a/group_vars/grafana.yml +++ b/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' diff --git a/plays/monitoring.yml b/plays/monitoring.yml index 1272ed10..d3f28f31 100755 --- a/plays/monitoring.yml +++ b/plays/monitoring.yml @@ -14,12 +14,12 @@ - prometheus-snmp-exporter - ninjabot -# # Deploy Grafana on monitoring server -# - hosts: grafana -# vars: -# grafana: "{{ glob_grafana | default({}) | combine(loc_grafana | default({})) }}" -# roles: -# - grafana +# Deploy Grafana on monitoring server +- hosts: grafana + vars: + grafana: "{{ glob_grafana | default({}) | combine(loc_grafana | default({})) }}" + roles: + - grafana - hosts: blackbox roles: diff --git a/roles/grafana/tasks/main.yml b/roles/grafana/tasks/main.yml index 5c1649ba..d8ed839f 100644 --- a/roles/grafana/tasks/main.yml +++ b/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 diff --git a/roles/logos/files/crans_logo_dark_small.png b/roles/logos/files/crans_logo_dark_small.png new file mode 100644 index 00000000..e76701b6 Binary files /dev/null and b/roles/logos/files/crans_logo_dark_small.png differ diff --git a/roles/logos/files/crans_logo_dark_small.svg b/roles/logos/files/crans_logo_dark_small.svg new file mode 100644 index 00000000..ddff89f7 --- /dev/null +++ b/roles/logos/files/crans_logo_dark_small.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/roles/logos/files/crans_logo_white_small.png b/roles/logos/files/crans_logo_white_small.png new file mode 100644 index 00000000..6bc1fc9b Binary files /dev/null and b/roles/logos/files/crans_logo_white_small.png differ diff --git a/roles/logos/files/crans_logo_white_small.svg b/roles/logos/files/crans_logo_white_small.svg new file mode 100644 index 00000000..0556b119 --- /dev/null +++ b/roles/logos/files/crans_logo_white_small.svg @@ -0,0 +1,7 @@ + + + + + + +