Merge pull request #10 from TouchInstinct/feature/grafana.parameters

grafana: ajust parameters

monitoring.grafana/defaults/main.yml

@@ -11,3 +11,7 @@ grafana__default_labels:
   "traefik.docker.network": "{{ docker__traefik_network }}"
   "traefik.frontend.rule": "Host:{{ grafana.domain }}"
   "traefik.frontend.entryPoints": "http"
+
+grafana__ldap_enabled: "{{ grafana.ldap is defined and grafana.ldap.enable | default(false) | bool }}"
+grafana__anonymous_enabled: "{{ grafana.anonymous is defined and grafana.anonymous.enable | default(false) | bool }}"
+grafana__anonymous_org_role: "Viewer"

monitoring.grafana/tasks/main.yml

@@ -29,7 +29,7 @@
     - ldap.toml
   become_user: "{{ docker_deployment__deploy_user_name }}"
   become: yes
-  when: grafana.ldap is defined and grafana.ldap.enable is defined and grafana.ldap.enable | bool
+  when: grafana__ldap_enabled
   tags:
     - files
     - grafana

monitoring.grafana/templates/docker-compose.yml.j2

@@ -8,10 +8,12 @@ services:
     environment:
       GF_SERVER_DOMAIN: "{{ grafana.domain }}"
       GF_SERVER_ROOT_URL: "http://{{ grafana.domain }}"
-      GF_AUTH_LDAP_ENABLED: "{{ grafana.ldap is defined and grafana.ldap.enable | default(false) }}"
+      GF_AUTH_LDAP_ENABLED: "{{ grafana__ldap_enabled }}"
+      GF_AUTH_ANONYMOUS_ENABLED: "{{ grafana__anonymous_enabled }}"
+      GF_AUTH_ANONYMOUS_ORG_ROLE: "{{ grafana__anonymous_org_role }}"
     volumes:
       - "{{ docker_deployment__volume_path }}:/var/lib/grafana"
-{% if grafana.ldap is defined  and grafana.ldap.enable is defined and grafana.ldap.enable | bool %}
+{% if grafana__ldap_enabled %}
       - "./ldap.toml:/etc/grafana/ldap.toml"
 {% endif %}
     labels: {{ grafana.docker.labels | default(grafana__default_labels) | to_json }}

monitoring.grafana/templates/ldap.toml.j2

@@ -1,3 +1,4 @@
+{% if grafana__ldap_enabled %}
 [[servers]]
 host = "{{ ldap__host }}"
 port = {{ ldap__port }}
@@ -26,3 +27,4 @@ surname = "sn"
 username = "uid"
 member_of = "memberOf"
 email = "mail"
+{% endif %}