From 9441fda4dc9f0257c3b686de811a01f047ef9f53 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alfonso=20Mart=C3=ADnez?= Date: Thu, 7 Jan 2021 16:53:26 +0100 Subject: [PATCH] mgr/dashboard/monitoring: upgrade Grafana version due to CVE-2020-13379 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fixes: https://tracker.ceph.com/issues/48685 Signed-off-by: Alfonso Martínez --- monitoring/grafana/build/Makefile | 2 +- src/cephadm/cephadm | 2 +- src/pybind/mgr/cephadm/module.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/monitoring/grafana/build/Makefile b/monitoring/grafana/build/Makefile index 93f53fe314c67..fd96a827ff4e8 100755 --- a/monitoring/grafana/build/Makefile +++ b/monitoring/grafana/build/Makefile @@ -1,5 +1,5 @@ -GRAFANA_VERSION := 6.6.2-1 +GRAFANA_VERSION := 6.7.4-1 PIECHART_VERSION := "1.4.0" STATUS_PANEL_VERSION := "1.0.9" DASHBOARD_DIR := "monitoring/grafana/dashboards" diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index df516f0fe97e7..4d4f7d8f71018 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -190,7 +190,7 @@ class Monitoring(object): ], }, "grafana": { - "image": "docker.io/ceph/ceph-grafana:6.6.2", + "image": "docker.io/ceph/ceph-grafana:6.7.4", "cpus": "2", "memory": "4GB", "args": [], diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index 1286f8815ac4d..67a80e05ba895 100644 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@ -188,7 +188,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule, ), Option( 'container_image_grafana', - default='docker.io/ceph/ceph-grafana:6.6.2', + default='docker.io/ceph/ceph-grafana:6.7.4', desc='Prometheus container image', ), Option( -- 2.39.5