[go: nahoru, domu]
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.

Sign up for GitHub

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

Jump to bottom

Allow passing of TLS certificates inline #158

Merged
merged 5 commits into from
Jul 14, 2023
Merged

Allow passing of TLS certificates inline #158

merged 5 commits into from
Jul 14, 2023

Conversation

fayzal-g
Copy link
Contributor
@fayzal-g fayzal-g commented Jun 9, 2023 •
edited
Loading

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
SuperQ
SuperQ requested changes Jun 14, 2023
View reviewed changes
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
Pass TLS certs and keys inline
3b30409 
Signed-off-by: fayzal-g <fayzal.ghantiwala@grafana.com>
@fayzal-g
Change error msg
2d00d7b 
Signed-off-by: fayzal-g <fayzal.ghantiwala@grafana.com>
@fayzal-g
Use Secret type for key
953f8e3 
Signed-off-by: fayzal-g <fayzal.ghantiwala@grafana.com>
@fayzal-g
Update web-configuration docs
448bd14 
Signed-off-by: fayzal-g <fayzal.ghantiwala@grafana.com>
@fayzal-g
Make docs clearer
6192b91 
Signed-off-by: fayzal-g <fayzal.ghantiwala@grafana.com>
@fayzal-g
Copy link
Contributor Author

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

SuperQ
SuperQ approved these changes Jun 14, 2023
View reviewed changes
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
5 checks passed
@roidelapluie
Copy link
Member

Thanks!

@fayzal-g fayzal-g mentioned this pull request Jul 17, 2023
Open
@fayzal-g fayzal-g mentioned this pull request Aug 7, 2023
Merged
2 tasks
@blkperl blkperl mentioned this pull request Dec 8, 2023
Merged
@bboreham bboreham mentioned this pull request Jan 26, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperQ SuperQ SuperQ approved these changes

@roidelapluie roidelapluie Awaiting requested review from roidelapluie

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@fayzal-g @roidelapluie @SuperQ