From: Sage Weil <sage@redhat.com>
Date: Sat, 7 Mar 2020 03:19:49 +0000 (-0600)
Subject: Merge PR #33700 into master
X-Git-Tag: v15.1.1~80
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=7f9ed79dc60bff9158cf13d85c37e4f4c15c3c21;p=ceph-ci.git

Merge PR #33700 into master

* refs/pull/33700/head:
	mgr/cephadm: point dashboard at grafana automatically
	doc/cephadm/monitoring: document process to set up monitoring with cephadm

Reviewed-by: Alexandra Settle <asettle@suse.com>
Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
---

7f9ed79dc60bff9158cf13d85c37e4f4c15c3c21