X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fbuild-nagios;h=7a80f0a017ccb8a5a0616e110e6685288d44c29a;hb=dc7c8a2b1b10074a7b59079d0f64e97e9c5d4b98;hp=53b441d7e4aa23f508f39b25db8f567ad2ddb2c5;hpb=65b6cbc1c7a2276f73251928d87c26347fccdb2c;p=mirror%2Fdsa-nagios.git

diff --git a/config/build-nagios b/config/build-nagios
index 53b441d..7a80f0a 100755
--- a/config/build-nagios
+++ b/config/build-nagios
@@ -131,9 +131,7 @@ $nrpe = Nrpe.new()
 def print_block(fd, kind, hash, exclude_keys)
 	fd.puts "define #{kind} {"
 	hash.keys.sort.each{ |key|
-		next if key == '_extinfo'
-		next if key == '_hostgroups'
-		next if key == '_memberlist'
+		next if key[0,1] == '_'
 		next if exclude_keys.include? key
 		fd.puts "	#{key}		#{hash[key]}"
 	}
@@ -178,7 +176,6 @@ def addService(hosts, service, files, servers)
 
 		exclude_keys = %w(nrpe runfrom remotecheck
 		                  depends
-		                  no-servicegroups
 		                  hosts hostgroups excludehosts excludehostgroups)
 		if servers[host]['no-servicegroups']
 			exclude_keys << 'servicegroups'
@@ -335,7 +332,7 @@ config['servers'].keys.sort.each{ |name|
 	set_if_unset        server, 'use'          , HOST_TEMPLATE_NAME
 	set_if_unset        server, 'check_command', HOST_ALIVE_CHECK    unless server['pingable'] == false
 
-	print_block files['hosts']      , 'host'       , server            , %w(hostgroups pingable)
+	print_block files['hosts']      , 'host'       , server            , %w(hostgroups pingable no-servicegroups)