From: Sage Weil <sage@redhat.com>
Date: Tue, 2 Jul 2019 14:39:54 +0000 (-0500)
Subject: mgr/telemetry: add 'device' channel and call out to devicehealth module
X-Git-Tag: v15.1.0~2074^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=28fdba4fdcedd81c33cc58bc3dd9bad2337eb5e2;p=ceph.git

mgr/telemetry: add 'device' channel and call out to devicehealth module

Signed-off-by: Sage Weil <sage@redhat.com>
---

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):