]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
projects / ceph-ci.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 928f021 accbe45)
Merge PR #33554 into master
authorSage Weil <sage@redhat.com>
Fri, 28 Feb 2020 01:49:05 +0000 (19:49 -0600)
committerSage Weil <sage@redhat.com>
Fri, 28 Feb 2020 01:49:05 +0000 (19:49 -0600)
commit99923e8e7b8874ba5afbcc295c5d95c8099a7385
tree67096302db246bc3875a2dedec2c9efd20e85351tree | snapshot
parent928f0218df67aa5808f7cc2d25705630a89e1a82commit | diff
parentaccbe4500201031c9c0d458bcaf5470255fab9d1commit | diff
Merge PR #33554 into master

* refs/pull/33554/head:
mgr/cephadm: Configure Alertmanagers in Prometheus configuration
mgr/cephadm: Create configuration for alertmanager
mgr/cephadm: Provision alertmanager
mgr/orchestrator: Add alertmanager hooks

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
src/pybind/mgr/cephadm/module.py diff1 | diff2 | blob | history
src/pybind/mgr/orchestrator/_interface.py diff1 | diff2 | blob | history
src/pybind/mgr/orchestrator/module.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.