X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=build-nagios;h=6395e803283232d86f3d031c383422f5c7392919;hb=0bdfaad3366c22fdf69d3695e9fc73e28a2278e6;hp=acf62322d3d83619779e52ecfefceb94e13c8528;hpb=1977c9e405c61e954e578756517e605600d413c6;p=mirror%2Fdsa-nagios.git 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