From: Sage Weil <sage@redhat.com>
Date: Sat, 23 Jun 2018 22:05:51 +0000 (-0500)
Subject: Merge PR #22479 into master
X-Git-Tag: v14.0.1~1030
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eb3bbb8462ffb33461a12c2bd62fb688850afa2b;p=ceph.git

Merge PR #22479 into master

* refs/pull/22479/head:
	mgr/devicehealth: add self-test
	mgr/devicehealth: make config options instance attributes
	mgr/devicehealth: active -> enable_monitoring
	mgr/mgr_module: update docstring for get()
	mgr/devicehealth: fix 'device get-health-metrics' when no metrics are stored
	mgr/devicehealth: add some scraping infrastructure
	osd: optionally query smart for a single devid
	mgr/ActivePyModules: add get for 'device <devid>'
	osd: key smart results by unique device id
	mgr: enable devicehealth by default
	mgr/devicehealth: rename old smart module to devicehealth
---

eb3bbb8462ffb33461a12c2bd62fb688850afa2b