From 383006a5cc2da3e0b643a9dc600e75e1ce088bd6 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 29 Apr 2019 14:32:44 -0500 Subject: [PATCH] mgr/telemetry: use cluster-provided timestamp unmolested The cluster stamp is now ISO 8601; just use that. (The isoformat() puts a : in +hh:mm the timezone offset, which is slightly different than what Ceph does; just pass Ceph's value through for consistency.) Signed-off-by: Sage Weil --- src/pybind/mgr/telemetry/module.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/pybind/mgr/telemetry/module.py b/src/pybind/mgr/telemetry/module.py index e986bbb42347c..9b05c19a94b1f 100644 --- a/src/pybind/mgr/telemetry/module.py +++ b/src/pybind/mgr/telemetry/module.py @@ -122,10 +122,6 @@ class Module(MgrModule): self.get_module_option(opt['name'])) self.log.debug(' %s = %s', opt['name'], getattr(self, opt['name'])) - @staticmethod - def parse_timestamp(timestamp): - return datetime.strptime(timestamp, '%Y-%m-%d %H:%M:%S.%f') - def load(self): self.last_upload = self.get_store('last_upload', None) if self.last_upload is not None: @@ -205,7 +201,7 @@ class Module(MgrModule): df = self.get('df') report['report_id'] = self.report_id - report['created'] = self.parse_timestamp(mon_map['created']).isoformat() + report['created'] = mon_map['created'] report['mon'] = { 'count': len(mon_map['mons']), -- 2.39.5