]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #33444 into master
authorSage Weil <sage@redhat.com>
Fri, 21 Feb 2020 12:31:58 +0000 (06:31 -0600)
committerSage Weil <sage@redhat.com>
Fri, 21 Feb 2020 12:31:58 +0000 (06:31 -0600)
* refs/pull/33444/head:
mgr/cephadm: no gibberish suffix for some services
mgr/cephadm: prometheus: scrape all mgrs
mgr/cephadm: make prometheus scrape all node-exporters
cephadm: reset-failed on reconfig
cephadm: fix reconfig for monitoring daemons

Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
1  2 
src/cephadm/cephadm
src/pybind/mgr/cephadm/module.py

Simple merge
Simple merge