From: Sage Weil <sage@redhat.com>
Date: Fri, 14 Feb 2020 18:52:26 +0000 (-0600)
Subject: Merge PR #33073 into master
X-Git-Tag: v15.1.1~412
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e8ab24822986d9becd7c0c6bca0b50dc1cf4ae83;p=ceph.git

Merge PR #33073 into master

* refs/pull/33073/head:
	qa/suites/rados/cephadm: deploy prometheus.a
	mgr/cephadm: implement prometheus add/update
	mgr/cephadm: teach _create_daemon how to provision prometheus
	mgr/orch: add prom hooks

Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
---

e8ab24822986d9becd7c0c6bca0b50dc1cf4ae83