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 [Main] section header to end of datadog.conf enable_trace_agent template conditional #419

Merged
merged 2 commits into from Mar 28, 2017

Conversation

Projects
None yet
3 participants
@bflad
Copy link
Contributor

bflad commented Mar 28, 2017

Simplest fix for #418.

@degemer degemer requested a review from olivielpeau Mar 28, 2017

@degemer degemer added the bug label Mar 28, 2017

@degemer degemer added this to the 2.9.1 milestone Mar 28, 2017

@degemer

This comment has been minimized.

Copy link
Member

degemer commented Mar 28, 2017

Thanks for reporting and submitting a fix @bflad ! We'll review it shortly (today or tomorrow).

@olivielpeau
Copy link
Member

olivielpeau left a comment

LGTM, thanks @bflad!

I've double-checked that the ini parser used by the Agent merges duplicate sections nicely

@@ -72,6 +72,8 @@ max_traces_per_second: <%= node['datadog']['max_traces_per_second'] %>
[trace.receiver]
receiver_port: <%= node['datadog']['receiver_port'] %>
connection_limit: <%= node['datadog']['connection_limit'] %>

[Main]

This comment has been minimized.

Copy link
@olivielpeau

olivielpeau Mar 28, 2017

Member

Actually this works, but I think it would be more human-readable to have the whole Main section in one block.

Could you move the whole trace-agent-related part of the config at the end of the file so that the Main section is not split?

This comment has been minimized.

Copy link
@bflad

bflad Mar 28, 2017

Author Contributor

I've pushed up that change!

@olivielpeau
Copy link
Member

olivielpeau left a comment

Perfect, thanks @bflad!

@olivielpeau olivielpeau merged commit 7a51416 into DataDog:master Mar 28, 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.