summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Pirzyk <jim+puppet@pirzyk.org>2011-04-26 15:43:24 -0700
committerJosh Cooper <josh@puppetlabs.com>2011-04-26 15:44:12 -0700
commit035240241d38e8872e4b67a6baaa43db4db64f96 (patch)
treea6b052a3d3e8ba4a7445cb9b6e9e30cfa5902efb
parent86c60354da1d5a2a54baf6dbd92677a12701423d (diff)
downloadpuppet-035240241d38e8872e4b67a6baaa43db4db64f96.tar.gz
puppet-035240241d38e8872e4b67a6baaa43db4db64f96.tar.xz
puppet-035240241d38e8872e4b67a6baaa43db4db64f96.zip
(#3420) Nagios "name" attribute does not output correctly
-rw-r--r--lib/puppet/provider/naginator.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/puppet/provider/naginator.rb b/lib/puppet/provider/naginator.rb
index 5c610fb31..17cc24086 100644
--- a/lib/puppet/provider/naginator.rb
+++ b/lib/puppet/provider/naginator.rb
@@ -30,7 +30,15 @@ class Puppet::Provider::Naginator < Puppet::Provider::ParsedFile
end
def self.to_file(records)
- header + records.collect { |record| record.to_s }.join("\n").gsub("_naginator_name", NAME_STRING)
+ header + records.collect { |record|
+ # Remap the TYPE_name or _naginator_name params to the
+ # name if the record is a template (register == 0)
+ if record.to_s =~ /register\s+0/
+ record.to_s.sub("_naginator_name", "name").sub(record.type.to_s + "_name", "name")
+ else
+ record.to_s.sub("_naginator_name", NAME_STRING)
+ end
+ }.join("\n")
end
def self.skip_record?(record)