X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=build-nagios;h=482357fdcd5c0edc9babb00597c019aca1073b5e;hb=7e15fbf41af8c06dcc4e5e4caa15aea2c6f99f50;hp=67f7e152c77834ebee5338b3d74839a5e9654ed1;hpb=596fc14b12bfd1fab19ccbd8375f60553e78e590;p=mirror%2Fdsa-nagios.git

diff --git a/build-nagios b/build-nagios
index 67f7e15..482357f 100755
--- a/build-nagios
+++ b/build-nagios
@@ -244,8 +244,10 @@ nagios_filename.each_pair{ |name, filename|
 # create the "all" and "pingable" hostgroups
 config['hostgroups']['all'] = {}
 config['hostgroups']['all']['alias'] = "all servers"
+config['hostgroups']['all']['private'] = true
 config['hostgroups']['pingable'] = {}
 config['hostgroups']['pingable']['alias'] = "pingable servers"
+config['hostgroups']['pingable']['private'] = true
 
 config['hostgroups'].each_pair{ |name, hg|
 	throw "Empty hostgroup or hostgroup #{name} not a hash" unless hg.kind_of?(Hash)
@@ -292,12 +294,17 @@ config['servers'].each_pair{ |name, server|
 
 
 	# Handle hostextinfo
-	config['hostgroups'][  server['_hostgroups'].first  ]['_extinfo'].each_pair{ |k, v|
-		# substitute hostname into the notes_url
-		v = sprintf(v,name) if k == 'notes_url'
-
-		set_if_unset server['_extinfo'], k ,v
-	}
+	#config['hostgroups'][  server['_hostgroups'].first  ]['_extinfo'].each_pair{ |k, v|
+	# find the first hostgroup that has extinfo
+	extinfo = server['_hostgroups'].collect{ |hgname | config['hostgroups'][hgname]['_extinfo'] }.delete_if{ |ei| ei.size == 0 }.first
+	if extinfo then
+		extinfo.each_pair do |k, v|
+			# substitute hostname into the notes_url
+			v = sprintf(v,name) if k == 'notes_url'
+
+			set_if_unset server['_extinfo'], k ,v
+		end
+	end
 
 	set_complain_if_set server['_extinfo'], 'host_name'       , name, 'hostextinfo', name
 	set_if_unset        server['_extinfo'], 'vrml_image'      , server['_extinfo']['icon_image'] if server['_extinfo'].has_key?('icon_image')