Merge pull request #204 from vend/improve-consul-support

More configuration options for Consul checks

Author: truthbk

manifests/integrations/consul.pp

@@ -5,17 +5,39 @@
 # Parameters:
 #   $url:
 #     The URL for consul
+#   $catalog_checks:
+#       Whether to perform checks against the Consul service Catalog
+#       Optional.
+#   $new_leader_checks:
+#       Whether to enable new leader checks from this agent
+#       Note: if this is set on multiple agents in the same cluster
+#       you will receive one event per leader change per agent
+#   $service_whitelist
+#       Services to restrict catalog querying to
+#       The default settings query up to 50 services. So if you have more than
+#       this many in your Consul service catalog, you will want to fill in the
+#       whitelist
 #
 # Sample Usage:
 #
 #   class { 'datadog_agent::integrations::consul' :
 #     url  => "http://localhost:8500"
+#     catalog_checks    => true,
+#     new_leader_checks => false,
 #   }
 #
 class datadog_agent::integrations::consul(
-  $url = 'http://localhost:8500'
+  $url               = 'http://localhost:8500',
+  $catalog_checks    = true,
+  $new_leader_checks = true,
+  $service_whitelist = []
 ) inherits datadog_agent::params {
 
+  validate_string($url)
+  validate_bool($catalog_checks)
+  validate_bool($new_leader_checks)
+  validate_array($service_whitelist)
+
   file { "${datadog_agent::params::conf_dir}/consul.yaml":
     ensure  => file,
     owner   => $datadog_agent::params::dd_user,

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

@@ -22,12 +22,12 @@ instances:
       # ca_bundle_file: '/path/to/trusted_ca_bundle_file'
 
       # Whether to perform checks against the Consul service Catalog
-      catalog_checks: yes
+      catalog_checks: <%= @catalog_checks ? 'yes' : 'no' %>
 
       # Whether to enable new leader checks from this agent
       # Note: if this is set on multiple agents in the same cluster
       # you will receive one event per leader change per agent
-      new_leader_checks: yes
+      new_leader_checks: <%= @new_leader_checks ? 'yes' : 'no' %>
 
       # Services to restrict catalog querying to
       # The default settings query up to 50 services. So if you have more than
@@ -36,4 +36,12 @@ instances:
       # service_whitelist:
       #  - zookeeper
       #  - gunicorn
-      #  - redis
+      #  - redis
+      <% if @service_whitelist and ! @service_whitelist.empty? -%>
+      service_whitelist:
+        <%- Array(@service_whitelist).each do |svc| -%>
+          <%- if svc != '' -%>
+          - <%= svc %>
+          <%- end -%>
+        <%- end -%>
+      <% end -%>