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

Add service discovery attributes and datadog.conf template to enable #420

Merged
merged 2 commits into from Mar 31, 2017

Conversation

Projects
None yet
2 participants
@bflad
Copy link
Contributor

bflad commented Mar 28, 2017

Semi-related to #418, this adds the service discovery attributes as well as keeps them above the trace agent configuration which breaks the [Main] datadog.conf configuration section.

@olivielpeau olivielpeau added the feature label Mar 28, 2017

@olivielpeau olivielpeau added this to the 2.10.0 milestone Mar 28, 2017

@olivielpeau
Copy link
Member

olivielpeau left a comment

Looks good, thanks @bflad!

@olivielpeau

This comment has been minimized.

Copy link
Member

olivielpeau commented Mar 29, 2017

Could you fix the conflicts @bflad? :)

@bflad

This comment has been minimized.

Copy link
Contributor Author

bflad commented Mar 29, 2017

Updated from the release changes yesterday. 😄

@olivielpeau

This comment has been minimized.

Copy link
Member

olivielpeau commented Mar 31, 2017

Thanks! Merging

@olivielpeau olivielpeau merged commit 628d904 into DataDog:master Mar 31, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.