add no_proxy option

DataDog · Jul 13, 2018 · 66382dc · 66382dc
1 parent 6c1722c
commit 66382dc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -296,6 +296,7 @@
 default['datadog']['web_proxy']['user'] = nil
 default['datadog']['web_proxy']['password'] = nil
 default['datadog']['web_proxy']['skip_ssl_validation'] = nil # accepted values 'yes' or 'no'
+default['datadog']['web_proxy']['no_proxy'] = nil
 
 # dogstatsd
 default['datadog']['dogstatsd'] = true

diff --git a/templates/default/datadog.yaml.erb b/templates/default/datadog.yaml.erb
@@ -37,6 +37,7 @@ if node['datadog']['web_proxy']['host']
   user = node['datadog']['web_proxy']['user']
   password = node['datadog']['web_proxy']['password']
   scheme = ""
+  no_proxy = node['datadog']['web_proxy']['no_proxy']
 
   unless host.start_with?('http://') or host.start_with?('https://')
     scheme = 'http://'
@@ -136,6 +137,10 @@ if !http_proxy.nil?
   }
 end
 
+if !no_proxy.nil?
+  agent_config['proxy']['no_proxy'] = no_proxy
+end
+
 ## Trace agent options ##
 apm_config = {
   enabled: node['datadog']['enable_trace_agent'],