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

Add TLS and basic authentication #8316

Merged
merged 2 commits into from
Dec 29, 2020
Merged

Add TLS and basic authentication #8316

merged 2 commits into from
Dec 29, 2020

Conversation

roidelapluie
Copy link
Member

@roidelapluie roidelapluie commented Dec 25, 2020 •
edited
Loading

No description provided.

@roidelapluie roidelapluie marked this pull request as ready for review December 25, 2020 14:33
@roidelapluie
Copy link
Member Author

Cc @SuperQ

@SuperQ
Copy link
Member

SuperQ commented Dec 25, 2020

Nice, do we want to mark this as experimental for the first release?

@SuperQ SuperQ mentioned this pull request Dec 25, 2020
Closed
brian-brazil
brian-brazil reviewed Dec 25, 2020
View reviewed changes
docs/configuration/configuration.md Outdated Show resolved Hide resolved
docs/configuration/configuration.md Outdated Show resolved Hide resolved
@roidelapluie
Copy link
Member Author

Nice, do we want to mark this as experimental for the first release?

The flag in the node_exporter is --web.config, the config file in prometheus is --config.file.

Do we want to fix the exporter-toolkit to use --web.config.file ?

@SuperQ
Copy link
Member

SuperQ commented Dec 25, 2020

Maybe func AddExperimentalFlags(a *kingpin.Application)?

@roidelapluie
Copy link
Member Author

I realise that we probably want to add in the toolkit a way to validate the config early and fail before launching the tsdb.

The toolkit will also need to take the certificate relatively to the config file, like in Prometheus.

@roidelapluie roidelapluie mentioned this pull request Dec 26, 2020
Merged
@roidelapluie
Copy link
Member Author

Pending prometheus/exporter-toolkit#22

@roidelapluie
Copy link
Member Author

This is ready for a second round of reviews.

cc @beorn7 for awareness, as you are sheperd for next week release.

@beorn7
Copy link
Member

beorn7 commented Dec 28, 2020

Yeah, would be great to get this in. Remember that the planned date for cutting the RC is already in 2 days…

brian-brazil
brian-brazil reviewed Dec 28, 2020
View reviewed changes
docs/configuration/https.md Show resolved Hide resolved
docs/configuration/https.md Outdated Show resolved Hide resolved
@SuperQ @roidelapluie
Listen on web early in startup
5055dfb 
Avoid starting up components like the TSDB if we can't bind
to the web listening port.

Signed-off-by: Ben Kochie <superq@gmail.com>
@roidelapluie
Copy link
Member Author

Updated and ready for a new review.

brian-brazil
brian-brazil reviewed Dec 28, 2020
View reviewed changes
Copy link
Contributor

@brian-brazil brian-brazil left a comment

Choose a reason for hiding this comment

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

👍

I think you might need a rebase.

docs/stability.md Outdated Show resolved Hide resolved
@roidelapluie
Add TLS and basic authentication
5b4f46a 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
SuperQ
SuperQ approved these changes Dec 29, 2020
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.

LGTM

@roidelapluie roidelapluie merged commit 2f54aa0 into prometheus:master Dec 29, 2020
@roidelapluie roidelapluie mentioned this pull request Dec 30, 2020
Closed
@roidelapluie roidelapluie mentioned this pull request Jan 28, 2021
Closed
@tejaswiniVadlamudi tejaswiniVadlamudi mentioned this pull request May 30, 2022
Open
@rfratto rfratto mentioned this pull request Apr 23, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@brian-brazil brian-brazil brian-brazil left review comments

@SuperQ SuperQ SuperQ approved these changes

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

Successfully merging this pull request may close these issues.
4 participants
@roidelapluie @SuperQ @beorn7 @brian-brazil