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 58e5d2c0aa7584c88754c21c6e21040e562ab3af..e9c9000d5359c7f29434e2706e281c9fd77ff417 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -685,7 +685,7 @@ dummy:
 #grafana_uid: 472
 #grafana_datasource: Dashboard
 #grafana_dashboards_path: "/etc/grafana/dashboards/ceph-dashboard"
-#grafana_dashboard_version: master
+#grafana_dashboard_version: octopus
 #grafana_dashboard_files:
 #  - ceph-cluster.json
 #  - cephfs-overview.json

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index b74dacd056cd61e2acf4e9961837aeabefbd6a01..06ef04731f0da62bedc5bccd136c345b40fc8082 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -685,7 +685,7 @@ grafana_container_image: registry.redhat.io/rhceph/rhceph-4-dashboard-rhel8:4
 #grafana_uid: 472
 #grafana_datasource: Dashboard
 #grafana_dashboards_path: "/etc/grafana/dashboards/ceph-dashboard"
-#grafana_dashboard_version: master
+#grafana_dashboard_version: octopus
 #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 dc76ea7670c38b63ccbb52fdc08a3408d2fc8442..c38bb9c80b267ba00808f5eb58b9aeb6b15c0d6c 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -677,7 +677,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: octopus
 grafana_dashboard_files:
   - ceph-cluster.json
   - cephfs-overview.json