Allow passing instances as hash to apache

Author: asenci

manifests/integrations/apache.pp

@@ -27,14 +27,29 @@
 # }
 #
 class datadog_agent::integrations::apache (
-  String $url                     = 'http://localhost/server-status?auto',
-  Optional[String] $username      = undef,
-  Optional[String] $password      = undef,
-  Array $tags                     = [],
-  Boolean $disable_ssl_validation = false
+  String $url                               = 'http://localhost/server-status?auto',
+  Optional[String] $username                = undef,
+  Optional[String] $password                = undef,
+  Array $tags                               = [],
+  Optional[Boolean] $disable_ssl_validation = undef,
+  Optional[Hash] $init_config               = undef,
+  Optional[Array] $instances                = undef,
+  Optional[Array] $logs                     = undef,
 ) inherits datadog_agent::params {
   include datadog_agent
 
+  if !$instances {
+    $_instances = datadog_agent::clean_empty([{
+      'apache_status_url'      => $url,
+      'apache_user'            => $username,
+      'apache_password'        => $password,
+      'tags'                   => $tags,
+      'disable_ssl_validation' => $disable_ssl_validation,
+    }])
+  } else {
+    $_instances = $instances
+  }
+
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/apache.yaml"
   if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/apache.d"

spec/classes/datadog_agent_integrations_apache_spec.rb

@@ -100,6 +100,25 @@
 
           skip('doubly undefined behavior')
         end
+
+        context 'with instances hash' do
+          let(:params) do
+            {
+              instances: [
+                {
+                  'apache_status_url' => 'http://foobar',
+                  'apache_user' => 'userfoo',
+                  'apache_password' => 'passfoo',
+                  'tags' => ['foo', 'bar', 'baz'],
+                },
+              ],
+            }
+          end
+
+          it { is_expected.to contain_file(conf_file).with_content(%r{apache_status_url: http://foobar}) }
+          it { is_expected.to contain_file(conf_file).with_content(%r{apache_user: userfoo}) }
+          it { is_expected.to contain_file(conf_file).with_content(%r{apache_password: passfoo}) }
+        end
       end
     end
   end

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

@@ -1,24 +1,3 @@
 ### MANAGED BY PUPPET
-
-init_config:
-
-instances:
-    -   apache_status_url: <%= @url %>
-<% if @disable_ssl_validation -%>
-        disable_ssl_validation: <%= @disable_ssl_validation %>
-<% end -%>
-<% if @username -%>
-        apache_user: <%= @username %>
-<% end -%>
-<% if @password -%>
-        apache_password: <%= @password %>
-<% end -%>
-<% if @tags and ! @tags.empty? -%>
-        tags:
-  <%- Array(@tags).each do |tag| -%>
-    <%- if tag != '' -%>
-            - <%= tag %>
-    <%- end -%>
-  <%- end -%>
-<% end -%>
-
+<% require 'yaml' -%>
+<%= {'init_config'=>@init_config, 'instances'=>@_instances, 'logs'=>@logs}.to_yaml %>