From: Sage Weil <sage@redhat.com>
Date: Tue, 25 Feb 2020 22:15:55 +0000 (-0600)
Subject: Merge PR #33515 into master
X-Git-Tag: v15.1.1~259
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a28ffa68eab02a8d341ca4a0ac609bba91675209;p=ceph.git

Merge PR #33515 into master

* refs/pull/33515/head:
	mgr/cephadm: replace static SSL cert
	mgr/cephadm: dynamically add Grafana data sources
	mgr/cephadm: provide static default configs for grafana deployment
	mgr/cephadm: provision grafana
	mgr/orch: add grafana hooks

Reviewed-by: Sage Weil <sage@redhat.com>
---

a28ffa68eab02a8d341ca4a0ac609bba91675209