From: Sage Weil <sage@redhat.com>
Date: Mon, 29 Apr 2019 19:32:44 +0000 (-0500)
Subject: mgr/telemetry: use cluster-provided timestamp unmolested
X-Git-Tag: v12.2.13~15^2~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6e4a5309af0359e2dcfd8679dad3d9a31c32bef4;p=ceph.git

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 <sage@redhat.com>
(cherry picked from commit 383006a5cc2da3e0b643a9dc600e75e1ce088bd6)

Conflicts:
	src/pybind/mgr/telemetry/module.py
          Due to missing scaffolding that exists in master but was not
          backported to luminous.
---

diff --git a/src/pybind/mgr/telemetry/module.py b/src/pybind/mgr/telemetry/module.py
index 7e6cb84bb06..dba4b5ededd 100644
--- a/src/pybind/mgr/telemetry/module.py
+++ b/src/pybind/mgr/telemetry/module.py
@@ -137,10 +137,6 @@ class Module(MgrModule):
 
         return False
 
-    @staticmethod
-    def parse_timestamp(timestamp):
-        return datetime.strptime(timestamp, '%Y-%m-%d %H:%M:%S.%f')
-
     def set_config_option(self, option, value):
         if option not in self.config_keys.keys():
             raise RuntimeError('{0} is a unknown configuration '
@@ -239,7 +235,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']),