From 753174cdaed1fcfdb123c06dc20b699f324442cc Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 26 Jul 2019 10:17:22 -0500 Subject: [PATCH] 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 --- src/pybind/mgr/telemetry/module.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) 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 -- 2.39.5