From: Dan Mick <dan.mick@redhat.com>
Date: Sat, 25 Aug 2018 03:56:29 +0000 (-0700)
Subject: mgr/telemetry: add crashdump info to report
X-Git-Tag: v13.2.6~86^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F24639%2Fhead;p=ceph.git

mgr/telemetry: add crashdump info to report

Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit 2c17bc98bf788430f8ce5c459ab23567827dec67)
---

diff --git a/src/pybind/mgr/telemetry/module.py b/src/pybind/mgr/telemetry/module.py
index c3e24f150e04..ff64b8276d2f 100644
--- a/src/pybind/mgr/telemetry/module.py
+++ b/src/pybind/mgr/telemetry/module.py
@@ -209,6 +209,19 @@ class Module(MgrModule):
 
         return metadata
 
+    def gather_crashinfo(self):
+        crashdict = dict()
+        errno, crashids, err = self.remote('crash', 'do_ls', '', '')
+        if errno:
+            return ''
+        for crashid in crashids.split():
+            cmd = {'id': crashid}
+            errno, crashinfo, err = self.remote('crash', 'do_info', cmd, '')
+            if errno:
+                continue
+            crashdict[crashid] = json.loads(crashinfo)
+        return crashdict
+
     def compile_report(self):
         report = {'leaderboard': False, 'report_version': 1}
 
@@ -275,6 +288,8 @@ class Module(MgrModule):
         for key, value in service_map['services'].items():
             report['services'][key] += 1
 
+        report['crashes'] = self.gather_crashinfo()
+
         return report
 
     def send(self, report):