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>

diff --cc src/cephadm/cephadm
Simple merge

diff --cc src/pybind/mgr/cephadm/module.py
Simple merge