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
metrics: Disable prometheus metrics by default #31144
Merged
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
joestringer
added
release-note/bug
This PR fixes an issue in a previous release of Cilium.
affects/v1.14
This issue affects v1.14 branch
affects/v1.15
This issue affects v1.15 branch
needs-backport/1.15
This PR / issue needs backporting to the v1.15 branch
labels
Mar 4, 2024
3 tasks
/test |
Prior to commit c49ef45, the prometheus metrics server was disabled by default in Cilium. Typically we would expect users to specify in helm both `prometheus.enabled` and `prometheus.port` to determine how to configure the prometheus server to ensure that the prometheus port doesn't also conflict with other services that the user is running on their nodes in their clusters. With the refactor in the aforementioned commit, the default was set to `:9962`. This means that even if the user installed Cilium without prometheus settings, or explicitly configured helm with `prometheus.enabled: false`, the prometheus metrics server would be enabled. This patch reverts the default back to the pre-v1.14 default. Fixes: c49ef45 ("metrics: Modularize daemon metrics registry") Signed-off-by: Joe Stringer <joe@cilium.io>
joestringer
force-pushed
the
pr/joe/metrics-default
branch
from
March 5, 2024 05:55
ce34d10
to
e00e5b3
Compare
/test |
chancez
approved these changes
Mar 6, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, the default port is still configured in the helm values, gated by prometheus.enabled
so this does look like it should fix the problem and retain compatibility on the helm side as well.
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
Mar 6, 2024
jibi
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
Mar 12, 2024
jibi
added
needs-backport/1.15
This PR / issue needs backporting to the v1.15 branch
and removed
backport-pending/1.15
The backport for Cilium 1.15.x for this PR is in progress.
labels
Mar 13, 2024
jibi
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
Mar 13, 2024
github-actions
bot
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
Mar 16, 2024
jrajahalme
moved this from Needs backport from main
to Backport done to v1.15
in 1.15.3
Mar 26, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
affects/v1.14
This issue affects v1.14 branch
affects/v1.15
This issue affects v1.15 branch
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/bug
This PR fixes an issue in a previous release of Cilium.
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.
Prior to commit c49ef45, the prometheus metrics server was
disabled by default in Cilium. Typically we would expect users to
specify in helm both
prometheus.enabled
andprometheus.port
todetermine how to configure the prometheus server to ensure that the
prometheus port doesn't also conflict with other services that the user
is running on their nodes in their clusters.
With the refactor in the aforementioned commit, the default was set to
:9962
. This means that even if the user installed Cilium withoutprometheus settings, or explicitly configured helm with
prometheus.enabled: false
, the prometheus metrics server would beenabled. There is no way to turn it off via Helm currently.
This patch reverts the default back to the pre-v1.14 default.
Fixes: c49ef45 ("metrics: Modularize daemon metrics registry")
Fixes: #31135