From d7edc71fd557d18531c90b803159b7d526156c1c Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Tue, 27 Jul 2021 10:58:00 -0400 Subject: [PATCH] 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 --- group_vars/all.yml.sample | 2 +- group_vars/rhcs.yml.sample | 2 +- roles/ceph-defaults/defaults/main.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 58e5d2c0a..e9c9000d5 100644 --- 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 b74dacd05..06ef04731 100644 --- 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 dc76ea767..c38bb9c80 100644 --- 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 -- 2.39.5