Skip to content

Commit

Permalink
[datadog.conf] Fix Main section when enable_trace_agent is true (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
bflad authored and olivielpeau committed Mar 28, 2017
1 parent 5bceb77 commit 7a51416
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions templates/default/datadog.conf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -61,19 +61,6 @@ graphite_listen_port: <%= node['datadog']['graphite_port'] %>
histogram_aggregates: <%= node['datadog']['histogram_aggregates'] %>
histogram_percentiles: <%= node['datadog']['histogram_percentiles'] %>

<% if node['datadog']['enable_trace_agent'] == true -%>
## Trace settings
apm_enabled: true

[trace.sampler]
extra_sample_rate: <%= node['datadog']['extra_sample_rate'] %>
max_traces_per_second: <%= node['datadog']['max_traces_per_second'] %>

[trace.receiver]
receiver_port: <%= node['datadog']['receiver_port'] %>
connection_limit: <%= node['datadog']['connection_limit'] %>
<% end -%>

<% if node['datadog']['dogstatsd'] -%>
# ========================================================================== #
# DogStatsd configuration #
Expand Down Expand Up @@ -164,3 +151,16 @@ end
<% end -%>
<% end -%>
<% end -%>

<% if node['datadog']['enable_trace_agent'] == true -%>
## Trace settings
apm_enabled: true

[trace.sampler]
extra_sample_rate: <%= node['datadog']['extra_sample_rate'] %>
max_traces_per_second: <%= node['datadog']['max_traces_per_second'] %>

[trace.receiver]
receiver_port: <%= node['datadog']['receiver_port'] %>
connection_limit: <%= node['datadog']['connection_limit'] %>
<% end -%>

0 comments on commit 7a51416

Please sign in to comment.