Skip to content

Add test for apm footer to not apply template if = empty string #381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
truthbk merged 2 commits into from
Feb 5, 2018
Merged

Add test for apm footer to not apply template if = empty string #381

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97d1303
Add test for apm footer to not apply template if = empty string
rothgar Jan 5, 2018
253c932
Add test for $apm_enabled
rothgar Feb 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 != '' {
Copy link
Copy Markdown
Member

@truthbk truthbk Jan 31, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would it maybe make more sense to check for $apm_enabled?

Copy link
Copy Markdown
Contributor Author

@rothgar rothgar Jan 31, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That makes sense but if apm_enabled == true but apm_env is not set then you would still get an error.

I could add a check for both so long as we think the user will know they need to set both variables to have it configured.

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 {

Expand Down
⚡