From: Ernesto Puerta <37327689+epuertat@users.noreply.github.com>
Date: Mon, 11 Jan 2021 16:45:52 +0000 (+0100)
Subject: Merge pull request #38671 from rhcs-dashboard/48685-upgrade-grafana
X-Git-Tag: v16.1.0~83
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7a3f60e8bca0c36ba49651007e13a1ab9d8983b4;p=ceph.git

Merge pull request #38671 from rhcs-dashboard/48685-upgrade-grafana

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

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: b-ranto <branto@redhat.com>
Reviewed-by: Dimitri Savineau <dsavinea@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
Reviewed-by: p-se <pseidensal@suse.com>
Reviewed-by: sebastian-philipp <NOT@FOUND>
Reviewed-by: Volker Theile <vtheile@suse.com>
---

7a3f60e8bca0c36ba49651007e13a1ab9d8983b4