Prometheus metrics scraping from CNI metrics helper#2603
Merged
jdn5126 merged 2 commits intoaws:masterfrom Nov 15, 2023
Merged
Conversation
Contributor
Author
|
Let's wait on merge..I see an issue here. |
bb53cd4 to
574675a
Compare
Contributor
Author
|
Issue with aggregation fixed.. |
2bf230a to
140c6be
Compare
jdn5126
reviewed
Nov 14, 2023
Contributor
jdn5126
left a comment
There was a problem hiding this comment.
Changes look good overall, just a few nits. Can you also rebase to latest master?
jdn5126
approved these changes
Nov 14, 2023
7ac8bd6 to
c62c4ab
Compare
c62c4ab to
5a29a2f
Compare
4 tasks
This file contains hidden or 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
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.
What type of PR is this?
Feature
Which issue does this PR fix:
Fixes #2071
What does this PR do / Why do we need it:
Reopening #2192 and some additional refactoring.
CNI metrics helper merges all the metrics from aws-nodes and aggregates the metrics to send for CW. With this PR the aggregated data is sent to Prometheus when "USE_PROMETHEUS" is set. As part of initial enhancement only Prometheus type GAUGE is streamed for prometheus. Future enhancements will be made for other types of metrics.
This will include -
If an issue # is not available please add repro steps and logs from IPAMD/CNI showing the issue:
Testing done on this change:
Automation added to e2e:
N/A
Will this PR introduce any new dependencies?:
No
Will this break upgrades or downgrades. Has updating a running cluster been tested?:
No
Does this change require updates to the CNI daemonset config files to work?:
No
Does this PR introduce any user-facing change?:
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.