From: Yaarit Hatuka <yaarit@redhat.com>
Date: Fri, 7 Feb 2020 15:04:50 +0000 (-0500)
Subject: mgr/telemetry: add 'last_upload' to status
X-Git-Tag: v14.2.10~181^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e2764bf3e141ab96a21c8fa88eb7657caab36721;p=ceph.git

mgr/telemetry: add 'last_upload' to status

'ceph telemetry status' now shows the last sent report date.

Fixes: https://tracker.ceph.com/issues/44040
Signed-off-by: Yaarit Hatuka <yaarit@redhat.com>
(cherry picked from commit 3a25c912a702c7ec93002a105217a7ff80a67dc9)

Conflicts:
- path: src/pybind/mgr/telemetry/module.py
  comment: nautilus version of json.dumps() don't have sort_keys arg.
---

diff --git a/src/pybind/mgr/telemetry/module.py b/src/pybind/mgr/telemetry/module.py
index c2f9657e686e..e859a97ed000 100644
--- a/src/pybind/mgr/telemetry/module.py
+++ b/src/pybind/mgr/telemetry/module.py
@@ -747,6 +747,7 @@ class Module(MgrModule):
             r = {}
             for opt in self.MODULE_OPTIONS:
                 r[opt['name']] = getattr(self, opt['name'])
+            r['last_upload'] = time.ctime(self.last_upload) if self.last_upload else self.last_upload
             return 0, json.dumps(r, indent=4), ''
         elif command['prefix'] == 'telemetry on':
             if command.get('license') != LICENSE: