From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 26 Mar 2009 13:54:02 +0000 (+0100)
Subject: [project @ peter@palfrader.org-20090326135402-i8n9own1bmdtc2ht]
X-Git-Url: https://wiki.adam-barratt.org.uk/gitweb/?a=commitdiff_plain;h=2b68d6e3a09eb96eaee7531c0d9a6e1cc7aa9c3a;p=mirror%2Fdsa-nagios.git

[project @ peter@palfrader.org-20090326135402-i8n9own1bmdtc2ht]
Also allow remote hostname replacement in remotechecks
---

diff --git a/build-nagios b/build-nagios
index acf6232..6395e80 100755
--- a/build-nagios
+++ b/build-nagios
@@ -415,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