Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nautilus: mgr/telemetry: fix device serial number anonymization #32948

Merged
merged 1 commit into from Feb 13, 2020

Conversation

yaarith
Copy link
Contributor

@yaarith yaarith commented Jan 29, 2020

backport of #32492

Please see: #32926

- 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 e4d5ece)
Conflicts: ceph-mgr in nautilus is still using python2, we should use python2 compatible syntax in this backport commit.
See ceph#32926
@theanalyst theanalyst changed the base branch from nautilus to nautilus-saved February 5, 2020 17:08
@theanalyst theanalyst changed the base branch from nautilus-saved to nautilus February 5, 2020 17:08
@smithfarm smithfarm added mgr nautilus-batch-1 nautilus point releases pybind labels Feb 12, 2020
@smithfarm
Copy link
Contributor

jenkins test make check

@smithfarm
Copy link
Contributor

CTest Failure
1 tests failed out of 167  Total Test time (real) = 3627.35 sec
The following tests FAILED: 	 51 - unittest_lockdep (Timeout)

@smithfarm
Copy link
Contributor

jenkins test make check

@yuriw
Copy link
Contributor

yuriw commented Feb 12, 2020

@yuriw yuriw merged commit ec1f782 into ceph:nautilus Feb 13, 2020
@it-is-a-robot it-is-a-robot mentioned this pull request Dec 20, 2021
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants