[AD] Add docker labels as tags in AD #3564
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
hkaj
force-pushed
the
haissam/ad-docker-lbls
branch
from
8c83a8a
to
ba514ca
Compare
hkaj
force-pushed
the
haissam/ad-docker-lbls
branch
from
ba514ca
to
0ce92d4
Compare
hkaj
force-pushed
the
haissam/ad-docker-lbls
branch
from
0ce92d4
to
21c9092
Compare
xvello
suggested changes
Nov 2, 2017
datadog.conf.example
Outdated
| # Docker labels as tags | ||
| # We can extract docker labels and add them as tags to all metrics reported by service discovery. | ||
| # All you have to do is supply a comma-separated list of label names to extract from containers when found. | ||
| # |
There was a problem hiding this comment.
I'd add a reference to docker_daemon's collect_labels_as_tags for docker/kube metrics
| for test in no_label_test_data: | ||
| self.assertEqual(test[1], DockerUtil().extract_container_tags(test[0], [])) | ||
|
|
||
| for test in labeled_test_data: |
utils/dockerutil.py
Outdated
| """Returns a list of tags based on a container and a label name list""" | ||
| tags = [] | ||
| labels = ctr.get('Config', {}).get('Labels', {}) | ||
| for lbl_name, lbl_val in labels.iteritems(): |
There was a problem hiding this comment.
Just to be extra-safe, let's add a if not labels: return tags, I had the issue of a Config/Env being present but None instead of missing. See #3528
xvello
changed the title
|
unrelated CI failure, merging. |
olivielpeau
pushed a commit
that referenced
this pull request
Nov 3, 2017
* [AD] Add docker labels as tags * Add tests * address review comments
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?
Add docker labels as tags for auto discovery.
Motivation
User request.
Testing Guidelines
Added unit tests for it.
Additional Notes
Anything else we should know when reviewing?