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

Allow passing of TLS certificates inline #158

Merged
merged 5 commits into from
Jul 14, 2023

Conversation

fayzal-g
Copy link
Contributor

@fayzal-g fayzal-g commented Jun 9, 2023

Was suggested in #157

This PR allows the TLSCert, TLSKey and ClientCAs to be passed inline as a string as part of the TLSConfig. The contents of these is expected to be exactly the same as a file, a PEM-encoded sequence of bytes.

@fayzal-g fayzal-g force-pushed the pass-tls-config-inline branch 2 times, most recently from 33077e9 to 9864078 Compare June 14, 2023 09:19
@fayzal-g
Copy link
Contributor Author

cc @SuperQ

@SuperQ SuperQ requested a review from roidelapluie June 14, 2023 09:57
Copy link
Member

@SuperQ SuperQ left a comment

Choose a reason for hiding this comment

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

Please update /docs/web-configuration.md

fayzal-g added 4 commits June 14, 2023 13:18
Signed-off-by: fayzal-g <fayzal.ghantiwala@grafana.com>
Signed-off-by: fayzal-g <fayzal.ghantiwala@grafana.com>
Signed-off-by: fayzal-g <fayzal.ghantiwala@grafana.com>
Signed-off-by: fayzal-g <fayzal.ghantiwala@grafana.com>
@fayzal-g fayzal-g force-pushed the pass-tls-config-inline branch from 47a4047 to 448bd14 Compare June 14, 2023 12:18
Signed-off-by: fayzal-g <fayzal.ghantiwala@grafana.com>
@fayzal-g
Copy link
Contributor Author

Thanks. Now updated /docs/web-configuration.md

Copy link
Member

@SuperQ SuperQ left a comment

Choose a reason for hiding this comment

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

Thanks!

@fayzal-g
Copy link
Contributor Author

@SuperQ @roidelapluie Would it be possible to get this merged?

@fayzal-g
Copy link
Contributor Author

@roidelapluie Sorry for the double ping, but would love to use this upstream. Any chance you could take a look?

@fayzal-g fayzal-g changed the title Allow passing of TLS Settings inline Allow passing of TLS certificates inline Jul 4, 2023
@roidelapluie roidelapluie merged commit c1b76fe into prometheus:master Jul 14, 2023
@roidelapluie
Copy link
Member

Thanks!

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.

3 participants