[http_check] add support for http_check method and data (#518)

Author: Aramack

manifests/integrations/http_check.pp

@@ -12,6 +12,13 @@
 #   timeout
 #       The (optional) timeout in seconds.
 #
+#   method
+#    	The (optional) HTTP method. This setting defaults to GET, though many
+#    	other HTTP methods are supported, including POST and PUT.
+#   data
+#       The (optional) data option. Data should be a string or an array of
+#       key-value pairs and will be sent in the body of the request.
+#
 #   username
 #   password
 #       If your service uses basic authentication, you can optionally
@@ -154,6 +161,8 @@
   $username  = undef,
   $password  = undef,
   $timeout   = 1,
+  $method    = 'get',
+  $data      = undef,
   $threshold = undef,
   $window    = undef,
   $content_match = undef,
@@ -182,6 +191,8 @@
       'username'                     => $username,
       'password'                     => $password,
       'timeout'                      => $timeout,
+      'method'                       => $method,
+      'data'                         => $data,
       'threshold'                    => $threshold,
       'window'                       => $window,
       'content_match'                => $content_match,

spec/classes/datadog_agent_integrations_http_check_spec.rb

@@ -38,6 +38,7 @@
         it { should contain_file(conf_file).without_content(%r{username: }) }
         it { should contain_file(conf_file).without_content(%r{password: }) }
         it { should contain_file(conf_file).without_content(%r{timeout: 1}) }
+        it { should contain_file(conf_file).without_content(%r{data: }) }
         it { should contain_file(conf_file).without_content(%{threshold: }) }
         it { should contain_file(conf_file).without_content(%r{window: }) }
         it { should contain_file(conf_file).without_content(%r{content_match: }) }
@@ -61,6 +62,8 @@
           username: 'foouser',
           password: 'barpassword',
           timeout: 123,
+          method: 'post',
+          data: 'key=value',
           threshold: 456,
           window: 789,
           content_match: 'foomatch',
@@ -82,6 +85,8 @@
         it { should contain_file(conf_file).with_content(%r{username: foouser}) }
         it { should contain_file(conf_file).with_content(%r{password: barpassword}) }
         it { should contain_file(conf_file).with_content(%r{timeout: 123}) }
+        it { should contain_file(conf_file).with_content(%r{method: post}) }
+        it { should contain_file(conf_file).with_content(%r{data: key=value}) }
         it { should contain_file(conf_file).with_content(%r{threshold: 456}) }
         it { should contain_file(conf_file).with_content(%r{window: 789}) }
         it { should contain_file(conf_file).with_content(%r{content_match: 'foomatch'}) }
@@ -98,6 +103,19 @@
         it { should contain_file(conf_file).with_content(%r{ca_certs: /dev/null}) }
       end
 
+      context 'with json post data' do
+        let(:params) {{
+          sitename: 'foo.bar.baz',
+          url: 'http://foo.bar.baz:4096',
+          method: 'post',
+          data: ['key: value'],
+          headers: ['Content-Type: application/json'],
+        }}
+        it { should contain_file(conf_file).with_content(%r{method: post}) }
+        it { should contain_file(conf_file).with_content(/data:\s+key:\s+value/) }
+        it { should contain_file(conf_file).with_content(/headers:\s+Content-Type:\s+application\/json/) }
+      end
+
       context 'with headers parameter array' do
         let(:params) {{
           sitename: 'foo.bar.baz',

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

@@ -9,6 +9,17 @@ instances:
 <% if instance['timeout'] -%>
     timeout: <%= instance['timeout'] %>
 <% end -%>
+<% if instance['method'] -%>
+    method: <%= instance['method'] %>
+<% end -%>
+<% if instance['data'].is_a?(String) -%>
+    data: <%= instance['data'] %>
+<% elsif instance['data'].is_a?(Array) -%>
+    data:
+    <%- instance['data'].each do |data| -%>
+      <%= data %>
+    <%- end -%>
+<% end -%>
 <% if instance['username'] -%>
     username: <%= instance['username'] %>
 <% end -%>