]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
mgr/dashboard/monitoring: upgrade Grafana version due to CVE-2020-13379 39306/head
authorAlfonso Martínez <almartin@redhat.com>
Thu, 7 Jan 2021 15:53:26 +0000 (16:53 +0100)
committerAlfonso Martínez <almartin@redhat.com>
Thu, 4 Feb 2021 16:40:24 +0000 (17:40 +0100)
commitb370168195f27b154e8785597bf5146e0faa3e9c
tree21f0feeef6dd22b8635f815edf95424221f4a9f7
parent47c1ec25168ce6c1b2bef0bc5cd1907b9bae080a
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.
src/cephadm/cephadm
src/pybind/mgr/cephadm/module.py