Add IPv4-only configuration option #12632
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
4 tasks
kayayarai
approved these changes
Jul 29, 2022
hithwen
reviewed
Aug 9, 2022
Comment on lines
+80
to
+88
| if self.ipv4_only: | ||
| _, _, ipv4_list = socket.gethostbyname_ex(self.host) | ||
| self._addrs = [AddrTuple(ipv4_addr, socket.AF_INET) for ipv4_addr in ipv4_list] | ||
| else: | ||
| self._addrs = [ | ||
| AddrTuple(sockaddr[0], socket_type) | ||
| for (socket_type, _, _, _, sockaddr) in socket.getaddrinfo( | ||
| self.host, self.port, 0, 0, socket.IPPROTO_TCP | ||
| ) |
There was a problem hiding this comment.
Note:
IP6 support was introduced on https://github.com/DataDog/integrations-core/pull/11740/files#diff-e1afdae3cf81bdf12d2888a230f697bfd8eda2d5ab2e8d7267e30183986a636bR104
AddrTuple was introduced on https://github.com/DataDog/integrations-core/pull/12526/files#diff-e1afdae3cf81bdf12d2888a230f697bfd8eda2d5ab2e8d7267e30183986a636bR13
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.
What does this PR do?
Adds option to only check IPv4 addresses.
Motivation
A hostname may resolve to both IPv4 and IPv6 addresses despite the host lacking IPv6 connectivity. Enabling this option will check only IPv4 addresses and prevent false alerts from IPv6 addresses returning CRITICAL status due to "Network is unreachable" error returned from the socket.
Additional Notes
Also fixes the
has_ipv6_connectivity()helper function in the tests, which was silently failing in the CI due to an exception fromsocket.gethostname()not getting caught.Review checklist (to be filled by reviewers)
changelog/andintegration/labels attached