From: Sage Weil <sage@redhat.com>
Date: Fri, 15 Nov 2019 23:16:30 +0000 (-0600)
Subject: Merge PR #30849 into nautilus
X-Git-Tag: v14.2.5~62
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4ec27e6bf5ea7097b087980037919e085a814901;p=ceph.git

Merge PR #30849 into nautilus

* refs/pull/30849/head:
	mgr/dashboard: fix mgr module API tests
	qa/tasks/mgr/dashboard/test_mgr_module: remove enable/disable test from MgrModuleTelemetryTest
	qa/tasks/mgr/dashboard/test_mgr_module: sync w/ telemetry
	mgr/dashboard/qa: add more fields to report
	Merge branch 'nautilus' into wip-device-telemetry-nautilus
	PendingReleaseNotes: fix typo
	PendingReleaseNotes: remove kludge
	mgr/telemetry: add stats about crush map
	mgr/telemetry: add rgw metadata
	mgr/telemetry: include fs size (files, bytes, snaps)
	mds: report r{files,bytes,snaps} via perfcounters
	mgr/telemetry: mds cache stats
	mgr/telemetry: add some rbd metadata
	mgr/telemetry: note whether osd cluster_network is in use
	mgr/telemetry: add host counts
	mgr/telemetry: add more pool metadata
	mgr/telemetry: remove crush rule name
	mgr/telemetry: include min_mon_release and msgr v1 vs v2 addr count
	mgr/telemetry: add CephFS metadata
	mgr/telemetry: include balancer info (active=true/false, mode)
	mgr/telemetry: include per-pool pg_autoscale info
	mgr/telemetry: dict.pop() errs on nonexistent key
	mgr/telemetry: send device telemetry via per-host POST to device endpoint
	mgr/telemetry: fix remote into crash do_ls()
	mgr/telemetry: clear the event after being awaken by it
	mgr/telemetry: bump content revision and add a release note
	telemetry/server: add device report endpoint
	mgr/telemetry: include device telemetry
	mgr/telemetry: salt osd ids too
	mgr/telemetry: obscure entity_name with a salt
	mgr/telemetry: force re-opt-in if the report contents change
	mgr/telemetry: less noise in the log
	mgr/telemetry: wake up serve on config change
	mgr/telemetry: track telemetry report revisions
	qa/tasks/mgr/dashboard/test_mgr_module: adjust expected schema
	mgr/telemetry: separate out cluster config vs running daemons
	mgr/telemetry: include any config options that are customized
	mgr/telemetry: specify license when opting in
	doc/mgr/telemetry: update
	mgr/telemetry: move contact info to an 'ident' channel
	mgr/telemetry: accept channel list to 'telemetry show'
	mgr/telemetry: always generate new report for 'telemetry show'
	mgr/telemetry: add 'device' channel and call out to devicehealth module
	mgr/telemetry: add telemetry channel 'device'
	mgr/telemetry: add separate channels
	mgr/devicehealth: pull out MAX_SAMPLES

Reviewed-by: Wido den Hollander <wido@42on.com>
---

4ec27e6bf5ea7097b087980037919e085a814901