From b370168195f27b154e8785597bf5146e0faa3e9c 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 (cherry picked from commit 9441fda4dc9f0257c3b686de811a01f047ef9f53) Conflicts: monitoring/grafana/build/Makefile - Remove file as it does not exist on octopus. src/pybind/mgr/cephadm/module.py - Resolve conflicts. --- src/cephadm/cephadm | 2 +- src/pybind/mgr/cephadm/module.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 5a669b35a5b..2b7e37aece7 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -182,7 +182,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 096d0e89336..001c6c9492e 100644 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@ -173,7 +173,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule): }, { 'name': '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', }, { -- 2.47.3