Merge pull request #217 from cristianjuve/add-argument-in-http-check-integration

Add content_match argument in http_checks integration

Author: truthbk

manifests/integrations/http_check.pp

@@ -17,6 +17,15 @@
 #       alerts only if the check fails x times within the last y attempts
 #       where x is the threshold and y is the window.
 #
+#   content_match
+#       The (optional) content_match parameter will allow the check
+#       to look for a particular string within the response. The check
+#       will report as DOWN if the string is not found.
+#       content_match uses Python regular expressions which means that
+#       you will have to escape the following "special" characters with
+#       a backslash (\) if you're trying to match them in your content:
+#        . ^ $ * + ? { } [ ] \ | ( )
+#
 #   include_content
 #       The (optional) collect_response_time parameter will instruct the
 #       check to create a metric 'network.http.response_time', tagged with
@@ -69,6 +78,7 @@
 #   timeout               => 5,
 #   threshold             => 1,
 #   window                => 1,
+#   content_match         => '^(Bread|Apples) float(s)? in water'
 #   include_content       => true,
 #   collect_response_time => true,
 #   contact               => 'pagerduty',
@@ -84,6 +94,7 @@
   $timeout   = 1,
   $threshold = undef,
   $window    = undef,
+  $content_match = undef,
   $include_content = false,
   $collect_response_time = true,
   $disable_ssl_validation = false,
@@ -103,6 +114,7 @@
       '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,

spec/classes/datadog_agent_integrations_http_check_spec.rb

@@ -28,6 +28,7 @@
     it { should contain_file(conf_file).without_content(%r{timeout: 1}) }
     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: }) }
     it { should contain_file(conf_file).without_content(%r{include_content: true}) }
     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}) }
@@ -44,6 +45,7 @@
       timeout: 123,
       threshold: 456,
       window: 789,
+      content_match: 'foomatch',
       include_content: true,
       collect_response_time: false,
       disable_ssl_validation: true,
@@ -56,6 +58,7 @@
     it { should contain_file(conf_file).with_content(%r{timeout: 123}) }
     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}) }
     it { should contain_file(conf_file).with_content(%r{include_content: true}) }
     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}) }

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

@@ -19,6 +19,9 @@ instances:
 <% if instance['window'] -%>
     window: <%= instance['window'] %>
 <% end -%>
+<% if instance['content_match'] -%>
+    content_match: <%= instance['content_match'] %>
+<% end -%>
 <% if instance['include_content'] -%>
     include_content: <%= instance['include_content'] %>
 <% end -%>