[project @ peter@palfrader.org-20080403170427-4vs9ef078rv2lsii]

rietz

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 1f43189..becb304 100644 (file)
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -24,6 +24,10 @@ servers:
     address: 128.148.34.1
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-osuosl:
+    address: 140.211.166.1
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
 
   samosa:
     address: 192.25.206.57
@@ -46,7 +50,16 @@ servers:
   ries:
     address: 128.148.34.103
     parents: gw-brown.edu
-    hostgroups: computers, apache2-hosts, bind9-hosts, ftpd-hosts, dl385
+    hostgroups: computers, apache2-hosts, bind9-hosts, ftpd-hosts, dl385, rsyncd-hosts
+
+  rietz:
+    address: 140.211.166.43
+    parents: gw-brown.edu
+    hostgroups: computers, apache2-hosts, bind9-hosts, rsyncd-hosts, dl385
+  rietz2:
+    address: 140.211.166.44
+    parents: rietz
+    hostgroups: secondary-IPs
 
 #############################
 # host groups
@@ -94,6 +107,13 @@ hostgroups:
   ftpd-hosts:
     alias: hosts running vsftpd
     private: 1
+  rsyncd-hosts:
+    alias: hosts providing rsync services via xinetd
+    private: 1
+
+  secondary-IPs:
+    alias: secondary IP addresses
+    private: 1
 
 #############################
 # services
@@ -292,18 +312,28 @@ services:
     #hosts: samosa
     hostgroups: computers
     excludehostgroups: postfix-hosts
+    excludehosts: rietz
   -
     name: process - spamd - child
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -C spamd -a 'spamd child'"
-    #hosts: samosa
     hostgroups: computers
     excludehostgroups: postfix-hosts
     depends: process - spamd - master
+    excludehosts: rietz
+  #
+  -
+    name: process - spamd - master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u debbugs -C spamd -a '/usr/sbin/spamd -d '"
+    hosts: rietz
+  -
+    name: process - spamd - child
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -u debbugs -C spamd -a 'spamd child'"
+    hosts: rietz
+
  ###
   -
     name: process - greylistd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u greylist -C greylistd -a '/usr/bin/python /usr/sbin/greylistd'"
-    #hosts: samosa
     hostgroups: computers
     excludehostgroups: postfix-hosts
 
@@ -422,7 +452,8 @@ services:
   -
     name: process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xinetd -a '/usr/sbin/xinetd -pidfile /var/run/xinetd.pid -stayalive'"
-    hosts: samosa, ries
+    hosts: samosa
+    hostgroups: rsyncd-hosts
  ###
   -
     name: network service - finger
@@ -433,7 +464,7 @@ services:
   -
     name: network service - rsync
     check: check_tcp!873
-    hosts: ries
+    hostgroups: rsyncd-hosts
     depends: process - xinetd
 
  ###
@@ -462,6 +493,7 @@ services:
     check: check_http
     hostgroups: apache2-hosts
     depends: process - apache2 - master
+
   -
     name: network service - https
     check: check_https