-
Notifications
You must be signed in to change notification settings - Fork 101
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 prom scraper endpoint #251
Conversation
30ee792
to
e2247a8
Compare
@moleske can we think about merging this now that cloudfoundry/cf-deployment#970 is merged? |
Yes, we should merge this. I was previously waiting for ruby 3.1 things to be good and then the pipeline to be happy before merging. This is good to go whenever now |
/easycla |
This reverts commit ee0e1e5.
available Co-authored-by: Michael Oleske <moleske@pivotal.io> Co-authored-by: David Alvarado <alvaradoda@vmware.com>
46d3d23
to
bfd4a34
Compare
I hope it's okay to directly push into this branch. I tried this out in a cf foundation and I could verify that the metrics got scraped by the prom_scraper job and were forwarded to Loggregator. I removed all locations from the server config, which accepts the prom_scraper certs, except the metrics endpoint. Additionally I replaced the catch-all server name with the actual internal server name. Will this endpoint be called by other consumers from outside, which might use other server names rather than the internal one? If not, I think we don't need a catch-all server name here. |
I'm thrilled you're updating this branch! We have not been able to dedicate people to working on this due to shifting priorities. So please go ahead and update to get it working! |
73856c9
to
d68564a
Compare
- Remove unnecessary locations from nginx.conf.erb All locations removed from nginx config, for port which is only used for the metrics endpoint. Replaced catch-all servername with internal servername. - Adjust unit tests Put tests into correct context Fix naming of contexts (rubocop) - Adjust nginx.conf.erb template for better indentation and less blank lines - Improve scrape TLS file templates
d68564a
to
64c6cd6
Compare
Thanks for contributing to the
capi_release
. To speed up the process of reviewing your pull request please provide us with:One more attempt at #240
Now we don't set up prom scraper mtls if any scraper property is missing
When cloudfoundry/cf-deployment#970 is merged, we won't need to check if the property is set
I have viewed signed and have submitted the Contributor License Agreement
I have made this pull request to the
develop
branchI have run CF Acceptance Tests on bosh lite