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 ca033bbc6b618ac28eae4b3ceb13aecd6c4240ec..34a2fdd54f6307686d6d5d28fb78f1bd7747d875 100644 (file)
--- 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 635668c1dcf908bab215d9a73dbc0c5e66324d18..8099dd4d24d919df01eb62fca3ccedd4e24c60f2 100644 (file)
--- 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 }}"