[dns_check] Allow querying a custom record type #2653
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -5,3 +5,7 @@ instances: | |||
| - hostname: www.example.org | |||
| nameserver: 127.0.0.1 | |||
| timeout: 8 | |||
|
|
|||
| # Specify an (optional) `record_type` to customize the record type | |||
| # queried by the check | |||
There was a problem hiding this comment.
maybe specify that the default is A record to avoid any confusuion?
|
one small comment and then |
olivielpeau
force-pushed
the
olivielpeau/dns-custom-record-type
branch
from
962e050 to
fca4ef5
Compare
|
Thanks @hkaj! Addressed your comment, I'll merge once the CI passes |
| @@ -51,12 +51,14 @@ def query_dns(self, instance, timeout): | |||
| if nameserver is not None: | |||
| resolver.nameservers = [nameserver] | |||
|
|
|||
| record_type = instance.get('record_type', 'A') | |||
|
|
|||
| status = AgentCheck.CRITICAL | |||
| start_time = time.time() | |||
| try: | |||
| self.log.debug('Resolving hostname %s...' % hostname) | |||
There was a problem hiding this comment.
should we debug also record_type?
New `record_type` optional parameter in the configuration. Along with tests: runs of the check in `test_invalid_config` now reload the config correctly and test that the expected exception is raised.
olivielpeau
force-pushed
the
olivielpeau/dns-custom-record-type
branch
from
fca4ef5 to
2fae52d
Compare
|
👍 |
|
Thanks! Merging |
truthbk
pushed a commit
that referenced
this pull request
Aug 10, 2016
New `record_type` optional parameter in the configuration. Along with tests: runs of the check in `test_invalid_config` now reload the config correctly and test that the expected exception is raised.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
New
record_typeoptional parameter in the configuration.Along with tests: runs of the check in
test_invalid_confignow reloadthe config correctly and test that the expected exception is raised.