Only metrics #2557
Merged
Only metrics #2557
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
jdn5126
force-pushed
the
only-metrics
branch
from
be60ec1
to
7bc711b
Compare
jdn5126
suggested changes
Sep 12, 2023
lnhanks
force-pushed
the
only-metrics
branch
2 times, most recently
from
cb8b7d8
to
1362702
Compare
jdn5126
suggested changes
Sep 12, 2023
lnhanks
force-pushed
the
only-metrics
branch
from
1362702
to
364264e
Compare
lnhanks
force-pushed
the
only-metrics
branch
from
364264e
to
8531551
Compare
jdn5126
force-pushed
the
only-metrics
branch
from
8531551
to
8a9180f
Compare
jdn5126
approved these changes
Sep 12, 2023
jdn5126
force-pushed
the
only-metrics
branch
from
8a9180f
to
c1db805
Compare
M00nF1sh
reviewed
Sep 14, 2023
| ) | ||
| eniIPsInUse = prometheus.NewGaugeVec( | ||
| prometheus.GaugeOpts{ | ||
| Name: "awscni_eni_util", |
There was a problem hiding this comment.
i think this metric should be named awscni_assigned_ip_per_eni, since it serves similar purpose of awscni_assigned_ip_per_cidr metric(expect the label value is eni instead of cidr).
Also, util is not a good abbreviation for "utilization"( i assume you mean utilization here :D)
M00nF1sh
reviewed
Sep 14, 2023
| @@ -122,6 +122,19 @@ var ( | |||
| }, | |||
| []string{"cidr"}, | |||
| ) | |||
| noAvailableIPAddrs = prometheus.NewCounter( | |||
| prometheus.CounterOpts{ | |||
| Name: "awscni_err_no_avail_addrs", | |||
There was a problem hiding this comment.
maybe change to awscni_no_available_ip_addresses, which
- aligns with other metrics's use of "ip_addresses".
- and we don't need to have this "err" in metrics name, since it's a expected behavior instead of err.
- remove nonstandard use of abbreviation(avail is not a standard abbreviation for available iirc)
jdn5126
added a commit
that referenced
this pull request
Oct 20, 2023
* restore node update permission to master until image tag can be updated (#2513) * Merge branch 'release-1.14' (#2517) * network policies update to readme (#2478) * init draft of network policy desc * add security note * fixup * fixup * fix placeholder link * Update manifest for cni 1.14 (#2526) * Mimic VPC-RC limit struture (#2516) * limits api pkg (#2528) * Update kops tests for 1.28 and fix generate-cni-yaml script (#2536) * skip IPAMD events test (#2537) * chore: remove refs to deprecated io/ioutil (#2541) * Change default Node Agent ports for health and metrics (#2545) * remove self-managed node group from pod-eni test suite (#2547) * bump controller runtime to 0.16.1 (#2548) Co-authored-by: Joseph Chen <[email protected]> * update agent image (#2554) * fix(chart): Switch base64 encoded cniConfig.fileContents to the binaryData (#2552) * Update the use of privileged flag in aws-vpc-cni manifest (#2555) * increment default Calico version for helm compatibility (#2560) * update nginx image (#2561) * Only metrics (#2557) Prometheus metrics for capturing ENI IP usage and no available IP address errors Co-authored-by: Lindsay Hanks <[email protected]> * CHANGELOG, chart, and manifest updates for VPC CNI v1.15.0 release (#2563) * remove calico test suite from weekly integration tests (#2559) * remove addon-tests integration suite as it is no longer needed (#2564) * Only metrics (#2569) * rename warm pool metrics --------- Co-authored-by: Lindsay Hanks <[email protected]> * Fix unused version variable (#2566) * Update example table 'Pod per Prefixes' value (#2573) * Bandwidth plugin with NP is currently unsupported (#2572) * Bandwidth plugin with NP * Messaging review * pass CNINode scheme to client only (#2570) * reduce api calls (#2575) * Add region flag to describe-addon command (#2576) * add ENABLE_V4_EGRESS (#2577) * Add test registry parameter for ipv6 and CNI full tests (#2585) * update golang image (#2586) * increase time for service readiness (#2587) * do not patch CNINode for custom networking unless podENI is enabled (#2591) * Remove self-managed node group from custom-networking suite (#2590) * remove self-managed node group from custom-networking suite * Select CNI manifest based on regions (#2593) * Update metrics helper image url based on region (#2604) * dependabot updates (#2605) * Graceful termination for service connectivity tests (#2611) * update CHANGELOG, charts, and manifests in master following v1.15.1 release (#2614) * go module updates and golang builder image update (#2615) * update Golang to 1.21.3 (#2616) * Stricter dependency/security review (#2617) * Stricter dependency/security review Signed-off-by: Davanum Srinivas <[email protected]> * move common things to a separate file Signed-off-by: Davanum Srinivas <[email protected]> --------- Signed-off-by: Davanum Srinivas <[email protected]> * update actions for go 1.21 and fix deps action warnings (#2618) --------- Signed-off-by: Davanum Srinivas <[email protected]> Co-authored-by: Jay Deokar <[email protected]> Co-authored-by: Geoffrey Cline <[email protected]> Co-authored-by: Joseph Chen <[email protected]> Co-authored-by: guangwu <[email protected]> Co-authored-by: Joseph Chen <[email protected]> Co-authored-by: Valentin Zayash <[email protected]> Co-authored-by: lnhanks <[email protected]> Co-authored-by: Lindsay Hanks <[email protected]> Co-authored-by: 김은빈 <[email protected]> Co-authored-by: Jayanth Varavani <[email protected]> Co-authored-by: Davanum Srinivas <[email protected]>
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?
Which issue does this PR fix:
n/a
What does this PR do / Why do we need it:
This PR adds to additional metrics to better visualize IP allocation. No available addresses error counter metric is currently a logged error but turning it into a metric will help visualize how often an IP allocation fails due to there being no addresses available. The second gauge metric ENI utilization expands on the existing ENIs allocated metric by partitioning data by ENI id and counting how many IP addresses are in use on each ENI. There are also two additional log statements created when an IP address is allocated or deallocated.
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:
No
Will this PR introduce any new dependencies?:
No
Will this break upgrades or downgrades. Has updating a running cluster been tested?:
Yes
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.