]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #33073 into master
authorSage Weil <sage@redhat.com>
Fri, 14 Feb 2020 18:52:26 +0000 (12:52 -0600)
committerSage Weil <sage@redhat.com>
Fri, 14 Feb 2020 18:52:26 +0000 (12:52 -0600)
commite8ab24822986d9becd7c0c6bca0b50dc1cf4ae83
tree90f72f8543881b480cf451cc102e961ee9bbf642
parent4e0415fde9b31889003e1df372564055ce41de0b
parent29c5cce96821ee8aad6c4a46338a9303a35db58a
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>