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

Add support for DoT to DNS probes #643

Merged
merged 1 commit into from
Jun 17, 2020
Merged

Conversation

edevil
Copy link
Contributor

@edevil edevil commented Jun 17, 2020

This adds a new DNS probe option dns_over_tls to enable DoT on DNS probes.

@brian-brazil
Copy link
Contributor

Hmm, I can see this being confusing if it silently doesn't do anything when UDP is asked for.

Docs also need updating.

@edevil
Copy link
Contributor Author

edevil commented Jun 17, 2020

@brian-brazil do you want me to error out when UDP and DoT is chosen? I’ll update the docs shortly.

@brian-brazil
Copy link
Contributor

An error would do it.

@edevil edevil force-pushed the add_dot branch 2 times, most recently from 0210007 to df4e7b5 Compare June 17, 2020 13:43
@edevil
Copy link
Contributor Author

edevil commented Jun 17, 2020

@brian-brazil Added error case, and docs.

CONFIGURATION.md Outdated
@@ -153,6 +153,9 @@ tls_config:

[ transport_protocol: <string> | default = "udp" ] # udp, tcp

# Whether to use DNS over TLS. This only makes sense with TCP transport protocol.
Copy link
Contributor

Choose a reason for hiding this comment

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

This only works with TCP.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

@brian-brazil brian-brazil merged commit fd9c05c into prometheus:master Jun 17, 2020
@brian-brazil
Copy link
Contributor

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.

2 participants