additional params for rabbitmq.yaml template per dd example

Author: Alvin Huang

manifests/integrations/rabbitmq.pp

@@ -11,6 +11,30 @@
 #       If your service uses basic authentication, you can optionally
 #       specify a username and password that will be used in the check.
 #       (it's set to guest/guest by RabbitMQ on setup)
+#   $tag_families
+#       Tag queues "families" based on regex match
+#   $ssl_verify
+#       Skip verification of the RabbitMQ management web endpoint 
+#       SSL certificate 
+#   $nodes
+#   $nodes_regexes
+#       Specify the nodes to collect metrics on (up to 100 nodes).
+#       If you have less than 100 nodes, metrics will be collected on all nodes
+#       by default.
+#   $queues
+#   $queues_regexes
+#       Specify the queues to collect metrics on (up to 200 queues).
+#
+#       If you have less than 200 queues, metrics will be collected on all queues
+#       by default.
+#
+#       If vhosts are set, set queue names as `vhost_name/queue_name`
+#
+#       If `tag families` are enabled, the first capture group in the regex will
+#       be used as the queue_family tag
+#   $vhosts
+#       List of vhosts to monitor with service checks. By default, a list of all
+#       vhosts is fetched and each one will be checked using the aliveness API.
 #
 # Sample Usage:
 #
@@ -22,12 +46,28 @@
 #
 
 class datadog_agent::integrations::rabbitmq (
-  $url       = undef,
-  $username  = undef,
-  $password  = undef,
-  $queues    = undef,
-  $vhosts    = undef,
+  $url            = undef,
+  $username       = 'guest',
+  $password       = 'guest',
+  $ssl_verify     = true,
+  $tag_families   = false,
+  $nodes          = [],
+  $nodes_regexes  = [],
+  $queues         = [],
+  $queues_regexes = [],
+  $vhosts         = [],
 ) inherits datadog_agent::params {
+
+  validate_string($url)
+  validate_string($username)
+  validate_string($password)
+  validate_bool($ssl_verify)
+  validate_bool($tag_families)
+  validate_array($nodes)
+  validate_array($nodes_regexes)
+  validate_array($queues)
+  validate_array($queues_regexes)
+  validate_array($vhosts)
   include datadog_agent
 
   file { "${datadog_agent::params::conf_dir}/rabbitmq.yaml":
@@ -37,6 +77,6 @@
     mode    => '0600',
     content => template('datadog_agent/agent-conf.d/rabbitmq.yaml.erb'),
     require => Package[$datadog_agent::params::package_name],
-    notify  => Service[$datadog_agent::params::service_name]
+    notify  => Service[$datadog_agent::params::service_name],
   }
 }

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

@@ -2,22 +2,40 @@ init_config:
 
 instances:
     -  rabbitmq_api_url: <%= @url %>
-<% if @username -%>
        rabbitmq_user: <%= @username %>
-<% end -%>
-<% if @password -%>
        rabbitmq_pass: <%= @password %>
+       ssl_verify: <%= @ssl_verify %>
+       tag_families: <%= @tag_families %>
+
+<% unless @nodes.empty?  -%>
+       nodes:
+<% @nodes.each do |x| -%>
+         - <%= x %>
+<% end -%>
 <% end -%>
 
-<% if @queues  -%>
+<% unless @nodes_regexes.empty?  -%>
+       nodes_regexes:
+<% @nodes_regexes.each do |x| -%>
+         - <%= x %>
+<% end -%>
+<% end -%>
+
+<% unless @queues.empty?  -%>
        queues:
 <% @queues.each do |x| -%>
          - <%= x %>
 <% end -%>
 <% end -%>
 
+<% unless @queues_regexes.empty?  -%>
+       queues_regexes:
+<% @queues_regexes.each do |x| -%>
+         - <%= x %>
+<% end -%>
+<% end -%>
 
-<% if @vhosts -%>
+<% unless @vhosts.empty? -%>
        vhosts:
 <% @vhosts.each do |x| -%>
          - <%= x %>