Merge pull request #481 from DataDog/alexfouche/improvements

multiple improvements (by @alexfouche)

Author: truthbk

Gemfile

@@ -1,6 +1,7 @@
 source "https://rubygems.org"
 
 group :test do
+  gem "rb-inotify", '< 0.10.0' if RUBY_VERSION < '2.2.0'
   gem "public_suffix", "~> 3.0.0"
   gem "listen", "~> 3.0.0"
   gem "puppet", ENV['PUPPET_VERSION'] || '~> 4.2.0'

manifests/init.pp

@@ -11,11 +11,15 @@
 #       set to 'datadoghq.eu' to send data to the EU site.
 #       This option is only available with agent version >= 6.6.0.
 #   $host:
+#       Force the hostname to whatever you want. (default: auto-detected)
 #   $api_key:
 #       Your DataDog API Key. Please replace with your key value.
 #   $collect_ec2_tags
 #       Collect AWS EC2 custom tags as agent tags.
 #       Boolean. Default: false
+#   $collect_gce_tags
+#       Collect Google Cloud Engine metadata as agent tags.
+#       Boolean. Default: false
 #   $collect_instance_metadata
 #       The Agent will try to collect instance metadata for EC2 and GCE instances.
 #       Boolean. Default: true
@@ -45,6 +49,12 @@
 #       Instead of reporting the puppet nodename, use this regex to extract the named
 #       'hostname' captured group to report the run in Datadog.
 #       ex.: '^(?<hostname>.*\.datadoghq\.com)(\.i-\w{8}\..*)?$'
+#   $hostname_fqdn
+#       Make the agent use "hostname -f" on unix-based systems as a last resort
+#       way of determining the hostname instead of Golang "os.Hostname()"
+#       This will be enabled by default in version 6.6
+#       More information at  https://dtdg.co/flag-hostname-fqdn
+#       Optional: Valid values here are: true or false.
 #   $log_to_syslog
 #       Set value of 'log_to_syslog' variable. Default is true -> yes as in dd-agent.
 #       Valid values here are: true or false.
@@ -212,6 +222,7 @@
   $host = '',
   $api_key = 'your_API_key',
   $collect_ec2_tags = false,
+  $collect_gce_tags = false,
   $collect_instance_metadata = true,
   $tags = [],
   $integrations = {},
@@ -228,6 +239,7 @@
   $service_enable = true,
   $manage_repo = true,
   $hostname_extraction_regex = nil,
+  $hostname_fqdn = false,
   $dogstatsd_port = 8125,
   $dogstatsd_socket = '',
   $statsd_forward_host = '',
@@ -315,6 +327,7 @@
   validate_legacy(String, 'validate_string', $dd_url)
   validate_legacy(String, 'validate_string', $datadog_site)
   validate_legacy(String, 'validate_string', $host)
+  validate_legacy(Boolean, 'validate_bool', $hostname_fqdn)
   validate_legacy(String, 'validate_string', $api_key)
   validate_legacy(Array, 'validate_array', $tags)
   validate_legacy(Boolean, 'validate_bool', $hiera_tags)
@@ -341,6 +354,7 @@
   validate_legacy(Boolean, 'validate_bool', $skip_apt_key_trusting)
   validate_legacy(Boolean, 'validate_bool', $use_curl_http_client)
   validate_legacy(Boolean, 'validate_bool', $collect_ec2_tags)
+  validate_legacy(Boolean, 'validate_bool', $collect_gce_tags)
   validate_legacy(Boolean, 'validate_bool', $collect_instance_metadata)
   validate_legacy(String, 'validate_string', $recent_point_threshold)
   validate_legacy(String, 'validate_re', $_listen_port, '^\d*$')
@@ -636,7 +650,9 @@
       'dd_url' => $dd_url,
       'site' => $datadog_site,
       'cmd_port' => $cmd_port,
+      'hostname_fqdn' => $hostname_fqdn,
       'collect_ec2_tags' => $collect_ec2_tags,
+      'collect_gce_tags' => $collect_gce_tags,
       'conf_path' => $datadog_agent::params::conf6_dir,
       'enable_metadata_collection' => $collect_instance_metadata,
       'dogstatsd_port' => $dogstatsd_port,

manifests/integrations/apache.pp

@@ -39,10 +39,14 @@
   validate_legacy('Array', 'validate_array', $tags)
   validate_legacy('Boolean', 'validate_bool', $disable_ssl_validation)
 
