From: Zack Cerza <zack@redhat.com>
Date: Thu, 20 Jul 2017 20:42:07 +0000 (-0700)
Subject: Move Grafana configuration defaults
X-Git-Tag: v1.0~39^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8e38aee16e89d8ed0d6eb542395e264ba5377d5a;p=cephmetrics.git

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 48caca2..b1d6ea5 100644
--- 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 d920092..edaf5ac 100644
--- 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 }}"