Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added logs configuration #439

Merged
merged 3 commits into from
Jun 15, 2018
Merged

Added logs configuration #439

merged 3 commits into from
Jun 15, 2018

Conversation

ajacquemot
Copy link
Collaborator

@ajacquemot ajacquemot commented Jun 14, 2018

What does this PR do?

Added the possibility to enable logs collection and to add logs integration configuration.

Motivation

Be able to configure the agent to collect logs with Puppet

Additional Notes

This should solve #382

@ajacquemot ajacquemot requested a review from a team June 14, 2018 12:12
@ajacquemot ajacquemot force-pushed the ajacquemot/logs branch 3 times, most recently from 0e6c474 to 5c0a1b7 Compare June 14, 2018 16:35
@truthbk truthbk self-assigned this Jun 15, 2018
Copy link
Member

@truthbk truthbk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. Nice stuff! 👍

@@ -528,6 +538,10 @@
'scrub_args' => $scrub_args,
'custom_sensitive_words' => $custom_sensitive_words,
},
'logs_enabled' => $logs_enabled,
'logs_config' => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a note, this isn't documented in the config_template.yaml in the datadog-agent repo. Is that intentional or oversight?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a good point, opening a PR right now, thanks

@ajacquemot ajacquemot merged commit f11d8f1 into master Jun 15, 2018
@ajacquemot ajacquemot deleted the ajacquemot/logs branch June 15, 2018 12:04
@truthbk truthbk added this to the 2.3.0 milestone Jul 11, 2018
@NoodlesNZ NoodlesNZ mentioned this pull request Jul 12, 2018
cegeka-jenkins pushed a commit to cegeka/puppet-datadog_agent that referenced this pull request Apr 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants