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>
(cherry picked from commit 753174cdaed1fcfdb123c06dc20b699f324442cc)

diff --git a/src/pybind/mgr/telemetry/module.py b/src/pybind/mgr/telemetry/module.py
index 5146cedc978e0bbe1555e19c42d5818905208b05..05c054b29cf051a4a220e4960ad2c4fba2e83c9f 100644 (file)
--- a/src/pybind/mgr/telemetry/module.py
+++ b/src/pybind/mgr/telemetry/module.py
@@ -277,12 +277,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