Make tags there own resourced, allow hiera created integrations, setup check_feq

.fixtures.yml

@@ -3,6 +3,7 @@ fixtures:
     stdlib:
       repo: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
       ref: "4.12.0"
+    concat: "git://github.com/puppetlabs/puppetlabs-concat.git"
     ruby: "git://github.com/puppetlabs/puppetlabs-ruby.git"
     remote_file: "git://github.com/lwf/puppet-remote_file.git"
   symlinks:

manifests/init.pp

@@ -52,6 +52,8 @@
 #   $statsd_forward_port
 #       Set the value of the statsd_forward_port varable. Used to forward all
 #       statsd metrics to another host.
+#   $check_freq
+#       Sets how often checks should be run. By default, set to 15s
 #   $manage_repo
 #       Boolean to indicate whether this module should attempt to manage
 #       the package repo. Default true.
@@ -183,6 +185,8 @@
   $collect_ec2_tags = false,
   $collect_instance_metadata = true,
   $tags = [],
+  $integrations = {},
+  $hiera_integrations = false,
   $hiera_tags = false,
   $facts_to_tags = [],
   $puppet_run_reports = false,
@@ -200,6 +204,7 @@
   $statsd_forward_host = '',
   $statsd_forward_port = '',
   $statsd_histogram_percentiles = '0.95',
+  $check_freq = '',
   $proxy_host = '',
   $proxy_port = '',
   $proxy_user = '',
@@ -239,6 +244,7 @@
   $sd_jmx_enable = false,
   $consul_token = '',
   $conf_dir = $datadog_agent::params::conf_dir,
+  $conf_dir_purge = $datadog_agent::params::conf_dir_purge,
   $service_name = $datadog_agent::params::service_name,
   $package_name = $datadog_agent::params::package_name,
   $dd_user = $datadog_agent::params::dd_user,
@@ -249,6 +255,7 @@
 
   # Allow ports to be passed as integers or strings.
   # lint:ignore:only_variable_string
+  $_dogstatsd_port = "${dogstatsd_port}"
   $_statsd_forward_port = "${statsd_forward_port}"
   $_proxy_port = "${proxy_port}"
   $_graphite_listen_port = "${graphite_listen_port}"
@@ -271,9 +278,10 @@
   validate_bool($log_to_syslog)
   validate_bool($manage_repo)
   validate_string($log_level)
-  validate_integer($dogstatsd_port)
+  validate_re($_dogstatsd_port, '^\d*$')
   validate_string($statsd_histogram_percentiles)
   validate_re($_statsd_forward_port, '^\d*$')
+  validate_string($check_freq)
   validate_string($proxy_host)
   validate_re($_proxy_port, '^\d*$')
   validate_string($proxy_user)
@@ -324,6 +332,17 @@
     $local_tags = $tags
   }
 
+  if $hiera_integrations {
+    $local_integrations = hiera_hash('datadog_agent::integrations')
+  } else {
+    $local_integrations = $integrations
+  }
+
+  datadog_agent::tag{$local_tags: }
+  datadog_agent::tag{$facts_to_tags:
+    lookup_fact => true,
+  }
+
   include datadog_agent::params
   case upcase($log_level) {
     'CRITICAL': { $_loglevel = 'CRITICAL' }
@@ -354,26 +373,49 @@
     require => Package['datadog-agent'],
   }
 
-  # main agent config file
-  # content
-  if ($extra_template != '') {
-    $agent_conf_content = template(
-      'datadog_agent/datadog.conf.erb',
-      $extra_template
-    )
-  } else {
-    $agent_conf_content = template('datadog_agent/datadog.conf.erb')
+  file { $conf_dir:
+    ensure  => directory,
+    purge   => $conf_dir_purge,
+    recurse => true,
+    force   => $conf_dir_purge,
+    owner   => $dd_user,
+    group   => $dd_group,
+    notify  => Service['datadog-agent']
   }
-  file { '/etc/dd-agent/datadog.conf':
-    ensure  => file,
-    content => $agent_conf_content,
+
+  concat {'/etc/dd-agent/datadog.conf':
     owner   => $datadog_agent::params::dd_user,
     group   => $datadog_agent::params::dd_group,
     mode    => '0640',
     notify  => Service[$datadog_agent::params::service_name],
     require => File['/etc/dd-agent'],
   }
 
+  concat::fragment{ 'datadog header':
+    target  => '/etc/dd-agent/datadog.conf',
+    content => template('datadog_agent/datadog_header.conf.erb'),
+    order   => '01',
+  }
+
+  concat::fragment{ 'datadog tags':
+    target  => '/etc/dd-agent/datadog.conf',
+    content => 'tags: ',
+    order   => '02',
+  }
+
+  concat::fragment{ 'datadog footer':
+    target  => '/etc/dd-agent/datadog.conf',
+    content => template('datadog_agent/datadog_footer.conf.erb'),
+    order   => '05',
+  }
+
+  concat::fragment{ 'datadog apm footer':
+    target  => '/etc/dd-agent/datadog.conf',
+    content => template('datadog_agent/datadog_apm_footer.conf.erb'),
+    order   => '06',
+  }
+
+
   if $puppet_run_reports {
     class { 'datadog_agent::reports':
       api_key                   => $api_key,
@@ -383,4 +425,6 @@
       hostname_extraction_regex => $hostname_extraction_regex,
     }
   }
+
+  create_resources('datadog_agent::integration', $local_integrations)
 }

manifests/params.pp

@@ -21,6 +21,7 @@
   $package_name   = 'datadog-agent'
   $service_name   = 'datadog-agent'
   $dogapi_version = 'installed'
+  $conf_dir_purge = false
 
   case $::operatingsystem {
     'Ubuntu','Debian' : {

manifests/tag.pp

@@ -0,0 +1,30 @@
+# Allow custom tags via a define
+define datadog_agent::tag(
+  $tag = $name,
+  $lookup_fact = false,
+){
+
+  if $lookup_fact{
+    $value = getvar($tag)
+
+    if is_array($value){
+      $tags = prefix($value, "${tag}:")
+      datadog_agent::tag{$tags: }
+    } else {
+      if $value {
+        concat::fragment{ "datadog tag ${tag}:${value}":
+          target  => '/etc/dd-agent/datadog.conf',
+          content => "${tag}:${value}, ",
+          order   => '03',
+        }
+      }
+    }
+  } else {
+    concat::fragment{ "datadog tag ${tag}":
+      target  => '/etc/dd-agent/datadog.conf',
+      content => "${tag}, ",
+      order   => '03',
+    }
+  }
+
+}