Logic to auto-detect agent_major_version

manifests/init.pp

@@ -285,7 +285,7 @@
   Boolean $sd_jmx_enable = false,
   String $consul_token = '',
   Integer $cmd_port = 5001,
-  Integer $agent_major_version = $datadog_agent::params::agent_major_version,
+  Optional[Integer] $agent_major_version = undef,
   Optional[String] $conf_dir = undef,
   Boolean $conf_dir_purge = $datadog_agent::params::conf_dir_purge,
   $dd_user = $datadog_agent::params::dd_user,
@@ -313,7 +313,18 @@
   Optional[String] $agent_version = $datadog_agent::params::agent_version,
 ) inherits datadog_agent::params {
 
-  if $agent_major_version != 5 and $agent_major_version != 6 and $agent_major_version != 7 {
+  if $agent_version != 'latest' and $agent_version =~ /([0-9]+:)?([0-9]+)\.([0-9]+)\.([0-9]+)([^-\s]+)?(?:-([0-9]+))?/ {
+    $_agent_major_version = 0 + $2 # Cast to integer
+    if $agent_major_version != undef and $agent_major_version != $_agent_major_version {
+      fail('Provided and deduced agent_major_version don\'t match')
+    }
+  } elsif $agent_major_version != undef {
+    $_agent_major_version = $agent_major_version
+  } else {
+    $_agent_major_version = $datadog_agent::params::default_agent_major_version
+  }
+
+  if $_agent_major_version != 5 and $_agent_major_version != 6 and $_agent_major_version != 7 {
     fail('agent_major_version must be either 5, 6 or 7')
   }
 
@@ -335,7 +346,7 @@
   validate_legacy(String, 'validate_re', $_syslog_port, '^\d*$')
 
   if $conf_dir == undef {
-    if $agent_major_version == 5 {
+    if $_agent_major_version == 5 {
       $_conf_dir = $datadog_agent::params::legacy_conf_dir
     } else {
       $_conf_dir = $datadog_agent::params::conf_dir
@@ -377,7 +388,7 @@
   case $::operatingsystem {
     'Ubuntu','Debian' : {
       class { 'datadog_agent::ubuntu':
-        agent_major_version   => $agent_major_version,
+        agent_major_version   => $_agent_major_version,
         agent_version         => $agent_version,
         service_ensure        => $service_ensure,
         service_enable        => $service_enable,
@@ -390,7 +401,7 @@
     }
     'RedHat','CentOS','Fedora','Amazon','Scientific','OracleLinux' : {
       class { 'datadog_agent::redhat':
-        agent_major_version => $agent_major_version,
+        agent_major_version => $_agent_major_version,
         agent_repo_uri      => $agent_repo_uri,
         manage_repo         => $manage_repo,
         agent_version       => $agent_version,
@@ -401,7 +412,7 @@
     }
     'Windows' : {
       class { 'datadog_agent::windows' :
-        agent_major_version => $agent_major_version,
+        agent_major_version => $_agent_major_version,
         agent_repo_uri      => $agent_repo_uri,
         agent_version       => $agent_version,
         service_ensure      => $service_ensure,
@@ -438,7 +449,7 @@
     }
   }
 
-  if $agent_major_version == 5 {
+  if $_agent_major_version == 5 {
 
     if ($::operatingsystem == 'Windows') {
       fail('Installation of agent 5 with puppet is not supported on Windows')

manifests/integration.pp

@@ -7,7 +7,7 @@
 
   include datadog_agent
 
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst = "${datadog_agent::params::conf_dir}/${integration}.d/conf.yaml"
     file { "${datadog_agent::params::conf_dir}/${integration}.d":
       ensure => directory,

manifests/integrations/activemq_xml.pp

@@ -55,7 +55,7 @@
   include datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/activemq_xml.yaml"
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/activemq_xml.d"
     file { $legacy_dst:
       ensure => 'absent'

manifests/integrations/apache.pp

@@ -36,7 +36,7 @@
   include datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/apache.yaml"
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/apache.d"
     file { $legacy_dst:
       ensure => 'absent'

manifests/integrations/cacti.pp

@@ -21,7 +21,7 @@
   include datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/cacti.yaml"
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/cacti.d"
     file { $legacy_dst:
       ensure => 'absent'

manifests/integrations/cassandra.pp

@@ -35,7 +35,7 @@
   require ::datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/cassandra.yaml"
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/cassandra.d"
 
     file { $legacy_dst:

manifests/integrations/ceph.pp

@@ -24,7 +24,7 @@
   }
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/ceph.yaml"
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/ceph.d"
     file { $legacy_dst:
       ensure => 'absent'

manifests/integrations/consul.pp

@@ -36,7 +36,7 @@
   include datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/consul.yaml"
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/consul.d"
     file { $legacy_dst:
       ensure => 'absent'

manifests/integrations/directory.pp

@@ -89,7 +89,7 @@
   }
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/directory.yaml"
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/directory.d"
     file { $legacy_dst:
       ensure => 'absent'

manifests/integrations/disk.pp

@@ -70,7 +70,7 @@
   }
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/disk.yaml"
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/disk.d"
     file { $legacy_dst:
       ensure => 'absent'

manifests/integrations/dns_check.pp

@@ -36,7 +36,7 @@
   include datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/dns_check.yaml"
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/dns_check.d"
     file { $legacy_dst:
       ensure => 'absent'

manifests/integrations/docker_daemon.pp

@@ -64,7 +64,7 @@
     notify  => Service[$datadog_agent::params::service_name]
   }
 
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $legacy_dir = "${datadog_agent::params::conf_dir}/docker_daemon.d"
 
     file { $legacy_dir:
@@ -84,7 +84,7 @@
     ensure => 'absent'
   }
 
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/docker.d"
 
     file { $dst_dir:

manifests/integrations/elasticsearch.pp

@@ -64,7 +64,7 @@
   }
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/elastic.yaml"
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/elastic.d"
     file { $legacy_dst:
       ensure => 'absent'

manifests/integrations/fluentd.pp

@@ -24,7 +24,7 @@
   include ::datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/fluentd.yaml"
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/fluentd.d"
     file { $legacy_dst:
       ensure => 'absent'

manifests/integrations/generic.pp

@@ -23,7 +23,7 @@
 ) inherits datadog_agent::params {
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/${integration_name}.yaml"
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/${integration_name}.d"
     file { $legacy_dst:
       ensure => 'absent'

manifests/integrations/haproxy.pp

@@ -37,7 +37,7 @@
   }
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/haproxy.yaml"
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/haproxy.d"
     file { $legacy_dst:
       ensure => 'absent'

manifests/integrations/http_check.pp

@@ -230,7 +230,7 @@
   }
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/http_check.yaml"
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/http_check.d"
     file { $legacy_dst:
       ensure => 'absent'

manifests/integrations/jenkins.pp

@@ -19,7 +19,7 @@
   include datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/jenkins.yaml"
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/jenkins.d"
     file { $legacy_dst:
       ensure => 'absent'

manifests/integrations/jmx.pp

@@ -68,7 +68,7 @@
   include datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/jmx.yaml"
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/jmx.d"
     file { $legacy_dst:
       ensure => 'absent'

manifests/integrations/kafka.pp

@@ -87,7 +87,7 @@
   }
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/kafka.yaml"
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/kafka.d"
     file { $legacy_dst:
       ensure => 'absent'

manifests/integrations/kong.pp

@@ -35,7 +35,7 @@
   include datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/kong.yaml"
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/kong.d"
     file { $legacy_dst:
       ensure => 'absent'

manifests/integrations/kubernetes.pp

@@ -33,7 +33,7 @@
   include datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/kubernetes.yaml"
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/kubernetes.d"
     file { $legacy_dst:
       ensure => 'absent'

manifests/integrations/kubernetes_state.pp

@@ -25,7 +25,7 @@
   include datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/kubernetes_state.yaml"
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/kubernetes_state.d"
     file { $legacy_dst:
       ensure => 'absent'

manifests/integrations/linux_proc_extras.pp

@@ -19,7 +19,7 @@
   include datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/linux_proc_extras.yaml"
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/linux_proc_extras.d"
     file { $legacy_dst:
       ensure => 'absent'

manifests/integrations/logs.pp

@@ -39,7 +39,7 @@
 class datadog_agent::integrations::logs(
   Array $logs = [],
 ) inherits datadog_agent::params {
-  unless $::datadog_agent::agent_major_version == 5 {
+  unless $::datadog_agent::_agent_major_version == 5 {
     include datadog_agent
 
     file { "${datadog_agent::params::conf_dir}/logs.yaml":

manifests/integrations/marathon.pp

@@ -19,7 +19,7 @@
   include datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/marathon.yaml"
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/marathon.d"
     file { $legacy_dst:
       ensure => 'absent'

manifests/integrations/memcache.pp

@@ -55,7 +55,7 @@
   }
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/mcache.yaml"
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/mcache.d"
     file { $legacy_dst:
       ensure => 'absent'

manifests/integrations/mesos_master.pp

@@ -18,7 +18,7 @@
 ) inherits datadog_agent::params {
   include datadog_agent
 
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/mesos.d"
 
     file { $dst_dir:
@@ -39,7 +39,7 @@
   }
 
   $legacy_dst_master = "${datadog_agent::params::legacy_conf_dir}/mesos_master.yaml"
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst_master_dir = "${datadog_agent::params::conf_dir}/mesos_master.d"
     file { $legacy_dst_master:
       ensure => 'absent'

manifests/integrations/mesos_slave.pp

@@ -18,7 +18,7 @@
 ) inherits datadog_agent::params {
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/mesos_slave.yaml"
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/mesos_slave.d"
     file { $legacy_dst:
       ensure => 'absent'

manifests/integrations/mongo.pp

@@ -62,7 +62,7 @@
   include datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/mongo.yaml"
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/mongo.d"
     file { $legacy_dst:
       ensure => 'absent'

manifests/integrations/mysql.pp

@@ -112,7 +112,7 @@
   }
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/mysql.yaml"
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/mysql.d"
     file { $legacy_dst:
       ensure => 'absent'

manifests/integrations/network.pp

@@ -30,7 +30,7 @@
   include ::datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/network.yaml"
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/network.d"
     file { $legacy_dst:
       ensure => 'absent'

manifests/integrations/nginx.pp

@@ -64,7 +64,7 @@
   include datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/nginx.yaml"
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/nginx.d"
     file { $legacy_dst:
       ensure => 'absent'

manifests/integrations/ntp.pp

@@ -33,7 +33,7 @@
   include datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/ntp.yaml"
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/ntp.d"
     file { $legacy_dst:
       ensure => 'absent'

manifests/integrations/pgbouncer.pp

@@ -54,7 +54,7 @@
   include datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/pgbouncer.yaml"
-  if $::datadog_agent::agent_major_version > 5 {
+  if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/pgbouncer.d"
     file { $legacy_dst:
       ensure => 'absent'