X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fbuild-nagios;h=7a80f0a017ccb8a5a0616e110e6685288d44c29a;hb=1b24b5440d49064130650aec99b06425a34ab3af;hp=a940b877b0fc657501b80061f45d815b3dce6312;hpb=bd2cebc8abccd3df9143cdeee9e925040a75e1e8;p=mirror%2Fdsa-nagios.git

diff --git a/config/build-nagios b/config/build-nagios
index a940b87..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]}"
 	}
@@ -176,9 +174,13 @@ def addService(hosts, service, files, servers)
 		set_complain_if_set s, 'host_name', host, 'Service', s['service_description']
 		merge_contacts(servers[host], s)
 
-		print_block files['services'], 'service', s, %w(nrpe runfrom remotecheck
-		                                                depends
-		                                                hosts hostgroups excludehosts excludehostgroups)
+		exclude_keys = %w(nrpe runfrom remotecheck
+		                  depends
+		                  hosts hostgroups excludehosts excludehostgroups)
+		if servers[host]['no-servicegroups']
+			exclude_keys << 'servicegroups'
+		end
+		print_block files['services'], 'service', s, exclude_keys
 	}
 
 	if service['depends']
@@ -330,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)
 
 
 
@@ -380,6 +382,8 @@ config['services'].each{ |service|
 
 	split_away_extinfo service
 
+	# make sure the depends list is an array
+	service['depends'] = ensure_array( service['depends'] )
 
 	# Both 'name' and 'service_description' are valid for a service's name
 	# Internally we only use service_description as that's nagios' official term