Move Grafana configuration defaults

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/ansible/roles/ceph-grafana/defaults/main.yml b/ansible/roles/ceph-grafana/defaults/main.yml
index 48caca26b2869f03a4560fb257e4be343246d174..b1d6ea5b2ea1e34cfed7d171ea9847c5152a5cf9 100644 (file)
--- a/ansible/roles/ceph-grafana/defaults/main.yml
+++ b/ansible/roles/ceph-grafana/defaults/main.yml
@@ -9,11 +9,12 @@ graphite:
   api_port: 8888
   user: admin
   password: admin
-  grafana_name: Local
   # The unix account running the graphite-web process
   unix_user:
     yum: apache
     apt: _graphite
+grafana:
+  datasource: Local
 carbon:
   unix_user:
     yum: carbon

diff --git a/ansible/roles/ceph-grafana/tasks/configure_grafana.yml b/ansible/roles/ceph-grafana/tasks/configure_grafana.yml
index d920092dc55ade64b9344d03cf379648fbe08887..edaf5ac8f1ae8292dd9ade60a721cec2e77198b5 100644 (file)
--- a/ansible/roles/ceph-grafana/tasks/configure_grafana.yml
+++ b/ansible/roles/ceph-grafana/tasks/configure_grafana.yml
@@ -43,7 +43,7 @@
   set_fact:
     grafana_data_source: >
       {
-        "name":"{{ graphite.grafana_name }}",
+        "name":"{{ grafana.datasource }}",
         "type":"graphite",
         "url":"http://localhost:{{ graphite.web_port if graphite.service == 'graphite-web' else graphite.api_port }}",
         "access":"proxy",
@@ -67,7 +67,7 @@
 
 - name: Get datasource ID
   uri:
-    url: "http://localhost:3000/api/datasources/id/{{ graphite.grafana_name }}"
+    url: "http://localhost:3000/api/datasources/id/{{ grafana.datasource }}"
     method: GET
     user: "{{ graphite.user }}"
     password: "{{ graphite.password }}"