-
Notifications
You must be signed in to change notification settings - Fork 2.8k
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
bpf: revert changes to metrics directions contants #14217
Merged
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
maintainer-s-little-helper
bot
added
the
dont-merge/needs-release-note-label
The author needs to describe the release impact of these changes.
label
Nov 30, 2020
test-me-please |
jibi
added
the
release-note/misc
This PR makes changes that have no direct user impact.
label
Nov 30, 2020
maintainer-s-little-helper
bot
removed
the
dont-merge/needs-release-note-label
The author needs to describe the release impact of these changes.
label
Nov 30, 2020
jibi
added
sig/datapath
Impacts bpf/ or low-level forwarding details, including map management and monitor messages.
area/metrics
Impacts statistics / metrics gathering, eg via Prometheus.
labels
Nov 30, 2020
pchaigno
approved these changes
Nov 30, 2020
fristonio
approved these changes
Nov 30, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM 🚀
There is a typo in the PR description can you fix that as well. 😅
This commit partially reverts commit 38ab8f0 ("bpf: add support for SERVICE metrics") by bringing the `METRIC_INGRESS` and `METRIC_EGRESS` constants back to their original values. In addition to that, it introduces the `ct_to_metrics_dir` helper which allows to convert a CT direction into the corresponding metric one. This mitigates any upgrade/downgrade impact caused by having keys with 2 different formats on the metrics map. Fixes: #14175 Signed-off-by: Gilberto Bertin <gilberto@isovalent.com>
jibi
force-pushed
the
pr/jibi/revert-metrics-directions-changes
branch
from
November 30, 2020 13:41
b49a286
to
dbd0f49
Compare
test-me-please |
maintainer-s-little-helper
bot
added
the
ready-to-merge
This PR has passed all tests and received consensus from code owners to merge.
label
Nov 30, 2020
joestringer
approved these changes
Nov 30, 2020
maintainer-s-little-helper
bot
moved this from Needs backport from master
to Backport pending to v1.9
in 1.9.1
Dec 2, 2020
maintainer-s-little-helper
bot
moved this from Backport pending to v1.9
to Backport done to v1.9
in 1.9.1
Dec 3, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
area/metrics
Impacts statistics / metrics gathering, eg via Prometheus.
ready-to-merge
This PR has passed all tests and received consensus from code owners to merge.
release-note/misc
This PR makes changes that have no direct user impact.
sig/datapath
Impacts bpf/ or low-level forwarding details, including map management and monitor messages.
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.
This commit partially reverts commit 38ab8f0 ("bpf: add support for
SERVICE metrics") by bringing the
METRIC_INGRESS
andMETRIC_EGRESS
constants back to their original values.
In addition to that, it introduces the
ct_to_metrics_dir
helper whichallows to convert a CT direction into the corresponding metric one.
This mitigates any upgrade/downgrade impact caused by having keys with 2
different formats on the metrics map.
Fixes: #14175