Re-add agent5 config dir so we can ensure => absent

albertvaka · albertvaka · commit dcf1416f0751 · 2019-12-02T19:19:32.000+01:00
Renamed to legacy_conf_dir
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -336,7 +336,7 @@
 
   if $conf_dir == undef {
     if $agent_major_version == 5 {
-      $_conf_dir = '/etc/dd-agent/conf.d'
+      $_conf_dir = $datadog_agent::params::legacy_conf_dir
     } else {
       $_conf_dir = $datadog_agent::params::conf_dir
     }
diff --git a/manifests/integration.pp b/manifests/integration.pp
@@ -1,8 +1,8 @@
 define datadog_agent::integration (
   Array $instances,
   Optional[Hash] $init_config = undef,
-  Optional[Array] $logs        = undef,
-  String $integration = $title,
+  Optional[Array] $logs       = undef,
+  String $integration         = $title,
 ){
 
   include datadog_agent
@@ -17,7 +17,7 @@
       before => File[$dst]
     }
   } else {
-    $dst = "/etc/dd-agent/conf.d/${integration}.yaml"
+    $dst = "${datadog_agent::params::legacy_conf_dir}/${integration}.yaml"
   }
 
   file { $dst:
diff --git a/manifests/integrations/activemq_xml.pp b/manifests/integrations/activemq_xml.pp
@@ -54,7 +54,7 @@
 ) inherits datadog_agent::params {
   include datadog_agent
 
-  $legacy_dst = "/etc/dd-agent/conf.d/activemq_xml.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/activemq_xml.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/activemq_xml.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/apache.pp b/manifests/integrations/apache.pp
@@ -35,7 +35,7 @@
 ) inherits datadog_agent::params {
   include datadog_agent
 
-  $legacy_dst = "/etc/dd-agent/conf.d/apache.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/apache.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/apache.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/cacti.pp b/manifests/integrations/cacti.pp
@@ -20,7 +20,7 @@
 ) inherits datadog_agent::params {
   include datadog_agent
 
-  $legacy_dst = "/etc/dd-agent/conf.d/cacti.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/cacti.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/cacti.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/cassandra.pp b/manifests/integrations/cassandra.pp
@@ -34,7 +34,7 @@
 ) inherits datadog_agent::params {
   require ::datadog_agent
 
-  $legacy_dst = "/etc/dd-agent/conf.d/cassandra.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/cassandra.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/cassandra.d"
 
diff --git a/manifests/integrations/ceph.pp b/manifests/integrations/ceph.pp
@@ -23,7 +23,7 @@
     content => "# This file is required for dd ceph \ndd-agent ALL=(ALL) NOPASSWD:/usr/bin/ceph\n"
   }
 
-  $legacy_dst = "/etc/dd-agent/conf.d/ceph.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/ceph.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/ceph.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/consul.pp b/manifests/integrations/consul.pp
@@ -35,7 +35,7 @@
 ) inherits datadog_agent::params {
   include datadog_agent
 
-  $legacy_dst = "/etc/dd-agent/conf.d/consul.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/consul.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/consul.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/directory.pp b/manifests/integrations/directory.pp
@@ -88,7 +88,7 @@
     $_instances = $instances
   }
 
-  $legacy_dst = "/etc/dd-agent/conf.d/directory.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/directory.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/directory.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/disk.pp b/manifests/integrations/disk.pp
@@ -69,7 +69,7 @@
     fail('error during compilation')
   }
 
