X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=9a5ccdce3a087b838509d049bb10321151c4e3f2;hb=9efeb7f5991ab9085175cc84161de7e7dc71720c;hp=7615b7257cfb85ac3dd2ecae62e8d582d2fc1cbd;hpb=fba14a7a370cec88be0c8e26d48351aec90671cc;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 7615b72..9a5ccdc 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -14,6 +14,11 @@ servers:
     hostgroups: routing-infrastructure
   gw-HP-ftc:
     address: 192.25.206.1
+    parents: samosa
+    hostgroups: routing-infrastructure
+  gw-brainfood:
+    address: 70.103.162.1
+    parents: samosa
     hostgroups: routing-infrastructure
 
   samosa:
@@ -27,7 +32,12 @@ servers:
   sperger:
     address: 82.195.75.98
     parents: gw-MAN-DA-debian
-    hostgroups: computers, sw-raid
+    hostgroups: computers, porterbox, sw-raid
+
+  master:
+    address: 70.103.162.29
+    parents: gw-brainfood
+    hostgroups: computers, apache2-hosts, bind9-hosts
 
 #############################
 # host groups
@@ -38,8 +48,17 @@ servers:
 hostgroups:
   computers:
     alias: computers
+    private: 1
   routing-infrastructure:
     alias: Internet routers and friends
+    extinfo-icon_image: base/switch40.png
+    extinfo-icon_image_alt: router
+
+  porterbox:
+    alias: developer accessible porter machien
+    extinfo-icon_image: base/debian.png
+    extinfo-icon_image_alt: Debian GNU/Linux
+    extinfo-notes_url: http://db.debian.org/machines.cgi?host=%s
 
   dl380:
     alias: HP DL380 hosts
@@ -225,12 +244,18 @@ services:
     hostgroups: computers
     excludehostgroups: syslog-ng-hosts
 
+ ### MAIL STUFF
  ###
   -
     name: process - exim
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u Debian-exim -C exim4 -a '/usr/sbin/exim4 -bd -q'"
     hostgroups: computers
     excludehostgroups: postfix-hosts
+    excludehosts: master
+  -
+    name: process - exim
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:300 -c 1:500 -C exim4 -a '/usr/sbin/exim4'"
+    hosts: master
  ###
   -
     name: process - clamav - clamd
@@ -248,6 +273,27 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u clamav -C freshclam -a '/usr/bin/freshclam -d --quiet'"
     hostgroups: computers
     excludehostgroups: postfix-hosts
+ ###
+  -
+    name: process - spamd - master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
+    #hosts: samosa
+    hostgroups: computers
+    excludehostgroups: postfix-hosts
+  -
+    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
+ ###
+  -
+    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
 
  ###
   -
@@ -301,6 +347,8 @@ services:
     hostgroups: postfix-hosts
     depends: process - postfix - master
 
+
+
  ###
   -
     name: process - uptimed
@@ -347,21 +395,6 @@ services:
     name: process - slapd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:20 -c 1:50 -u openldap -C slapd -a '/usr/sbin/slapd -g openldap -u openldap'"
     hosts: samosa
- ###
-  -
-    name: process - spamd - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
-    hosts: samosa
-  -
-    name: process - spamd - child
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -C spamd -a 'spamd child'"
-    hosts: samosa
-    depends: process - spamd - master
- ###
-  -
-    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
  ###
   -
     name: process - xinetd
@@ -380,7 +413,8 @@ services:
     hosts: samosa
   -
     name: process - nagios3
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u nagios -C nagios3 -a '/usr/sbin/nagios3 -d /etc/nagios3/nagios.cfg'"
+    # it forks one instance to check, so make it -w 1:2
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u nagios -C nagios3 -a '/usr/sbin/nagios3 -d /etc/nagios3/nagios.cfg'"
     hosts: samosa
 
  ###