From: Yaarit Hatuka <yaarit@redhat.com>
Date: Fri, 31 Jan 2020 21:36:23 +0000 (-0500)
Subject: mgr/telemetry: added 'telemetry show-device' command
X-Git-Tag: v15.1.1~549^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cae87cc42935cd5cc6c6a2096af215b8dc64171d;p=ceph.git

mgr/telemetry: added 'telemetry show-device' command

Added 'telemetry show-device' command to print a preview of telemetry device report.
Added a message at the bottom of 'telemetry show' about 'telemetry show-device' new command.

Signed-off-by: Yaarit Hatuka <yaarit@redhat.com>
---

diff --git a/src/pybind/mgr/telemetry/module.py b/src/pybind/mgr/telemetry/module.py
index 97b353538931..ce8dd71e51a1 100644
--- a/src/pybind/mgr/telemetry/module.py
+++ b/src/pybind/mgr/telemetry/module.py
@@ -169,6 +169,11 @@ class Module(MgrModule):
             "desc": "Show last report or report to be sent",
             "perm": "r"
         },
+        {
+            "cmd": "telemetry show-device",
+            "desc": "Show last device report or device report to be sent",
+            "perm": "r"
+        },
         {
             "cmd": "telemetry on name=license,type=CephString,req=false",
             "desc": "Enable telemetry reports from this cluster",
@@ -748,7 +753,12 @@ class Module(MgrModule):
             report = self.compile_report(
                 channels=command.get('channels', None)
             )
-            return 0, json.dumps(report, indent=4, sort_keys=True), ''
+            report = json.dumps(report, indent=4, sort_keys=True)
+            if self.channel_device:
+               report += '\n \nDevice report is generated separately. To see it run \'ceph telemetry show-device\'.'
+            return 0, report, ''
+        elif command['prefix'] == 'telemetry show-device':
+            return 0, json.dumps(self.gather_device_report(), indent=4, sort_keys=True), ''
         else:
             return (-errno.EINVAL, '',
                     "Command not found '{0}'".format(command['prefix']))