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

[Nginx] prometheus scrape annotations #471

Merged

Conversation

dannyk81
Copy link

This PR adds to the nginx DaemonSet and Deployment examples annotations that are required for Prometheus automatic discovery and scraping of the nginx ingress controller /metrics endpoint.

This fixed #464

@k8s-ci-robot
Copy link
Contributor

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://github.com/kubernetes/kubernetes/wiki/CLA-FAQ to sign the CLA.

Once you've signed, please reply here (e.g. "I signed it!") 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.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Mar 20, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@aledbf aledbf self-assigned this Mar 20, 2017
@dannyk81
Copy link
Author

I signed it!

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Mar 20, 2017
@aledbf
Copy link
Member

aledbf commented Mar 20, 2017

@dannyk81 please squash the commits

@coveralls
Copy link

Coverage Status

Coverage remained the same at 43.146% when pulling 97c4687 on dannyk81:nginx/prometheus-scrape-annotations into 62070a1 on kubernetes:master.

Allow Prometheus automatic discovery of nginx metrics endpoint

Fixed kubernetes#464
@dannyk81 dannyk81 force-pushed the nginx/prometheus-scrape-annotations branch from 97c4687 to 6a38a1a Compare March 21, 2017 00:18
@dannyk81
Copy link
Author

@aledbf done, sorry about that 👍

@aledbf
Copy link
Member

aledbf commented Mar 21, 2017

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 21, 2017
@coveralls
Copy link

Coverage Status

Coverage remained the same at 43.146% when pulling 6a38a1a on dannyk81:nginx/prometheus-scrape-annotations into 62070a1 on kubernetes:master.

@aledbf aledbf merged commit 1739327 into kubernetes:master Mar 21, 2017
@aledbf
Copy link
Member

aledbf commented Mar 21, 2017

@dannyk81 thanks!

@dannyk81
Copy link
Author

My pleasure 😊

Thanks for merging this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[nginx] help with setting up metrics collection with Prometheus
5 participants