From: Sage Weil <sage@redhat.com>
Date: Fri, 26 Jul 2019 15:17:22 +0000 (-0500)
Subject: mgr/telemetry: salt osd ids too
X-Git-Tag: v15.1.0~2057^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=107ab12f02e31a76734f016cde2a45eb9e262085;p=ceph-ci.git

mgr/telemetry: salt osd ids too

Better to fully obfuscate here.

This has a nice side-effect of assigning entity names that are *globally*
unique across the full telemetry data set, since the salts are unique and
sha1 is (sufficiently) collision-free.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/pybind/mgr/telemetry/module.py b/src/pybind/mgr/telemetry/module.py
index 2ee80588b35..1977305b77d 100644
--- a/src/pybind/mgr/telemetry/module.py
+++ b/src/pybind/mgr/telemetry/module.py
@@ -212,12 +212,11 @@ class Module(MgrModule):
             c = json.loads(crashinfo)
             del c['utsname_hostname']
             (etype, eid) = c.get('entity_name', '').split('.')
-            if etype != 'osd':
-                m = hashlib.sha1()
-                m.update(self.salt.encode('utf-8'))
-                m.update(eid.encode('utf-8'))
-                m.update(self.salt.encode('utf-8'))
-                c['entity_name'] = etype + '.' + m.hexdigest()
+            m = hashlib.sha1()
+            m.update(self.salt.encode('utf-8'))
+            m.update(eid.encode('utf-8'))
+            m.update(self.salt.encode('utf-8'))
+            c['entity_name'] = etype + '.' + m.hexdigest()
             crashlist.append(c)
         return crashlist