From: Sage Weil <sage@redhat.com>
Date: Mon, 9 Mar 2020 00:57:06 +0000 (-0500)
Subject: Merge PR #33804 into master
X-Git-Tag: v15.1.1~66
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ab2488773626d40fb1f8345a99f4bbd6712c0fd4;p=ceph.git

Merge PR #33804 into master

* refs/pull/33804/head:
	cephadm: ls: warn if daemon type (version) is not supported
	cephadm: report grafana version
	cephadm: report prometheus, node-exporter, alertmanager versions
	cephadm: use None (not '<no value>') for monitoring daemon version

Reviewed-by: Michael Fritch <mfritch@suse.com>
---

ab2488773626d40fb1f8345a99f4bbd6712c0fd4