ipam: add metrics to track per node capacity by tommyp1ckles · Pull Request #24776 · cilium/cilium

tommyp1ckles · 2023-04-06T04:55:30Z

This PR adds metrics to help track IPAM Node capacity with more granularity.
Specifically, the goal is to help add alerting/dashboards for such questions such as:

How many IPs are left on my node/cluster?
How many/what Nodes have capacity?
What is the capacity of any particular node?

This adds three new Operator metrics:

cilium_operator_ipam_available_ips
cilium_operator_ipam_used_ips
cilium_operator_ipam_needed_ips

As well, this seeks to deprecate the : cilium_operator_ipam_ips metric, aside from it being redundant it also is very confusing - the type=available does not track what you expect it to track.

Which are all labelled by "target_node" (i.e. the name of the CiliumNode).

How does this differ from the existing IPAM metrics?

There's a bit of a blind spot in the current set of metrics:

cilium_operator_ipam_ips: this metric is confusing, as well it should probably be separate metrics rather than a single one with classifying labels (CC: @chancez).
empty_interface_slots/interface_candidates: These two metrics can answer whether there is capacity left in the cluster but they aren't able to give any more detail about how much capacity is left, what nodes are full etc?
- As well, they may be misleading. For example: if you have 3 nodes each with 1 slot + 0 interface_candidates then its possible you might have: 3 possible ENIs X 10 Ips = 30 ... but if the nodes with the capacity have a different IP per interface limit then it could also be 10 x 50 = 500.

operator/ipam/metrics: Add new, more accurate, per-node available/used/needed metrics to deprecated existing ipam_ips metric.

maintainer-s-little-helper · 2023-04-06T04:55:33Z

Commit b98e92d31f6aca94e40acbdf2d089a3d5e1759bc does not contain "Signed-off-by".

Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin

maintainer-s-little-helper · 2023-04-06T04:56:10Z

Commit b98e92d31f6aca94e40acbdf2d089a3d5e1759bc does not contain "Signed-off-by".

Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin

tommyp1ckles · 2023-04-06T04:56:12Z

/test

gandro

Awesome, thanks! I focused on the IPAM aspect, that change looks good to me. A few minor things that stood out to me.

pkg/alibabacloud/eni/node.go

pkg/ipam/node_manager.go

pkg/ipam/metrics/metrics.go

christarazi

Nice work, clean code and easy to read commits!

I don't have any other comment besides a nit to follow and what Sebastian already pointed out. When reading some of the commits, I was initially confused by what "CNI pods" meant and then realized it meant "managed (by Cilium) pods". The latter is typically how we convey the relationship as you probably already know, but thought I'd call it out.

Updated metrics docs with new ipam metrics. Signed-off-by: Tom Hadlaw <tom.hadlaw@isovalent.com>

Mention the addition of ipam_{available,used,needed} metrics. As well, notify in upgrade guide about intended deprecation of ipam_ips metric. Signed-off-by: Tom Hadlaw <tom.hadlaw@isovalent.com>

