From 97d130385ced91f67092cb612ecede8af27ce8dd Mon Sep 17 00:00:00 2001 From: Justin Garrison Date: Fri, 5 Jan 2018 11:06:16 -0800 Subject: [PATCH 1/2] Add test for apm footer to not apply template if = empty string --- manifests/init.pp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index bdfe8777..1c772f36 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -451,10 +451,12 @@ $apm_footer_order = '06' } - concat::fragment{ 'datadog apm footer': - target => '/etc/dd-agent/datadog.conf', - content => template('datadog_agent/datadog_apm_footer.conf.erb'), - order => $apm_footer_order, + if $apm_env != '' { + concat::fragment{ 'datadog apm footer': + target => '/etc/dd-agent/datadog.conf', + content => template('datadog_agent/datadog_apm_footer.conf.erb'), + order => $apm_footer_order, + } } } else { From 253c93215da8b12f743fe597a0eecb92cdb3e621 Mon Sep 17 00:00:00 2001 From: Justin Garrison Date: Wed, 31 Jan 2018 18:15:11 -0800 Subject: [PATCH 2/2] Add test for $apm_enabled --- manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index 1c772f36..cc19a215 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -451,7 +451,7 @@ $apm_footer_order = '06' } - if $apm_env != '' { + if ($apm_enabled == true) and ($apm_env != '') { concat::fragment{ 'datadog apm footer': target => '/etc/dd-agent/datadog.conf', content => template('datadog_agent/datadog_apm_footer.conf.erb'),