]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mgr/telemetry: fix device serial number anonymization 32948/head
authorYaarit Hatuka <yaarit@redhat.com>
Mon, 6 Jan 2020 03:16:56 +0000 (22:16 -0500)
committerYaarit Hatuka <yaarit@redhat.com>
Wed, 29 Jan 2020 01:50:24 +0000 (20:50 -0500)
commitb338ffa03803b815a3fc55c2ca80bed84fc12678
tree875ec596a7fbc05426b7bb7e2779da29bc3341a5
parent4047f4716eb1c6c64c9bca2769eec8712422cb66
mgr/telemetry: fix device serial number anonymization

- Model names sometimes have underscores in them, hence it is
not safe to split the string <vendor>_<model>_<serial> by '_' and expect
the correct corresponding tuple.
For now we'll take the string after the last '_' as the serial.

- Fixed back_ip to be retrieved from cluster_addrs instead of
public_addrs.

- Omitted the ':' from 'pg_num:' key. This won't break the telemetry
server since it does not extract this key, but calculates it from 'pools'.

Signed-off-by: Yaarit Hatuka <yaarit@redhat.com>
(cherry picked from commit e4d5ece05ec76aea7392ee4e41a34082692f0df6)
Conflicts: ceph-mgr in nautilus is still using python2, we should use python2 compatible syntax in this backport commit.
See https://github.com/ceph/ceph/pull/32926
src/pybind/mgr/telemetry/module.py