Skip to content

Addressing metaparam override in datadog_agent::tag #338

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
Jul 20, 2017
Merged

Addressing metaparam override in datadog_agent::tag #338

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aff2f76
Addressing metaparam override in datadog_agent::tag
Jun 28, 2017
df64337
Merge remote-tracking branch 'upstream/master' into bugfix/tag_metaparam
Jul 19, 2017
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
14 changes: 7 additions & 7 deletions manifests/tag.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
# Allow custom tags via a define
define datadog_agent::tag(
$tag = $name,
$tag_name = $name,
$lookup_fact = false,
){

if $lookup_fact{
$value = getvar($tag)
$value = getvar($tag_name)

if is_array($value){
$tags = prefix($value, "${tag}:")
$tags = prefix($value, "${tag_name}:")
datadog_agent::tag{$tags: }
} else {
if $value {
concat::fragment{ "datadog tag ${tag}:${value}":
concat::fragment{ "datadog tag ${tag_name}:${value}":
target => '/etc/dd-agent/datadog.conf',
content => "${tag}:${value}, ",
content => "${tag_name}:${value}, ",
order => '03',
}
}
}
} else {
concat::fragment{ "datadog tag ${tag}":
concat::fragment{ "datadog tag ${tag_name}":
target => '/etc/dd-agent/datadog.conf',
content => "${tag}, ",
content => "${tag_name}, ",
order => '03',
}
}
Expand Down
⚡