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: v16.1.0~83^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F38671%2Fhead;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>
---

diff --git a/monitoring/grafana/build/Makefile b/monitoring/grafana/build/Makefile
index 93f53fe314c..fd96a827ff4 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 df516f0fe97..4d4f7d8f710 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 1286f8815ac..67a80e05ba8 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(