-
Notifications
You must be signed in to change notification settings - Fork 4.7k
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
[addons/networking.cilium.io] enable prometheus scraping #11514
[addons/networking.cilium.io] enable prometheus scraping #11514
Conversation
Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). 📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA. It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
Welcome @ulfox! |
Hi @ulfox. Thanks for your PR. I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
signed |
When EnablePromethesMetrics is enabled the required metrics endpoints are exposed but no annotations is included in the agents. This commit includes the prometheus.io/scrape and prometheus.io/port annotations that prometheus scrappers can use for auto-discovery Co-authored-by: tchatzig <t.chatzigeorgiou@thebeat.co>
/ok-to-test |
upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.8.yaml.template
Outdated
Show resolved
Hide resolved
upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.9.yaml.template
Outdated
Show resolved
Hide resolved
upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.10.yaml.template
Outdated
Show resolved
Hide resolved
…1.12-v1.8.yaml.template Co-authored-by: John Gardiner Myers <jgmyers@proofpoint.com>
…1.12-v1.9.yaml.template Co-authored-by: John Gardiner Myers <jgmyers@proofpoint.com>
…1.16-v1.10.yaml.template Co-authored-by: John Gardiner Myers <jgmyers@proofpoint.com>
/retest |
@@ -417,6 +417,12 @@ spec: | |||
# gets priority scheduling. | |||
# https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/ | |||
scheduler.alpha.kubernetes.io/critical-pod: "" | |||
# Annotation required for prometheus auto-discovery scraping | |||
# https://docs.cilium.io/en/v1.9/operations/metrics/#installation | |||
{{ if .EnablePrometheusMetrics }} |
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.
This is outside of any {{ with .Networking.Cilium }}
block.
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.
Thanks!
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: johngmyers The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
…4-upstream-release-1.21 Automated cherry pick of #11514: enable prometheus scraping
When EnablePromethesMetrics is enabled the
required metrics endpoints are exposed but
no annotations is included in the agents.
This commit includes the prometheus.io/scrape
and prometheus.io/port annotations that
prometheus scrappers can use for auto-discovery
Co-authored-by: tchatzig t.chatzigeorgiou@thebeat.co