-  $legacy_dst = "/etc/dd-agent/conf.d/disk.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/disk.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/disk.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/dns_check.pp b/manifests/integrations/dns_check.pp
@@ -35,7 +35,7 @@
 ) inherits datadog_agent::params {
   include datadog_agent
 
-  $legacy_dst = "/etc/dd-agent/conf.d/dns_check.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/dns_check.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/dns_check.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/docker_daemon.pp b/manifests/integrations/docker_daemon.pp
@@ -77,7 +77,7 @@
     }
     $legacy_conf = "${legacy_dir}/conf.yaml"
   } else {
-    $legacy_conf = "/etc/dd-agent/conf.d/docker.yaml"
+    $legacy_conf = "${datadog_agent::params::legacy_conf_dir}/docker.yaml"
   }
 
   file { $legacy_conf:
@@ -97,7 +97,7 @@
     }
     $dst = "${dst_dir}/conf.yaml"
   } else {
-    $dst = "/etc/dd-agent/conf.d/docker_daemon.yaml"
+    $dst = "${datadog_agent::params::legacy_conf_dir}/docker_daemon.yaml"
   }
 
   file { $dst:
diff --git a/manifests/integrations/elasticsearch.pp b/manifests/integrations/elasticsearch.pp
@@ -63,7 +63,7 @@
     $_instances = $instances
   }
 
-  $legacy_dst = "/etc/dd-agent/conf.d/elastic.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/elastic.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/elastic.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/fluentd.pp b/manifests/integrations/fluentd.pp
@@ -23,7 +23,7 @@
 ) inherits datadog_agent::params {
   include ::datadog_agent
 
-  $legacy_dst = "/etc/dd-agent/conf.d/fluentd.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/fluentd.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/fluentd.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/generic.pp b/manifests/integrations/generic.pp
@@ -22,7 +22,7 @@
   Optional[String] $integration_contents = undef,
 ) inherits datadog_agent::params {
 
-  $legacy_dst = "/etc/dd-agent/conf.d/${integration_name}.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/${integration_name}.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/${integration_name}.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/haproxy.pp b/manifests/integrations/haproxy.pp
@@ -36,7 +36,7 @@
     $_instances = $instances
   }
 
-  $legacy_dst = "/etc/dd-agent/conf.d/haproxy.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/haproxy.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/haproxy.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/http_check.pp b/manifests/integrations/http_check.pp
@@ -229,7 +229,7 @@
     $_instances = $instances
   }
 
-  $legacy_dst = "/etc/dd-agent/conf.d/http_check.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/http_check.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/http_check.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/jenkins.pp b/manifests/integrations/jenkins.pp
@@ -18,7 +18,7 @@
 ) inherits datadog_agent::params {
   include datadog_agent
 
-  $legacy_dst = "/etc/dd-agent/conf.d/jenkins.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/jenkins.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/jenkins.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/jmx.pp b/manifests/integrations/jmx.pp
@@ -67,7 +67,7 @@
 ) inherits datadog_agent::params {
   include datadog_agent
 
-  $legacy_dst = "/etc/dd-agent/conf.d/jmx.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/jmx.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/jmx.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/kafka.pp b/manifests/integrations/kafka.pp
@@ -86,7 +86,7 @@
     $servers = $instances
   }
 
-  $legacy_dst = "/etc/dd-agent/conf.d/kafka.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/kafka.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/kafka.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/kong.pp b/manifests/integrations/kong.pp
@@ -34,7 +34,7 @@
 ) inherits datadog_agent::params {
   include datadog_agent
 
-  $legacy_dst = "/etc/dd-agent/conf.d/kong.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/kong.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/kong.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/kubernetes.pp b/manifests/integrations/kubernetes.pp
@@ -32,7 +32,7 @@
 ) inherits datadog_agent::params {
   include datadog_agent
 
-  $legacy_dst = "/etc/dd-agent/conf.d/kubernetes.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/kubernetes.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/kubernetes.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/kubernetes_state.pp b/manifests/integrations/kubernetes_state.pp
@@ -24,7 +24,7 @@
 ) inherits datadog_agent::params {
   include datadog_agent
 
-  $legacy_dst = "/etc/dd-agent/conf.d/kubernetes_state.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/kubernetes_state.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/kubernetes_state.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/linux_proc_extras.pp b/manifests/integrations/linux_proc_extras.pp
@@ -18,7 +18,7 @@
 ) inherits datadog_agent::params {
   include datadog_agent
 
-  $legacy_dst = "/etc/dd-agent/conf.d/linux_proc_extras.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/linux_proc_extras.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/linux_proc_extras.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/marathon.pp b/manifests/integrations/marathon.pp
@@ -18,7 +18,7 @@
 ) inherits datadog_agent::params {
   include datadog_agent
 
-  $legacy_dst = "/etc/dd-agent/conf.d/marathon.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/marathon.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/marathon.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/memcache.pp b/manifests/integrations/memcache.pp
@@ -54,7 +54,7 @@
     $_instances = $instances
   }
 
