prometheus: Properly split the port off IPv6 addresses #36594
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The Prometheus module when splitting the port nubmer for public and
client networks/ips doesn't take IPv6 addresses into account.
This patch fixes this by using `rsplit(':', 1)` rather then `split(':')`
which leads to bugs like:
curl --silent http://localhost:9283/metrics | grep ceph_mon_metadata{
ceph_mon_metadata{ceph_daemon="mon.mon2",hostname="mon2.example.net",public_addr="[2001",rank="0",ceph_version="ceph version 15.2.4 (7447c15) octopus (stable)"} 1.0
Note the public_addr above being split at the first ':' of an IPv6
address.
Signed-off-by: Matthew Oliver <moliver@suse.com>
Fixes: https://tracker.ceph.com/issues/46846
|
This is really a drive by fix as I saw the tracker bug. I haven't actually tested it as I don't have the env set up. |
jdurgin
requested review from
b-ranto and
jan--f
and removed request for
b-ranto
|
@jan--f could you please add a Reviewed-by line when merging PRs in future? |
This was referenced Sep 4, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The Prometheus module when splitting the port nubmer for public and
client networks/ips doesn't take IPv6 addresses into account.
This patch fixes this by using
rsplit(':', 1)rather thensplit(':')which leads to bugs like:
curl --silent http://localhost:9283/metrics | grep ceph_mon_metadata{
ceph_mon_metadata{ceph_daemon="mon.mon2",hostname="mon2.example.net",public_addr="[2001",rank="0",ceph_version="ceph version 15.2.4 (7447c15) octopus (stable)"} 1.0
Note the public_addr above being split at the first ':' of an IPv6
address.
Signed-off-by: Matthew Oliver moliver@suse.com
Fixes: https://tracker.ceph.com/issues/46846
Checklist
Show available Jenkins commands
jenkins retest this pleasejenkins test classic perfjenkins test crimson perfjenkins test signedjenkins test make checkjenkins test make check arm64jenkins test submodulesjenkins test dashboardjenkins test apijenkins test docsjenkins render docsjenkins test ceph-volume alljenkins test ceph-volume tox