From: Peter Palfrader Date: Sun, 14 Feb 2010 22:38:07 +0000 (+0100) Subject: Do not require host_ip set for hosts in remote checks if we do not even use it X-Git-Url: https://wiki.adam-barratt.org.uk/gitweb/?a=commitdiff_plain;h=457ba27cb6920b7033736da5f067d3e148ae23c9;p=mirror%2Fdsa-nagios.git Do not require host_ip set for hosts in remote checks if we do not even use it --- diff --git a/config/build-nagios b/config/build-nagios index 6395e80..94a2b53 100755 --- a/config/build-nagios +++ b/config/build-nagios @@ -2,7 +2,7 @@ # build nagios and nrpe config from a single master config file -# Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009 Peter Palfrader +# Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Peter Palfrader # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -413,10 +413,12 @@ config['services'].each{ |service| # how to recursively copy this thing? hostservice = YAML::load( service.to_yaml ) 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 remotecheck = hostservice['remotecheck'] - remotecheck.gsub!(/\$HOSTADDRESS\$/, host_ip) + if remotecheck.include?('$HOSTADDRESS$') and not host_ip + throw "For some reason I do not have an address for #{host} yet I need it for the remote check. This shouldn't be." + end + remotecheck.gsub!(/\$HOSTADDRESS\$/, host_ip) if 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 }"