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

bpf: revert changes to metrics directions contants #14217

Merged
merged 1 commit into from
Nov 30, 2020

Conversation

jibi
Copy link
Member

@jibi jibi commented Nov 30, 2020

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

@jibi jibi requested review from pchaigno and a team November 30, 2020 13:12
@maintainer-s-little-helper 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
@maintainer-s-little-helper maintainer-s-little-helper bot added this to In progress in 1.10.0 Nov 30, 2020
@jibi
Copy link
Member Author

jibi commented Nov 30, 2020

test-me-please

@jibi jibi added the release-note/misc This PR makes changes that have no direct user impact. label Nov 30, 2020
@maintainer-s-little-helper 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 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 pchaigno removed their assignment Nov 30, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.9.1 Nov 30, 2020
Copy link
Member

@fristonio fristonio left a 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. 😅

bpf/lib/metrics.h Outdated Show resolved Hide resolved
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 jibi force-pushed the pr/jibi/revert-metrics-directions-changes branch from b49a286 to dbd0f49 Compare November 30, 2020 13:41
@jibi
Copy link
Member Author

jibi commented Nov 30, 2020

test-me-please

@maintainer-s-little-helper 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 joestringer merged commit 76c1b5a into master Nov 30, 2020
@joestringer joestringer deleted the pr/jibi/revert-metrics-directions-changes branch November 30, 2020 21:06
@maintainer-s-little-helper 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 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.
Projects
No open projects
1.9.1
Backport done to v1.9
Development

Successfully merging this pull request may close these issues.

Before 1.9.1, resolve metrics breakage
5 participants