From 28fdba4fdcedd81c33cc58bc3dd9bad2337eb5e2 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 2 Jul 2019 09:39:54 -0500 Subject: [PATCH] mgr/telemetry: add 'device' channel and call out to devicehealth module Signed-off-by: Sage Weil --- src/pybind/mgr/devicehealth/module.py | 4 ++++ src/pybind/mgr/telemetry/module.py | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/src/pybind/mgr/devicehealth/module.py b/src/pybind/mgr/devicehealth/module.py index 46c748f24beb..fd0e572b4d18 100644 --- a/src/pybind/mgr/devicehealth/module.py +++ b/src/pybind/mgr/devicehealth/module.py @@ -631,3 +631,7 @@ class Module(MgrModule): return self.remote(plugin_name, 'predict_all_devices') except: return -1, '', 'unable to invoke diskprediction local or remote plugin' + + def gather_device_report(self): + # write me + return {} diff --git a/src/pybind/mgr/telemetry/module.py b/src/pybind/mgr/telemetry/module.py index 3c8857862c39..757a92d82ece 100644 --- a/src/pybind/mgr/telemetry/module.py +++ b/src/pybind/mgr/telemetry/module.py @@ -209,6 +209,12 @@ class Module(MgrModule): r.append('device') return r + def gather_device_report(self): + try: + return self.remote('devicehealth', 'gather_device_report') + except: + return None + def compile_report(self): report = { 'leaderboard': False, @@ -283,6 +289,9 @@ class Module(MgrModule): if self.channel_crash: report['crashes'] = self.gather_crashinfo() + if self.channel_devices: + report['devices'] = self.gather_device_report() + return report def send(self, report): -- 2.47.3