X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=build-nagios;h=6395e803283232d86f3d031c383422f5c7392919;hb=0bdfaad3366c22fdf69d3695e9fc73e28a2278e6;hp=8475da8200f75b512c019e69c95108b83c3c46ca;hpb=9ade31a73bd87b1304c60d993f7ce13cd7b35ea3;p=mirror%2Fdsa-nagios.git

diff --git a/build-nagios b/build-nagios
index 8475da8..6395e80 100755
--- a/build-nagios
+++ b/build-nagios
@@ -1,6 +1,28 @@
 #!/usr/bin/ruby
 
-# Copyright (c) 2004, 2005, 2006, 2007, 2008 Peter Palfrader <peter@palfrader.org>
+# build nagios and nrpe config from a single master config file
+
+# Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009 Peter Palfrader <peter@palfrader.org>
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 
 require "yaml"
 
@@ -393,7 +415,10 @@ config['services'].each{ |service|
 			host_ip = config['servers'][host]['address']
 			throw "For some reason I do not have an address for #{host}.  This shouldn't be." unless host_ip
 
-			check = $nrpe.add("#{host}_#{hostservice['service_description']}", hostservice['remotecheck'].gsub(/\$HOSTADDRESS\$/, host_ip))
+			remotecheck = hostservice['remotecheck']
+			remotecheck.gsub!(/\$HOSTADDRESS\$/, host_ip)
+			remotecheck.gsub!(/\$HOSTNAME\$/, host)
+			check = $nrpe.add("#{host}_#{hostservice['service_description']}", remotecheck)
 			hostservice['check_command'] = "#{NRPE_CHECKNAME_HOST}!#{ config['servers'][ relay ]['address'] }!#{ check }"
 
 			# Make sure dependencies are an array.  If there are none, create an empty array