From 0e8b5c30c80cb84f9933ac884897a4bc1bf18c58 Mon Sep 17 00:00:00 2001 From: Aashish Sharma Date: Wed, 6 Apr 2022 15:24:41 +0530 Subject: [PATCH] mgr/dashboard: upgrade grafana pie-chart and vonage-status-panel versions Fixes:https://tracker.ceph.com/issues/55195 Signed-off-by: Aashish Sharma (cherry picked from commit 2877920f58728eab20abe32fed24618449d76c09) (cherry picked from commit 429f242148e493ee4819fe16c844a8d9b980b9a3) --- monitoring/grafana/build/Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/monitoring/grafana/build/Makefile b/monitoring/grafana/build/Makefile index cf63176c9b4a..f1b46cdd7fdd 100755 --- a/monitoring/grafana/build/Makefile +++ b/monitoring/grafana/build/Makefile @@ -1,10 +1,10 @@ -GRAFANA_VERSION ?= 6.7.4-1 -PIECHART_VERSION ?= "1.4.0" -STATUS_PANEL_VERSION ?= "1.0.9" +GRAFANA_VERSION ?= 8.3.5-1 +PIECHART_VERSION ?= "1.6.2" +STATUS_PANEL_VERSION ?= "1.0.11" DASHBOARD_DIR := "../dashboards" DASHBOARD_PROVISIONING := "ceph-dashboard.yml" -IMAGE := "docker.io/centos:8" +IMAGE := "docker.io/redhat/ubi8:8.5" PKGMGR := "dnf" GF_CONFIG := "/etc/grafana/grafana.ini" # clip off "- from the end of GRAFANA_VERSION @@ -80,6 +80,5 @@ push: clean: sudo podman rmi ${LOCALTAG} || true sudo podman rmi quay.io/${TAG} || true - sudo podman rmi localhost/tmp/oci-image || true rm -f grafana-*.rpm* auth.json rm -f ${DASHBOARD_PROVISIONING} -- 2.47.3