From: Sage Weil <sage@redhat.com>
Date: Mon, 3 Feb 2020 22:28:04 +0000 (-0600)
Subject: Merge PR #32977 into master
X-Git-Tag: v15.1.1~565
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e17ffa6c11dc89dfa0300646026a4c345a5b1ad3;p=ceph-ci.git

Merge PR #32977 into master

* refs/pull/32977/head:
	qa/workunits/cephadm/test_cephadm.sh: add missing monitoring tests
	cephadm: simplify Monitoring.components structure
	cephadm: add proper tox type for monitoring components

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

e17ffa6c11dc89dfa0300646026a4c345a5b1ad3