From 0316c7b2810e737c2a720bfff4f8f1ea83ced6a6 Mon Sep 17 00:00:00 2001
From: Jonathan Niesen <jon.niesen@gmail.com>
Date: Thu, 17 Dec 2015 23:51:19 -0500
Subject: [PATCH] Allow multiple instances in the http_check.

Adds the ``instances`` parameter to the ``http_check`` class.

This parameter defaults to undef.

For backwards compatibility, if the ``instances`` array not defined it
will be instantiated as an array containing a single hash. The remaining
parameters of the class will be used for the key/value pairs in the
hash. This will allow us to iterate over the ``instances`` array in the
template.
---
 manifests/integrations/http_check.pp       | 18 ++++++++
 templates/agent-conf.d/http_check.yaml.erb | 49 +++++++++++-----------
 2 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/manifests/integrations/http_check.pp b/manifests/integrations/http_check.pp
index 87a3e09a..88169c74 100644
--- a/manifests/integrations/http_check.pp
+++ b/manifests/integrations/http_check.pp
@@ -86,8 +86,26 @@
   $headers   = [],
   $tags      = [],
   $contact   = [],
+  $instances  = undef,
 ) inherits datadog_agent::params {
 
+  if $instances == undef {
+    $instances = [{
+      'url'                      => $url,
+      'username'                 => $username,
+      'password'                 => $password,
+      'timeout'                  => $timeout,
+      'threshold'                => $threshold,
+      'window'                   => $window,
+      'include_content'          => $include_content,
+      'collect_response_time'    => $collect_repsonse_time,
+      'disable_ssl_verification' => $disable_ssl_verification,
+      'headers'                  => $headers,
+      'tags'                     => $tags,
+      'contact'                  => $contact,
+    }]
+  }
+
   file { "${datadog_agent::params::conf_dir}/http_check.yaml":
     ensure  => file,
     owner   => $datadog_agent::params::dd_user,
diff --git a/templates/agent-conf.d/http_check.yaml.erb b/templates/agent-conf.d/http_check.yaml.erb
index 1937a8fb..d63ad134 100644
--- a/templates/agent-conf.d/http_check.yaml.erb
+++ b/templates/agent-conf.d/http_check.yaml.erb
@@ -1,52 +1,53 @@
 init_config:
 
 instances:
-    -   name: <%= @name %>
-        url: <%= @url %>
-<% if @timeout -%>
-        timeout: <%= @timeout %>
+<%- (Array(@instances)).each do |instance| -%>
+    -   name: <%= instance['name'] %>
+        url: <%= instance['url'] %>
+<% if instance['timeout'] -%>
+        timeout: <%= instance['timeout'] %>
 <% end -%>
-<% if @username -%>
-        username: <%= @username %>
+<% if instance['username'] -%>
+        username: <%= instance['username'] %>
 <% end -%>
-<% if @password -%>
-        password: <%= @password %>
+<% if instance['password'] -%>
+        password: <%= instance['password'] %>
 <% end -%>
-<% if @threshold -%>
-        threshold: <%= @threshold %>
+<% if instance['threshold'] -%>
+        threshold: <%= instance['threshold'] %>
 <% end -%>
-<% if @window -%>
-        window: <%= @window %>
+<% if instance['window'] -%>
+        window: <%= instance['window'] %>
 <% end -%>
-<% if @include_content -%>
-        include_content: <%= @include_content %>
+<% if instance['include_content'] -%>
+        include_content: <%= instance['include_content'] %>
 <% end -%>
-<% if @collect_response_time -%>
-        collect_response_time: <%= @collect_response_time %>
+<% if instance['collect_response_time'] -%>
+        collect_response_time: <%= instance['collect_response_time'] %>
 <% end -%>
-        disable_ssl_validation: <%= @disable_ssl_validation %>
-<% if @headers and ! @headers.empty? -%>
+        disable_ssl_validation: <%= instance['disable_ssl_validation'] %>
+<% if instance['headers'] and ! instance['headers'].empty? -%>
         headers:
-  <%- Array(@headers).each do |header| -%>
+  <%- Array(instance['headers']).each do |header| -%>
     <%- if header != '' -%>
            <%= header %>
     <%- end -%>
   <%- end -%>
 <% end -%>
-<% if @tags and ! @tags.empty? -%>
+<% if instance['tags'] and ! instance['tags'].empty? -%>
         tags:
-  <%- Array(@tags).each do |tag| -%>
+  <%- Array(instance['tags']).each do |tag| -%>
     <%- if tag != '' -%>
             - <%= tag %>
     <%- end -%>
   <%- end -%>
 <% end -%>
-<% if @contacts and ! @contacts.empty? -%>
+<% if instance['contacts'] and ! instance['contacts'].empty? -%>
         notify:
-  <%- Array(@contacts).each do |contact| -%>
+  <%- Array(instance['contacts']).each do |contact| -%>
     <%- if contact != '' -%>
            - <%= contact %>
     <%- end -%>
   <%- end -%>
 <% end -%>
-
+<% end -%>