[logs/ad] Support file tailing config from k8s pod annotation#7176
Merged
[logs/ad] Support file tailing config from k8s pod annotation#7176
Conversation
ogaca-dd
approved these changes
Jan 18, 2021
Contributor
ogaca-dd
left a comment
There was a problem hiding this comment.
LGTM, just having a question.
ogaca-dd
approved these changes
Jan 20, 2021
This was referenced Jan 29, 2021
sergei-deliveroo
pushed a commit
to deliveroo/datadog-agent
that referenced
this pull request
Mar 24, 2021
This file contains hidden or 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
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?
Make #6883 slightly more generic by supporting annotation from both kubernetes (All runtime) & docker.
Motivation
Feature consistency.
Additional Notes
File path shall be relative to where the agent is running.
Add a slight modification to properly handle multiple logs config in kubernetes launcher, In that extend the following annotation will work :
ad.datadoghq.com/logapp.logs: '[{"type":"file","path":"/tmp/share/test.log"}]', will collect log from/tmp/share/test.logand the container log ifcontainer_collect_allis set to truead.datadoghq.com/logapp.logs: '[{"type":"file","path":"/tmp/share/test.log"},{"source":"my_source", "service":"my_service"}]', will collect log from/tmp/share/test.logand the container log with a custom source/service valuead.datadoghq.com/logapp.logs: '[{"type":"file","path":"/tmp/share/test.log"},{"source":"my_source", "service":"my_service", "type": "<CONTAINER_TYPE>"}]'(where<CONTAINER_TYPE>is the container runtime :cri-o,dockerorcontainerd) will collect log from/tmp/share/test.logand the container log with a custom source/service value if type is set to the correct container runtime.Note: source/service are set independently for each config.
Describe your test plan
Use the following pod annotation for testing.
Tests:
ad.datadoghq.com/<container>.logs: '[{"type":"file","path":"/tmp/share/test.log"},{"source":"my_source", "service":"my_service"}]'leads to properly tagged log from the container and that the file tailer actually starts.