From: Zack Cerza <zack@redhat.com>
Date: Mon, 26 Jun 2017 22:25:35 +0000 (-0600)
Subject: Replace dashboards by default when updating
X-Git-Tag: v1.0~63^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=63c022c32faded1dd361ec2769599350e003f9c8;p=cephmetrics.git

Replace dashboards by default when updating

This behavior can be disabled by setting 'replace_dashboards' to False

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 ca033bb..34a2fdd 100644
--- a/ansible/roles/ceph-grafana/defaults/main.yml
+++ b/ansible/roles/ceph-grafana/defaults/main.yml
@@ -2,6 +2,7 @@
 containerized_deployment: false
 use_epel: false
 devel_mode: true
+replace_dashboards: true
 graphite:
   port: "{{ graphite_port | default('8080') }}"
   user: admin
diff --git a/ansible/roles/ceph-grafana/tasks/configure_grafana.yml b/ansible/roles/ceph-grafana/tasks/configure_grafana.yml
index 635668c..8099dd4 100644
--- a/ansible/roles/ceph-grafana/tasks/configure_grafana.yml
+++ b/ansible/roles/ceph-grafana/tasks/configure_grafana.yml
@@ -103,10 +103,18 @@
     src: dashboard.yml
     dest: /tmp/dashboard.yml
 
-- name: Push dashboards to Grafana
-  command: python /tmp/dashUpdater.py -c /tmp/dashboard.yml -D /tmp/dashboards
+- set_fact:
+    dashupdate_cmd: "python /tmp/dashUpdater.py"
+    dashboard_dir: "/tmp/dashboards"
   when: devel_mode
 
-- name: Push dashboards to Grafana
-  command: /usr/libexec/cephmetrics/dashUpdater.py -c /tmp/dashboard.yml -D /usr/share/cephmetrics/dashboards
+- set_fact:
+    dashupdate_cmd: "/usr/libexec/cephmetrics/dashUpdater.py"
+    dashboard_dir: "/usr/share/cephmetrics/dashboards"
   when: not devel_mode
+
+- set_fact:
+    dashupdate_mode: "{{ 'refresh' if replace_dashboards else 'update' }}"
+
+- name: Push dashboards to Grafana
+  command: "{{ dashupdate_cmd }} -m {{ dashupdate_mode }} -c /tmp/dashboard.yml -D {{ dashboard_dir }}"