[docker/hostname] improve get_hostname for containers #3116
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
|
We first need to make sure that the issue this code was fixing - #2753 - cannot happen anymore. |
|
I believe this was fixing an issue where the agent couldn't reach the local kubelet due to the hostname not being routable. #3142 introduces new methods to reach kubelet so it should be fine. Let's just wait on it to be merged. |
hkaj
force-pushed
the
haissam/improve-get_hostname-for-docker
branch
from
17ce742 to
dd4d769
Compare
degemer
reviewed
Feb 7, 2017
utils/dockerutil.py
Outdated
|
|
||
| if self.hostname is not None: | ||
| # Use cache | ||
| return self.hostname | ||
| if not should_resolve or is_resolvable(self.hostname): |
There was a problem hiding this comment.
This line can raise an uncaught error if the hostname is not resolvable.
hkaj
force-pushed
the
haissam/improve-get_hostname-for-docker
branch
2 times, most recently
from
0558fbf to
6516ce4
Compare
When the agent is containerized it makes sense to use docker info's Name as the hostname even if it doesn't resolve. Because otherwise the agent fallsback to the container short ID which is not really helpful.
hkaj
force-pushed
the
haissam/improve-get_hostname-for-docker
branch
from
6516ce4 to
579893d
Compare
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.
Note: Please remember to review the Datadog Contribution Guidelines
if you have not yet done so.
What does this PR do?
When the agent is containerized it makes sense to use
docker info's Name as the hostname even if it doesn't resolve.
Because otherwise the agent falls back to the container short ID
which is not really helpful.
This PR drops the resolvability check for the name.
Motivation
Fixing DataDog/docker-dd-agent#139
Testing Guidelines
An overview on testing
is available in our contribution guidelines.