metricsmap: fix Prometheus exporter #14220
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
jibi
added
the
release-note/bug
maintainer-s-little-helper
bot
removed
the
dont-merge/needs-release-note-label
jibi
added
sig/datapath
jibi
force-pushed
the
pr/jibi/fix-prometheus-bpf-metrics
branch
from
89317b5
to
0a53df6
Compare
|
test-me-please |
pchaigno
reviewed
Nov 30, 2020
jibi
force-pushed
the
pr/jibi/fix-prometheus-bpf-metrics
branch
from
0a53df6
to
d5e8c5f
Compare
|
test-me-please |
aanm
approved these changes
Dec 3, 2020
pchaigno
approved these changes
Dec 3, 2020
maintainer-s-little-helper
bot
added
the
ready-to-merge
Simplify the logic used to iterate the metrics map by replacing it with a call to Metrics.DumpWithCallback(). Signed-off-by: Gilberto Bertin <gilberto@isovalent.com>
Fix the Prometheus exporter as it was not aggregating correctly the
multiple entries that make up a value.
This commit changes the logic from:
func updatePrometheusMetrics(value) {
updateMetric(value.Packets)
updateMetric(value.Bytes)
}
func SyncMetrics() {
for _, value := range values {
updatePrometheusMetrics(value)
}
}
to:
func updatePrometheusMetrics(values) {
for _, value := range values {
packets += value.Packets
bytes += value.Bytes
}
updateMetrics(packets)
updateMetrics(bytes)
}
func SyncMetrics() {
updatePrometheusMetrics(values)
}
What updateMetric does is:
* diff the packets/bytes value it receive with the one stored in
Prometheus
* increment the Prometheus counter by the delta it just calculated
Since the logic in updateMetric is not linear, it will work correctly
only if the packets/bytes counter it receives is the sum of all the
per-CPU values for a given key (rather than what we are doing now, which
is calling updateMetric() on every single per-CPU value for a given key)
Fixes: a591053 ("pkg/maps/metricsmap: userspace aggregation of BPF_PER_CPU_HASH_MAP metrics map.")
Signed-off-by: Gilberto Bertin gilberto@isovalent.com
jibi
force-pushed
the
pr/jibi/fix-prometheus-bpf-metrics
branch
from
d5e8c5f
to
657c41f
Compare
|
No need to re-run the CI as I just amended a commit message to include the |
maintainer-s-little-helper
bot
moved this from Needs backport from master
to Backport done to v1.9
in 1.9.1
maintainer-s-little-helper
bot
moved this from Needs backport from master
to Backport done to v1.9
in 1.9.1
joestringer
moved this from Needs backport from master
to Backport done to v1.8
in 1.8.7
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.
Fix the Prometheus exporter as it was not aggregating correctly the
multiple entries that make up a value.
While at it, simplify the logic used to iterate the map by replacing it
with a call to
Metrics.DumpWithCallback().Signed-off-by: Gilberto Bertin gilberto@isovalent.com