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 93f53fe314c671a3f1e114b42bb6bde8be9e481e..fd96a827ff4e81d0f09aeced502c7ef61115628a 100755 (executable)
--- 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 df516f0fe97e7817dec8028cefdeab1866de81a0..4d4f7d8f71018d08d99e418832daabbb44b42b01 100755 (executable)
--- 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 1286f8815ac4d6ef1ac71dfca47ae5d6f4520239..67a80e05ba89560fe02e1c35d5deb7d2423457dd 100644 (file)
--- 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(