-  $legacy_dst = "/etc/dd-agent/conf.d/mcache.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/mcache.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/mcache.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/mesos_master.pp b/manifests/integrations/mesos_master.pp
@@ -31,14 +31,14 @@
     }
     $dst = "${dst_dir}/conf.yaml"
   } else {
-    $dst = "/etc/dd-agent/conf.d/mesos.yaml"
+    $dst = "${datadog_agent::params::legacy_conf_dir}/mesos.yaml"
   }
 
   file { $dst:
     ensure => 'absent'
   }
 
-  $legacy_dst_master = "/etc/dd-agent/conf.d/mesos_master.yaml"
+  $legacy_dst_master = "${datadog_agent::params::legacy_conf_dir}/mesos_master.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_master_dir = "${datadog_agent::params::conf_dir}/mesos_master.d"
     file { $legacy_dst_master:
diff --git a/manifests/integrations/mesos_slave.pp b/manifests/integrations/mesos_slave.pp
@@ -17,7 +17,7 @@
   $url = 'http://localhost:5051'
 ) inherits datadog_agent::params {
 
-  $legacy_dst = "/etc/dd-agent/conf.d/mesos_slave.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/mesos_slave.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/mesos_slave.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/mongo.pp b/manifests/integrations/mongo.pp
@@ -61,7 +61,7 @@
 ) inherits datadog_agent::params {
   include datadog_agent
 
-  $legacy_dst = "/etc/dd-agent/conf.d/mongo.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/mongo.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/mongo.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/mysql.pp b/manifests/integrations/mysql.pp
@@ -111,7 +111,7 @@
     $_instances = $instances
   }
 
-  $legacy_dst = "/etc/dd-agent/conf.d/mysql.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/mysql.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/mysql.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/network.pp b/manifests/integrations/network.pp
@@ -29,7 +29,7 @@
 ) inherits datadog_agent::params {
   include ::datadog_agent
 
-  $legacy_dst = "/etc/dd-agent/conf.d/network.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/network.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/network.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/nginx.pp b/manifests/integrations/nginx.pp
@@ -63,7 +63,7 @@
 ) inherits datadog_agent::params {
   include datadog_agent
 
-  $legacy_dst = "/etc/dd-agent/conf.d/nginx.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/nginx.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/nginx.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/ntp.pp b/manifests/integrations/ntp.pp
@@ -32,7 +32,7 @@
 ) inherits datadog_agent::params {
   include datadog_agent
 
-  $legacy_dst = "/etc/dd-agent/conf.d/ntp.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/ntp.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/ntp.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/pgbouncer.pp b/manifests/integrations/pgbouncer.pp
@@ -53,7 +53,7 @@
 ) inherits datadog_agent::params {
   include datadog_agent
 
-  $legacy_dst = "/etc/dd-agent/conf.d/pgbouncer.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/pgbouncer.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/pgbouncer.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/php_fpm.pp b/manifests/integrations/php_fpm.pp
@@ -45,7 +45,7 @@
     $_instances = $instances
   }
 
-  $legacy_dst = "/etc/dd-agent/conf.d/php_fpm.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/php_fpm.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/php_fpm.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/postfix.pp b/manifests/integrations/postfix.pp
@@ -48,7 +48,7 @@
     $_instances = $instances
   }
 
-  $legacy_dst = "/etc/dd-agent/conf.d/postfix.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/postfix.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/postfix.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/postgres.pp b/manifests/integrations/postgres.pp
@@ -102,7 +102,7 @@
 ) inherits datadog_agent::params {
   include datadog_agent
 
-  $legacy_dst = "/etc/dd-agent/conf.d/postgres.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/postgres.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/postgres.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/process.pp b/manifests/integrations/process.pp
@@ -52,7 +52,7 @@
     $local_processes = $processes
   }
 
