[http_check] Add no_proxy parameter (#309)

Author: olivielpeau

manifests/integrations/http_check.pp

@@ -48,23 +48,29 @@
 #       problematic SSL server certificates. To maintain backwards
 #       compatibility this defaults to false.
 #
-#  skip_event
+#   skip_event
 #       The (optional) skip_event parameter will instruct the check to not
 #       create any event to avoid duplicates with a server side service check.
 #       This defaults to True because this is being deprecated.
 #       (See https://github.com/DataDog/dd-agent/blob/master/checks/network_checks.py#L178-L180)
 #
-#  check_certificate_expiration
-#  days_warning
-#  days_critical
+#   no_proxy
+#       The (optional) no_proxy parameter would bypass any proxy settings enabled
+#       and attempt to reach the the URL directly.
+#       If no proxy is defined at any level, this flag bears no effect.
+#       Defaults to False.
+#
+#   check_certificate_expiration
+#   days_warning
+#   days_critical
 #       The (optional) check_certificate_expiration will instruct the check
 #       to create a service check that checks the expiration of the
 #       ssl certificate. Allow for a warning to occur when x days are
 #       left in the certificate, and alternatively raise a critical
 #       warning if the certificate is y days from the expiration date.
 #       The SSL certificate will always be validated for this additional
 #       service check regardless of the value of disable_ssl_validation
-# 
+#
 #   headers
 #       The (optional) headers parameter allows you to send extra headers
 #       with the request. This is useful for explicitly specifying the host
@@ -141,6 +147,7 @@
   $collect_response_time = true,
   $disable_ssl_validation = false,
   $skip_event = true,
+  $no_proxy  = false,
   $check_certificate_expiration = undef,
   $days_warning = undef,
   $days_critical = undef,
@@ -165,6 +172,7 @@
       'collect_response_time'        => $collect_response_time,
       'disable_ssl_validation'       => $disable_ssl_validation,
       'skip_event'                   => $skip_event,
+      'no_proxy'                     => $no_proxy,
       'check_certificate_expiration' => $check_certificate_expiration,
       'days_warning'                 => $days_warning,
       'days_critical'                => $days_critical,

spec/classes/datadog_agent_integrations_http_check_spec.rb

@@ -33,9 +33,10 @@
     it { should contain_file(conf_file).without_content(%r{collect_response_time: true}) }
     it { should contain_file(conf_file).without_content(%r{disable_ssl_validation: false}) }
     it { should contain_file(conf_file).without_content(%r{skip_event: }) }
+    it { should contain_file(conf_file).without_content(%r{no_proxy: }) }
     it { should contain_file(conf_file).without_content(%r{check_certificate_expiration: }) }
     it { should contain_file(conf_file).without_content(%r{days_warning: }) }
-    it { should contain_file(conf_file).without_content(%r{days_critical: }) }    
+    it { should contain_file(conf_file).without_content(%r{days_critical: }) }
     it { should contain_file(conf_file).without_content(%r{headers: }) }
     it { should contain_file(conf_file).without_content(%r{tags: }) }
   end
@@ -54,6 +55,7 @@
       collect_response_time: false,
       disable_ssl_validation: true,
       skip_event: true,
+      no_proxy: true,
       check_certificate_expiration: true,
       days_warning: 14,
       days_critical: 7,
@@ -71,6 +73,7 @@
     it { should contain_file(conf_file).without_content(%r{collect_response_time: true}) }
     it { should contain_file(conf_file).with_content(%r{disable_ssl_validation: true}) }
     it { should contain_file(conf_file).with_content(%r{skip_event: true}) }
+    it { should contain_file(conf_file).with_content(%r{no_proxy: true}) }
     it { should contain_file(conf_file).with_content(%r{check_certificate_expiration: true}) }
     it { should contain_file(conf_file).with_content(%r{days_warning: 14}) }
     it { should contain_file(conf_file).with_content(%r{days_critical: 7}) }

templates/agent-conf.d/http_check.yaml.erb

@@ -34,6 +34,9 @@ instances:
 <% if instance['skip_event'] -%>
     skip_event: <%= instance['skip_event'] %>
 <% end -%>
+<% if instance['no_proxy'] -%>
+    no_proxy: <%= instance['no_proxy'] %>
+<% end -%>
 <% if instance['check_certificate_expiration'] -%>
     check_certificate_expiration: <%= instance['check_certificate_expiration'] %>
 <% if instance['check_certificate_expiration'] == true -%>