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

Add ServiceMonitor config for Agent Envoy when enabled #30126

Merged
merged 1 commit into from Jan 22, 2024

Conversation

youngnick
Copy link
Contributor

This commit adds Prometheus config to scrape Envoy metrics from the Envoy port (default 9964) on the Agent when Envoy is enabled.

It uses the newer .Values.envoy section of the Helm chart, as we want to emphasize using that config regardless of where Envoy is running (in-agent or in a separate Daemonset).

Fixes: #28356

Envoy running inside the Cilium Agent may now be scraped by Prometheus when using Prometheus' ServiceMonitor objects.

@youngnick youngnick requested review from a team as code owners January 8, 2024 04:59
@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 Jan 8, 2024
@youngnick youngnick added the release-note/minor This PR changes functionality that users may find relevant to operating Cilium. label Jan 8, 2024
@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 Jan 8, 2024
@youngnick
Copy link
Contributor Author

/test

@PhilipSchmid
Copy link
Contributor

PhilipSchmid commented Jan 8, 2024

Will we be able to backport this to 1.14? AFAICT, we should, as it's a bug fix for the Helm chart. If so, 🤞 so that we get this into the next January 24 patch release.

@youngnick youngnick added backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. backport/1.15 This PR represents a backport for Cilium 1.15.x of a PR that was merged to main. needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch needs-backport/1.15 This PR / issue needs backporting to the v1.15 branch and removed backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. backport/1.15 This PR represents a backport for Cilium 1.15.x of a PR that was merged to main. labels Jan 8, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.14.6 Jan 8, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in v1.15.0-rc.1 Jan 8, 2024
@youngnick youngnick force-pushed the 28356-envoy-metrics branch 2 times, most recently from f686a9f to 10c0e72 Compare January 9, 2024 03:52
@youngnick
Copy link
Contributor Author

I've marked this for backport, it makes sense for me.

@youngnick
Copy link
Contributor Author

/test

Copy link
Contributor

@tommyp1ckles tommyp1ckles left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice, thanks @youngnick !

@youngnick
Copy link
Contributor Author

ci-ipsec-upgrade hit #27762.

@youngnick
Copy link
Contributor Author

/ci-ginkgo

@youngnick
Copy link
Contributor Author

Checking to see if it's the same two ginkgo jobs failing.

@youngnick
Copy link
Contributor Author

/ci-ginkgo

@youngnick
Copy link
Contributor Author

the Ginkgo check keeps failling at different steps for different reasons, I'll try one last time

@youngnick
Copy link
Contributor Author

/ci-ginkgo

@gentoo-root gentoo-root added this to Needs backport from main in 1.14.7 Jan 17, 2024
@gentoo-root gentoo-root removed this from Needs backport from main in 1.14.6 Jan 17, 2024
This commit adds Prometheus config to scrape Envoy metrics from
the Envoy port (default 9964) on the Agent when Envoy is enabled.

It uses the newer `.Values.envoy` section of the Helm chart, as
we want to emphasize using that config regardless of where Envoy
is running (in-agent or in a separate Daemonset).

Signed-off-by: Nick Young <nick@isovalent.com>
@youngnick
Copy link
Contributor Author

/test

@youngnick
Copy link
Contributor Author

/ci-e2e

@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 Jan 22, 2024
@youngnick youngnick added this pull request to the merge queue Jan 22, 2024
Merged via the queue into cilium:main with commit 3e09aa1 Jan 22, 2024
62 checks passed
@youngnick youngnick deleted the 28356-envoy-metrics branch January 22, 2024 09:33
@giorio94 giorio94 mentioned this pull request Jan 22, 2024
12 tasks
@giorio94 giorio94 added backport-pending/1.15 The backport for Cilium 1.15.x for this PR is in progress. and removed needs-backport/1.15 This PR / issue needs backporting to the v1.15 branch labels Jan 22, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from main to Backport pending to v1.15 in v1.15.0-rc.1 Jan 22, 2024
@giorio94 giorio94 mentioned this pull request Jan 22, 2024
11 tasks
@giorio94 giorio94 added backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. and removed needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch labels Jan 22, 2024
@github-actions github-actions bot added backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. and removed backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. labels Jan 25, 2024
@giorio94 giorio94 added backport-done/1.15 The backport for Cilium 1.15.x for this PR is done. and removed backport-pending/1.15 The backport for Cilium 1.15.x for this PR is in progress. labels Jan 29, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.15 to Backport done to v1.15 in v1.15.0-rc.1 Jan 29, 2024
@michi-covalent michi-covalent moved this from Needs backport from main to Backport done to v1.14 in 1.14.7 Feb 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. backport-done/1.15 The backport for Cilium 1.15.x for this PR is done. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/minor This PR changes functionality that users may find relevant to operating Cilium.
Projects
No open projects
1.14.7
Backport done to v1.14
v1.15.0-rc.1
Backport done to v1.15
Development

Successfully merging this pull request may close these issues.

Helm: cilium-envoy metrics endpoint not included in cilium-agent ServiceMonitor
5 participants