add options to haproxy integration

Author: swwolf

manifests/integrations/haproxy.pp

@@ -9,23 +9,26 @@
 # Sample Usage:
 #
 #   class { 'datadog_agent::integrations::haproxy' :
-#     url   => 'http://localhost:8080',
-#     creds => { username => 'admin',
-#                password => 'password',
-#              },
+#     url     => 'http://localhost:8080',
+#     creds   => { username => 'admin',
+#                  password => 'password',
+#                },
+#     options => { collect_aggregates_only => 'False' },
 #   }
 #
 class datadog_agent::integrations::haproxy(
   $creds     = {},
   $url       = "http://${::ipaddress}:8080",
+  $options   = {},
   $instances = undef,
 ) inherits datadog_agent::params {
   include datadog_agent
 
   if !$instances and $url {
     $_instances = [{
-      'creds' => $creds,
-      'url'   => $url,
+      'creds'   => $creds,
+      'url'     => $url,
+      'options' => $options,
     }]
   } elsif !$instances {
     $_instances = []

spec/classes/datadog_agent_integrations_haproxy_spec.rb

@@ -55,30 +55,47 @@
     end
   end
 
+  context 'with options set' do
+    let(:params) {{
+      options: {
+        'optionk' => 'optionv',
+      },
+    }}
+    it { should contain_file(conf_file).with_content(%r{optionk: optionv}) }
+  end
+
   context 'with instances set' do
     let(:params) {{
       instances: [
         {
-          'url'   => 'http://foo.bar:8421',
-          'creds' => {
+          'url'     => 'http://foo.bar:8421',
+          'creds'   => {
             'username' => 'foo',
             'password' => 'bar',
-          }
+          },
+          'options' => {
+            'optionk1' => 'optionv1',
+          },
         },
         {
-          'url'   => 'http://shoe.baz:1248',
-          'creds' => {
+          'url'     => 'http://shoe.baz:1248',
+          'creds'   => {
             'username' => 'shoe',
             'password' => 'baz',
-          }
+          },
+          'options' => {
+            'optionk2' => 'optionv2',
+          },
         },
       ]
     }}
     it { should contain_file(conf_file).with_content(%r{url: http://foo.bar:8421}) }
     it { should contain_file(conf_file).with_content(%r{username: foo}) }
     it { should contain_file(conf_file).with_content(%r{password: bar}) }
+    it { should contain_file(conf_file).with_content(%r{optionk1: optionv1}) }
     it { should contain_file(conf_file).with_content(%r{url: http://shoe.baz:1248}) }
     it { should contain_file(conf_file).with_content(%r{username: shoe}) }
     it { should contain_file(conf_file).with_content(%r{password: baz}) }
+    it { should contain_file(conf_file).with_content(%r{optionk2: optionv2}) }
   end
 end

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

@@ -13,4 +13,9 @@ instances:
       <%= k %>: <%= v %>
       <%- end -%>
     <%- end -%>
+    <%- if instance['options'] -%>
+      <%- instance['options'].each do |k, v| -%>
+      <%= k %>: <%= v %>
+      <%- end -%>
+    <%- end -%>
 <% end -%>