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

Adds support for prom_scraper metrics endpoint #240

Merged
merged 1 commit into from
May 31, 2022

Conversation

klakin-pivotal
Copy link
Contributor

NOTE: This PR is dependent on this PR to cloud_controller_ng: cloudfoundry/cloud_controller_ng#2781

This PR contains the changes required to support the work in Cloud Controller NG's PR 2781, linked to above. You could merge this PR before 2781 is merged, and no harm would be done, but it would be best to not do that.

Notable technical details:

This commit adds two new Bosh Release configuration parameters: cc.prom_metrics_server_tls_port and cc.prom_scraper_tls. They are fed to a new "server" in the release's nginx configuration. For more details, check out the commit message and code changes.

  • I have viewed signed and have submitted the Contributor License Agreement

  • I have made this pull request to the develop branch

  • I have run CF Acceptance Tests on bosh lite

I have not run CF Acceptance Tests, but I have tested that the release can deploy multiple instances of the Dora CF App, both with cf-deployment and with VMware Tanzu.

@klakin-pivotal
Copy link
Contributor Author

@moleske
Copy link
Member

moleske commented Apr 28, 2022

You can remove the submodule update from this pr. There is a pipeline job that auto bumps the submodule for us

* Nginx has been configured to listen on a second port (controlled by
`cc.prom_metrics_server_tls_port`) and use a special set of certs
(controlled by `cc.prom_scraper_tls`) to communicate with the
`prom_scraper`. `prom_scraper` requires that the certificate of the
server that it's scraping is signed with the same CA cert that every
other endpoint in the deployment that it is scraping is signed with. So
-rather than massively complicate configuration for our existing
server configuration- we have decided to create a second server with its
own configuration.

Co-authored-by: Kenneth Lakin <[email protected]>
Co-authored-by: Michael Oleske <[email protected]>
Co-authored-by: David Alvarado <[email protected]>
Co-authored-by: Merric de Launey <[email protected]>
@klakin-pivotal
Copy link
Contributor Author

I think I've successfully removed the submodule update.

@MerricdeLauney MerricdeLauney merged commit 135f202 into develop May 31, 2022
@MerricdeLauney MerricdeLauney deleted the prometheus-metrics branch May 31, 2022 22:13
MerricdeLauney added a commit that referenced this pull request May 31, 2022
This change is dependent on cloudfoundry/cf-deployment#970

This reverts commit 135f202, reversing
changes made to 577b772.
MerricdeLauney added a commit that referenced this pull request Jun 1, 2022
…metrics""

This reverts commit dd81216.
Once cloudfoundry/cf-deployment#970 has been
pulled in can we re-introduce this change
MerricdeLauney added a commit that referenced this pull request Jun 28, 2022
…metrics""

This reverts commit dd81216.
Once cloudfoundry/cf-deployment#970 has been
pulled in can we re-introduce this change
MerricdeLauney added a commit that referenced this pull request Jun 30, 2022
Revert "Revert "Revert "Merge pull request #240 from cloudfoundry/prometheus-metrics"""

This reverts commit fc7cae6.
@moleske moleske mentioned this pull request Jul 11, 2022
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants