From: Sage Weil <sage@redhat.com>
Date: Tue, 24 Mar 2020 20:38:04 +0000 (-0500)
Subject: Merge PR #34085 into master
X-Git-Tag: v16.1.0~2818
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0f8c01a1dbd0c14f20561440dd62819b1e78009a;p=ceph.git

Merge PR #34085 into master

* refs/pull/34085/head:
	debian: add ceph-grafana-dashboards package
	ceph.spec: put prometheus alerts in vendor-neutral location
	mgr/cephadm: include prom alerts, if present in the container

Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
Reviewed-by: Paul Cuzner <pcuzner@redhat.com>
---

0f8c01a1dbd0c14f20561440dd62819b1e78009a