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

Configurable tlsConfig and authorization for Prometheus ServiceMonitor #1025

Merged
merged 8 commits into from
May 10, 2024

Conversation

tomhjp
Copy link
Contributor

@tomhjp tomhjp commented May 9, 2024

Building on #931, this adds support for scraping metrics from Vault when its metrics listener uses TLS and requires authentication.

eyenx and others added 7 commits July 28, 2023 15:45
…okenFile for authentication

Signed-off-by: Toni Tauro <toni.tauro@adfinis.com>
…ting

Signed-off-by: Toni Tauro <toni.tauro@adfinis.com>
Co-authored-by: Tom Proctor <tomhjp@users.noreply.github.com>
Signed-off-by: Toni Tauro <toni.tauro@adfinis.com>
Signed-off-by: Toni Tauro <toni.tauro@adfinis.com>
@tomhjp tomhjp requested review from tvoran and benashz May 9, 2024 13:24
@tomhjp tomhjp requested a review from a team as a code owner May 9, 2024 13:24
Copy link
Contributor

@benashz benashz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had a few minor nits/suggestions for your consideration, after that 👍

templates/prometheus-servicemonitor.yaml Outdated Show resolved Hide resolved
templates/prometheus-servicemonitor.yaml Outdated Show resolved Hide resolved
test/acceptance/server-telemetry.bats Show resolved Hide resolved
@tomhjp
Copy link
Contributor Author

tomhjp commented May 10, 2024

Thanks!

@tomhjp tomhjp merged commit 534dddc into main May 10, 2024
8 checks passed
@tomhjp tomhjp deleted the pr-931-continuation branch May 10, 2024 07:51
@tvoran tvoran added this to the v0.28.1 milestone Jul 11, 2024
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