From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 21 Apr 2008 15:55:17 +0000 (+0200)
Subject: [project @ peter@palfrader.org-20080421155517-09ricm83llf2x8ds]
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=fee5affbbbb9023243032c0c5d0e40df76401d86;hp=2246f5d7db410e64863dae2499bfc8b6594c2d5f;p=mirror%2Fdsa-nagios.git

[project @ peter@palfrader.org-20080421155517-09ricm83llf2x8ds]
Support servicegroups
---

diff --git a/Makefile b/Makefile
index 771eaa9..1c54196 100644
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,7 @@ install: generated/nrpe_dsa.cfg
 	install -m 644 generated/auto-hosts.cfg /etc/nagios3/conf.d
 	install -m 644 generated/auto-serviceextinfo.cfg /etc/nagios3/conf.d
 	install -m 644 generated/auto-services.cfg /etc/nagios3/conf.d
+	install -m 644 generated/auto-servicegroups.cfg /etc/nagios3/conf.d
 	#
 	@echo "Also run: "
 	@echo " cp Build-tree/*.deb /org/db.debian.org/ftp-archive/archive/pool/etch/ && "
diff --git a/build-nagios b/build-nagios
index 9d7541b..e7bc540 100755
--- a/build-nagios
+++ b/build-nagios
@@ -9,7 +9,7 @@ SHORTORG="dsa"
 GENERATED_PREFIX="./generated/"
 
 nagios_filename = {};
-%w(hosts hostgroups services dependencies hostextinfo serviceextinfo).each{
+%w(hosts hostgroups services dependencies hostextinfo serviceextinfo servicegroups).each{
 	|x| nagios_filename[x] = GENERATED_PREFIX+"auto-#{x}.cfg"
 }
 nagios_filename['nrpe'] = GENERATED_PREFIX+"nrpe_#{ ORG }.cfg"
@@ -279,6 +279,8 @@ config['servers'].each_pair{ |name, server|
 	};
 }
 
+config['servicegroups'] = {} unless config.has_key? 'servicegroups'
+
 ##############
 # HOSTS
 ##############
@@ -404,6 +406,17 @@ config['services'].each{ |service|
 }
 
 
+
+##############
+# SERVICEGROUPS
+##############
+config['servicegroups'].each_pair{ |name, sg|
+	set_complain_if_set sg, 'servicegroup_name', name                       , 'Servicegroup', name
+
+	print_block files['servicegroups'], 'servicegroup', sg, %w()
+}
+
+
 ##############
 # NRPE config file
 ##############