]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
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)
* 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>
1  2 
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/orchestrator/_interface.py
src/pybind/mgr/orchestrator/module.py

Simple merge
Simple merge