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
Merged

Conversation

bflad
Copy link
Contributor

@bflad bflad commented Mar 28, 2017

Simplest fix for #418.

@degemer degemer requested a review from olivielpeau March 28, 2017 16:02
@degemer degemer added the bug label Mar 28, 2017
@degemer degemer added this to the 2.9.1 milestone Mar 28, 2017
@degemer
Copy link
Member

degemer commented Mar 28, 2017

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

Copy link
Member

@olivielpeau olivielpeau left a comment

Choose a reason for hiding this comment

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

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]
Copy link
Member

Choose a reason for hiding this comment

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

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?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've pushed up that change!

Copy link
Member

@olivielpeau olivielpeau left a comment

Choose a reason for hiding this comment

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

Perfect, thanks @bflad!

@olivielpeau olivielpeau merged commit 7a51416 into DataDog:master Mar 28, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants