From: Dimitri Savineau Date: Tue, 27 Jul 2021 14:55:05 +0000 (-0400) Subject: ceph-defaults: update grafana dashboards source X-Git-Tag: v6.0.14~23 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=877b99b17e58feb7d5280b036db99d8ee240856b;p=ceph-ansible.git ceph-defaults: update grafana dashboards source We currently download the grafana dashboars from the ceph@master branch for all ceph releases. We should use the right ceph branch according to the ceph release. Signed-off-by: Dimitri Savineau --- diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index b2a57e5a4..6044216e7 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -680,7 +680,7 @@ dummy: #grafana_uid: 472 #grafana_datasource: Dashboard #grafana_dashboards_path: "/etc/grafana/dashboards/ceph-dashboard" -#grafana_dashboard_version: master +#grafana_dashboard_version: pacific #grafana_dashboard_files: # - ceph-cluster.json # - cephfs-overview.json diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample index 19d4ac937..c799c4d5c 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -680,7 +680,7 @@ grafana_container_image: registry.redhat.io/rhceph/rhceph-5-dashboard-rhel8:5 #grafana_uid: 472 #grafana_datasource: Dashboard #grafana_dashboards_path: "/etc/grafana/dashboards/ceph-dashboard" -#grafana_dashboard_version: master +#grafana_dashboard_version: pacific #grafana_dashboard_files: # - ceph-cluster.json # - cephfs-overview.json diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml index 812b5d300..5a6ee8441 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -672,7 +672,7 @@ grafana_container_memory: 4 grafana_uid: 472 grafana_datasource: Dashboard grafana_dashboards_path: "/etc/grafana/dashboards/ceph-dashboard" -grafana_dashboard_version: master +grafana_dashboard_version: pacific grafana_dashboard_files: - ceph-cluster.json - cephfs-overview.json