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 <dsavinea@redhat.com>

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index b2a57e5a40c649c13cff8c168e9b2cadd55250cd..6044216e7b38ad84e4ce64e1ccf45a2dfc37050b 100644 (file)
--- 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 19d4ac93737efe04b29846a0be873d9a32c609df..c799c4d5c9ac52935b3d52e5a083b4e03b6bd05f 100644 (file)
--- 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 812b5d3000ee85bfe567da3d544b8ab889e9cc43..5a6ee8441dc8491bea16b6968b4adc5e72546711 100644 (file)
--- 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