Merge pull request #100 from coosh/non-local-traffic

Add support for non_local_traffic
DataDog · Mar 20, 2014 · 1457172 · 1457172
2 parents 7d2d3e2 + df3b691
commit 1457172
Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -63,6 +63,10 @@
 # to the /tmp/ directory.
 default['datadog']['debug'] = false
 
+# Default to false to non_local_traffic
+# See: https://github.com/DataDog/dd-agent/wiki/Network-Traffic-and-Proxy-Configuration
+default['datadog']['non_local_traffic'] = false
+
 # How often you want the agent to collect data, in seconds. Any value between
 # 15 and 60 is a reasonable interval.
 default['datadog']['check_freq'] = 15

diff --git a/templates/default/datadog.conf.erb b/templates/default/datadog.conf.erb
@@ -16,6 +16,10 @@ proxy_user: <%= node['datadog']['web_proxy']['user'] %>
 proxy_password: <%= node['datadog']['web_proxy']['password'] %>
 <% end -%>
 
+<% if node['datadog']['non_local_traffic'] == true %>
+non_local_traffic: true
+<% end -%>
+
 <% if !node['datadog']['dogstreams'].empty? -%>
 dogstreams: <%= node['datadog']['dogstreams'].join(', ') %>
 <% end -%>