From: Alfonso Martínez <almartin@redhat.com>
Date: Thu, 7 Jan 2021 15:53:26 +0000 (+0100)
Subject: mgr/dashboard/monitoring: upgrade Grafana version due to CVE-2020-13379
X-Git-Tag: v15.2.10~39^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b370168195f27b154e8785597bf5146e0faa3e9c;p=ceph.git

mgr/dashboard/monitoring: upgrade Grafana version due to CVE-2020-13379

Fixes: https://tracker.ceph.com/issues/48685
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(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.
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 5a669b35a5ba8..2b7e37aece73f 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 096d0e89336de..001c6c9492e8e 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',
         },
         {