-  $legacy_dst = "/etc/dd-agent/conf.d/process.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/process.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/process.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/rabbitmq.pp b/manifests/integrations/rabbitmq.pp
@@ -67,7 +67,7 @@
 
   include datadog_agent
 
-  $legacy_dst = "/etc/dd-agent/conf.d/rabbitmq.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/rabbitmq.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/rabbitmq.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/redis.pp b/manifests/integrations/redis.pp
@@ -74,7 +74,7 @@
     }
   }
 
-  $legacy_dst = "/etc/dd-agent/conf.d/redisdb.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/redisdb.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/redisdb.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/riak.pp b/manifests/integrations/riak.pp
@@ -24,7 +24,7 @@
 ) inherits datadog_agent::params {
   include datadog_agent
 
-  $legacy_dst = "/etc/dd-agent/conf.d/riak.yaml"
+  $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/riak.yaml"
   if $::datadog_agent::agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/riak.d"
     file { $legacy_dst:
diff --git a/manifests/integrations/snmp.pp b/manifests/integrations/snmp.pp
diff --git a/manifests/integrations/solr.pp b/manifests/integrations/solr.pp
diff --git a/manifests/integrations/ssh.pp b/manifests/integrations/ssh.pp
diff --git a/manifests/integrations/supervisord.pp b/manifests/integrations/supervisord.pp
diff --git a/manifests/integrations/system_core.pp b/manifests/integrations/system_core.pp
diff --git a/manifests/integrations/tcp_check.pp b/manifests/integrations/tcp_check.pp
diff --git a/manifests/integrations/tomcat.pp b/manifests/integrations/tomcat.pp
diff --git a/manifests/integrations/twemproxy.pp b/manifests/integrations/twemproxy.pp
diff --git a/manifests/integrations/varnish.pp b/manifests/integrations/varnish.pp
diff --git a/manifests/integrations/zk.pp b/manifests/integrations/zk.pp
diff --git a/manifests/params.pp b/manifests/params.pp

Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,7 @@`
`336`	`336`
`337`	`337`	`if $conf_dir == undef {`
`338`	`338`	`if $agent_major_version == 5 {`
`339`		`- $_conf_dir = '/etc/dd-agent/conf.d'`
	`339`	`+ $_conf_dir = $datadog_agent::params::legacy_conf_dir`
`340`	`340`	`} else {`
`341`	`341`	`$_conf_dir = $datadog_agent::params::conf_dir`
`342`	`342`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`content => "# This file is required for dd ceph \ndd-agent ALL=(ALL) NOPASSWD:/usr/bin/ceph\n"`
`24`	`24`	`}`
`25`	`25`
`26`		`- $legacy_dst = "/etc/dd-agent/conf.d/ceph.yaml"`
	`26`	`+ $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/ceph.yaml"`
`27`	`27`	`if $::datadog_agent::agent_major_version > 5 {`
`28`	`28`	`$dst_dir = "${datadog_agent::params::conf_dir}/ceph.d"`
`29`	`29`	`file { $legacy_dst:`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@`
`88`	`88`	`$_instances = $instances`
`89`	`89`	`}`
`90`	`90`
`91`		`- $legacy_dst = "/etc/dd-agent/conf.d/directory.yaml"`
	`91`	`+ $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/directory.yaml"`
`92`	`92`	`if $::datadog_agent::agent_major_version > 5 {`
`93`	`93`	`$dst_dir = "${datadog_agent::params::conf_dir}/directory.d"`
`94`	`94`	`file { $legacy_dst:`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@`
`69`	`69`	`fail('error during compilation')`
`70`	`70`	`}`
`71`	`71`
`72`		`- $legacy_dst = "/etc/dd-agent/conf.d/disk.yaml"`
	`72`	`+ $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/disk.yaml"`
`73`	`73`	`if $::datadog_agent::agent_major_version > 5 {`
`74`	`74`	`$dst_dir = "${datadog_agent::params::conf_dir}/disk.d"`
`75`	`75`	`file { $legacy_dst:`