Previously IsPrefixDelegationEnabled implementation on *ipam.Node would check if the receiver node pointer was nil. If so it defaulted to false. This is a bit dangerous as function on nil concrete types will still be invoked, whereas interface types will panic (i.e. because a nil interface doesn't actually have a function to lookup). This removes that code, and defers nil checking to the caller. Signed-off-by: Tom Hadlaw <tom.hadlaw@isovalent.com>

tommyp1ckles · 2023-04-27T18:57:13Z

/test

tommyp1ckles · 2023-04-27T23:24:45Z

@zacharysarah no problem, thanks for the review!

tommyp1ckles · 2023-04-27T23:30:11Z

@gandro @christarazi Made some changes to fix failing tests and lint issues.

zacharysarah

@tommyp1ckles Thanks for the updates! ✨ LGTM

Affects: * operator_ipam_available_ips * operator_ipam_used_ips * operator_ipam_needed_ips Which have the label "target_name", previously when a Node was deleted the metric continued to be emitted by the Prometheus exporter, leading to confusing sum() values across a cluster. Fixes changes in cilium#24776 Signed-off-by: Tom Hadlaw <tom.hadlaw@isovalent.com>

Affects: * operator_ipam_available_ips * operator_ipam_used_ips * operator_ipam_needed_ips Which have the label "target_name", previously when a Node was deleted the metric continued to be emitted by the Prometheus exporter, leading to confusing sum() values across a cluster. Fixes changes in #24776 Signed-off-by: Tom Hadlaw <tom.hadlaw@isovalent.com>

[ upstream commit 5b7b3bb ] Affects: * operator_ipam_available_ips * operator_ipam_used_ips * operator_ipam_needed_ips Which have the label "target_name", previously when a Node was deleted the metric continued to be emitted by the Prometheus exporter, leading to confusing sum() values across a cluster. Fixes changes in #24776 Signed-off-by: Tom Hadlaw <tom.hadlaw@isovalent.com> Signed-off-by: Gilberto Bertin <jibi@cilium.io>

[ upstream commit 5b7b3bb ] Affects: * operator_ipam_available_ips * operator_ipam_used_ips * operator_ipam_needed_ips Which have the label "target_name", previously when a Node was deleted the metric continued to be emitted by the Prometheus exporter, leading to confusing sum() values across a cluster. Fixes changes in cilium#24776 Signed-off-by: Tom Hadlaw <tom.hadlaw@isovalent.com> Signed-off-by: Gilberto Bertin <jibi@cilium.io>

Remove `cilium_operator_ipam_ips` and `cilium_operator_ipam_available_interfaces` IPAM metrics that have been deprecated and marked for deletion respectively since 1.15 and 1.14. Followup to #21800 Followup to #24776 Signed-off-by: Hadrien Patte <hadrien.patte@datadoghq.com>

maintainer-s-little-helper bot added dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Apr 6, 2023

tommyp1ckles force-pushed the pr/tp/better-eni-capacity-metrics branch from b98e92d to 0f6ff5f Compare April 6, 2023 04:56

tommyp1ckles force-pushed the pr/tp/better-eni-capacity-metrics branch from 0f6ff5f to 56ab89f Compare April 20, 2023 01:04

maintainer-s-little-helper bot removed the dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. label Apr 20, 2023

tommyp1ckles force-pushed the pr/tp/better-eni-capacity-metrics branch 2 times, most recently from 64d7c15 to 60c3c86 Compare April 20, 2023 04:36

tommyp1ckles changed the title ~~capacitipam: add new metrics and accounting for total node addr capac…~~ ipam: add metrics to track per node capacity Apr 20, 2023

tommyp1ckles added the kind/feature This introduces new functionality. label Apr 20, 2023

tommyp1ckles force-pushed the pr/tp/better-eni-capacity-metrics branch from add59a5 to 7339b89 Compare April 20, 2023 05:24

tommyp1ckles marked this pull request as ready for review April 20, 2023 05:25

tommyp1ckles requested review from a team as code owners April 20, 2023 05:25

tommyp1ckles requested review from chancez, christarazi and gandro April 20, 2023 05:25

tommyp1ckles added release-note/minor This PR changes functionality that users may find relevant to operating Cilium. sig/ipam labels Apr 20, 2023

maintainer-s-little-helper bot removed dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Apr 20, 2023

gandro reviewed Apr 20, 2023

View reviewed changes

pkg/alibabacloud/eni/node.go Outdated Show resolved Hide resolved

pkg/ipam/node_manager.go Outdated Show resolved Hide resolved

pkg/ipam/metrics/metrics.go Outdated Show resolved Hide resolved

christarazi approved these changes Apr 20, 2023

View reviewed changes

chancez approved these changes Apr 20, 2023

View reviewed changes

tommyp1ckles force-pushed the pr/tp/better-eni-capacity-metrics branch from 7339b89 to e7ed5e5 Compare April 27, 2023 05:07

tommyp1ckles requested a review from a team as a code owner April 27, 2023 05:21

tommyp1ckles added 3 commits April 27, 2023 11:56

documentation: update metrics docs with ipam available/used/needed.

f86d7a9

Updated metrics docs with new ipam metrics. Signed-off-by: Tom Hadlaw <tom.hadlaw@isovalent.com>

upgrade: update upgrade guide with mention of new metrics.

9722e43

Mention the addition of ipam_{available,used,needed} metrics. As well, notify in upgrade guide about intended deprecation of ipam_ips metric. Signed-off-by: Tom Hadlaw <tom.hadlaw@isovalent.com>

tommyp1ckles force-pushed the pr/tp/better-eni-capacity-metrics branch from 97ac4c1 to 0013798 Compare April 27, 2023 18:57

tommyp1ckles requested a review from zacharysarah April 27, 2023 23:24

zacharysarah approved these changes Apr 28, 2023

View reviewed changes

tommyp1ckles requested review from joestringer and nebril and removed request for joestringer and nebril April 28, 2023 04:14

tommyp1ckles added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Apr 28, 2023

christarazi approved these changes Apr 28, 2023

View reviewed changes

maintainer-s-little-helper bot removed the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Apr 28, 2023

tommyp1ckles added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Apr 28, 2023

joestringer merged commit cb8dbfb into cilium:main May 1, 2023

HadrienPatte mentioned this pull request Apr 2, 2026

ipam: Remove cilium_operator_ipam_ips and cilium_operator_ipam_available_interfaces IPAM metrics that have been deprecated and marked for deletion respectively since 1.15 and 1.14. #45134

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ipam: add metrics to track per node capacity#24776

ipam: add metrics to track per node capacity#24776
joestringer merged 7 commits intocilium:mainfrom
tommyp1ckles:pr/tp/better-eni-capacity-metrics

tommyp1ckles commented Apr 6, 2023 •

edited

Loading

Uh oh!

maintainer-s-little-helper bot commented Apr 6, 2023

Uh oh!

maintainer-s-little-helper bot commented Apr 6, 2023

Uh oh!

tommyp1ckles commented Apr 6, 2023

Uh oh!

gandro left a comment •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

christarazi left a comment •

edited

Loading

Uh oh!

tommyp1ckles commented Apr 27, 2023

Uh oh!

tommyp1ckles commented Apr 27, 2023

Uh oh!

tommyp1ckles commented Apr 27, 2023

Uh oh!

zacharysarah left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Conversation

tommyp1ckles commented Apr 6, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

How does this differ from the existing IPAM metrics?

Uh oh!

maintainer-s-little-helper bot commented Apr 6, 2023

Uh oh!

maintainer-s-little-helper bot commented Apr 6, 2023

Uh oh!

tommyp1ckles commented Apr 6, 2023

Uh oh!

gandro left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

christarazi left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tommyp1ckles commented Apr 27, 2023

Uh oh!

tommyp1ckles commented Apr 27, 2023

Uh oh!

tommyp1ckles commented Apr 27, 2023

Uh oh!

zacharysarah left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

tommyp1ckles commented Apr 6, 2023 •

edited

Loading

gandro left a comment •

edited

Loading

christarazi left a comment •

edited

Loading