+  $legacy_dst = "${datadog_agent::conf_dir}/apache.yaml"
   if !$::datadog_agent::agent5_enable {
-    $dst = "${datadog_agent::conf6_dir}/apache.yaml"
+    $dst = "${datadog_agent::conf6_dir}/apache.d/conf.yaml"
+    file { $legacy_dst:
+      ensure => 'absent'
+    }
   } else {
-    $dst = "${datadog_agent::conf_dir}/apache.yaml"
+    $dst = $legacy_dst
   }
 
   file { $dst:

manifests/integrations/cacti.pp

@@ -6,7 +6,7 @@
 #   $host:
 #       The host cacti MySQL db is running on
 #   $user
-#       The cacti MySQL password 
+#       The cacti MySQL password
 #   $password
 #       The cacti MySQL sb port.
 #   $path
@@ -20,10 +20,14 @@
 ) inherits datadog_agent::params {
   include datadog_agent
 
+  $legacy_dst = "${datadog_agent::conf_dir}/cacti.yaml"
   if !$::datadog_agent::agent5_enable {
-    $dst = "${datadog_agent::conf6_dir}/cacti.yaml"
+    $dst = "${datadog_agent::conf6_dir}/cacti.d/conf.yaml"
+    file { $legacy_dst:
+      ensure => 'absent'
+    }
   } else {
-    $dst = "${datadog_agent::conf_dir}/cacti.yaml"
+    $dst = $legacy_dst
   }
 
   file { $dst:

manifests/integrations/cassandra.pp

@@ -36,10 +36,15 @@
 
   validate_legacy(Optional[Hash], 'validate_hash', $tags)
 
+  $legacy_dst = "${datadog_agent::conf_dir}/cassandra.yaml"
   if !$::datadog_agent::agent5_enable {
-    $dst = "${datadog_agent::conf6_dir}/cassandra.yaml"
+    $dst = "${datadog_agent::conf6_dir}/cassandra.d/conf.yaml"
+
+    file { $legacy_dst:
+      ensure => 'absent'
+    }
   } else {
-    $dst = "${datadog_agent::conf_dir}/cassandra.yaml"
+    $dst = $legacy_dst
   }
 
   file { $dst:

manifests/integrations/ceph.pp

@@ -26,10 +26,14 @@
     content => "# This file is required for dd ceph \ndd-agent ALL=(ALL) NOPASSWD:/usr/bin/ceph\n"
   }
 
+  $legacy_dst = "${datadog_agent::conf_dir}/ceph.yaml"
   if !$::datadog_agent::agent5_enable {
-    $dst = "${datadog_agent::conf6_dir}/ceph.yaml"
+    $dst = "${datadog_agent::conf6_dir}/ceph.d/conf.yaml"
+    file { $legacy_dst:
+      ensure => 'absent'
+    }
   } else {
-    $dst = "${datadog_agent::conf_dir}/ceph.yaml"
+    $dst = $legacy_dst
   }
 
   file { $dst:

manifests/integrations/consul.pp

@@ -40,10 +40,14 @@
   validate_legacy('Boolean', 'validate_bool', $new_leader_checks)
   validate_legacy('Optional[Array]', 'validate_array', $service_whitelist)
 
+  $legacy_dst = "${datadog_agent::conf_dir}/consul.yaml"
   if !$::datadog_agent::agent5_enable {
-    $dst = "${datadog_agent::conf6_dir}/consul.yaml"
+    $dst = "${datadog_agent::conf6_dir}/consul.d/conf.yaml"
+    file { $legacy_dst:
+      ensure => 'absent'
+    }
   } else {
-    $dst = "${datadog_agent::conf_dir}/consul.yaml"
+    $dst = $legacy_dst
   }
 
   file { $dst:

manifests/integrations/directory.pp

@@ -93,10 +93,14 @@
     $_instances = $instances
   }
 
+  $legacy_dst = "${datadog_agent::conf_dir}/directory.yaml"
   if !$::datadog_agent::agent5_enable {
-    $dst = "${datadog_agent::conf6_dir}/directory.yaml"
+    $dst = "${datadog_agent::conf6_dir}/directory.d/conf.yaml"
+    file { $legacy_dst:
+      ensure => 'absent'
+    }
   } else {
-    $dst = "${datadog_agent::conf_dir}/directory.yaml"
+    $dst = $legacy_dst
   }
 
   file { $dst:

manifests/integrations/disk.pp

@@ -48,10 +48,14 @@
     fail('error during compilation')
   }
 
+  $legacy_dst = "${datadog_agent::conf_dir}/disk.yaml"
   if !$::datadog_agent::agent5_enable {
-    $dst = "${datadog_agent::conf6_dir}/disk.yaml"
+    $dst = "${datadog_agent::conf6_dir}/disk.d/conf.yaml"
+    file { $legacy_dst:
+      ensure => 'absent'
+    }
   } else {
-    $dst = "${datadog_agent::conf_dir}/disk.yaml"
+    $dst = $legacy_dst
   }
 
   file { $dst:

manifests/integrations/dns_check.pp

@@ -37,10 +37,14 @@
 
   validate_legacy('Array', 'validate_array', $checks)
 
+  $legacy_dst = "${datadog_agent::conf_dir}/dns_check.yaml"
   if !$::datadog_agent::agent5_enable {
-    $dst = "${datadog_agent::conf6_dir}/dns_check.yaml"
+    $dst = "${datadog_agent::conf6_dir}/dns_check.d/conf.yaml"
+    file { $legacy_dst:
+      ensure => 'absent'
+    }
   } else {
-    $dst = "${datadog_agent::conf_dir}/dns_check.yaml"
+    $dst = $legacy_dst
   }
 
   file { $dst: