[http_check] allow redirects + check_certifica_expiration improvement (DataDog#282)

* add check_certifications_expiration and alow_redirects parameters

* Add tags check_certificate_expiration and ignore_ssl_warning in http_check

[http_check] fixing template typo.

Author: truthbk

manifests/integrations/http_check.pp

@@ -152,24 +152,24 @@
 
   if !$instances and $url {
     $_instances = [{
-      'sitename'                 => $sitename,
-      'url'                      => $url,
-      'username'                 => $username,
-      'password'                 => $password,
-      'timeout'                  => $timeout,
-      'threshold'                => $threshold,
-      'window'                   => $window,
-      'content_match'            => $content_match,
-      'include_content'          => $include_content,
-      'collect_response_time'    => $collect_response_time,
-      'disable_ssl_validation'   => $disable_ssl_validation,
-      'skip_event'              => $skip_event,
+      'sitename'                     => $sitename,
+      'url'                          => $url,
+      'username'                     => $username,
+      'password'                     => $password,
+      'timeout'                      => $timeout,
+      'threshold'                    => $threshold,
+      'window'                       => $window,
+      'content_match'                => $content_match,
+      'include_content'              => $include_content,
+      'collect_response_time'        => $collect_response_time,
+      'disable_ssl_validation'       => $disable_ssl_validation,
+      'skip_event'                   => $skip_event,
       'check_certificate_expiration' => $check_certificate_expiration,
-      'days_warning'              => $days_warning,
-      'days_critical'              => $days_critical,
-      'headers'                  => $headers,
-      'tags'                     => $tags,
-      'contact'                  => $contact,
+      'days_warning'                 => $days_warning,
+      'days_critical'                => $days_critical,
+      'headers'                      => $headers,
+      'tags'                         => $tags,
+      'contact'                      => $contact,
     }]
   } elsif !$instances{
     $_instances = []

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

@@ -36,13 +36,15 @@ instances:
 <% end -%>
 <% if instance['check_certificate_expiration'] -%>
     check_certificate_expiration: <%= instance['check_certificate_expiration'] %>
-<% end -%>
+<% if instance['check_certificate_expiration'] == true -%>
 <% if instance['days_warning'] -%>
     days_warning: <%= instance['days_warning'] %>
 <% end -%>
 <% if instance['days_critical'] -%>
     days_critical: <%= instance['days_critical'] %>
 <% end -%>
+<% end -%>
+<% end -%>
 <% if instance['headers'] and ! instance['headers'].empty? -%>
     headers:
   <%- Array(instance['headers']).each do |header| -%>
@@ -51,6 +53,9 @@ instances:
     <%- end -%>
   <%- end -%>
 <% end -%>
+<% if instance['allow_redirects'] -%>
+    allow_redirects: <%= instance['allow_redirects'] %>
+<% end -%>
 <% if instance['tags'] and ! instance['tags'].empty? -%>
     tags:
   <%- Array(instance['tags']).each do |tag| -%>