From: Sage Weil <sage@redhat.com>
Date: Fri, 28 Feb 2020 01:49:05 +0000 (-0600)
Subject: Merge PR #33554 into master
X-Git-Tag: v15.1.1~208
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=99923e8e7b8874ba5afbcc295c5d95c8099a7385;p=ceph.git

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>
---

99923e8e7b8874ba5afbcc295c5d95c8099a7385