[project @ peter@palfrader.org-20080405194042-nx0ns1hxtp9auo7b]

liszt, puccini

diff --git a/nagios-master.cfg b/nagios-master.cfg
index c44d6c9..a10eb42 100644 (file)
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -14,6 +14,7 @@
 #  - goetz: gmond/gmetad
 #  - verdi: pg upgrade, openvpn
 #  - mundy: salinfo_decode
+#  - puccini: mailgraph
 #  -
 #  - agnesi
 #  - casals
@@ -23,10 +24,8 @@
 #  - kassia
 #  - kullervo
 #  - lebrun
-#  - liszt
 #  - murphy
 #  - piatti
-#  - puccini
 #  - tartini
 #sarge:
 #  - caballero
@@ -44,7 +43,7 @@
 # hosts
 #############################
 servers:
-  gw-MAN-DA-debian:
+  gw-man-da:
     address: 82.195.75.126
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
@@ -112,6 +111,10 @@ servers:
     address: 130.81.242.195
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-1und1:
+    address: 195.20.247.53
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
 
   samosa:
     address: 192.25.206.57
@@ -151,20 +154,24 @@ servers:
 
   bartok:
     address: 82.195.75.91
-    parents: gw-MAN-DA-debian
+    parents: gw-man-da
     hostgroups: computers, service, syslog-ng-hosts, postfix-hosts, dl385
   sperger:
     address: 82.195.75.98
-    parents: gw-MAN-DA-debian
+    parents: gw-man-da
     hostgroups: computers, porterbox, sw-raid
   agricola:
     address: 82.195.75.86
-    parents: gw-MAN-DA-debian
+    parents: gw-man-da
     hostgroups: computers, porterbox, sw-raid
   arcadelt:
     address: 82.195.75.87
-    parents: gw-MAN-DA-debian
+    parents: gw-man-da
     hostgroups: computers, buildd, sw-raid
+  liszt:
+    address: 82.195.75.100
+    parents: gw-man-da
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, dl385
 
   master:
     address: 70.103.162.29
@@ -264,6 +271,11 @@ servers:
     parents: gw-frost
     hostgroups: computers, buildd
 
+  puccini:
+    address: 87.106.4.56
+    parents: gw-frost
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix
+
 #############################
 # host groups
 #
@@ -319,6 +331,9 @@ hostgroups:
   heavy-email:
     alias: "hosts running the full mail stuff, including clamav, SA, and greylistd"
     private: 1
+  heavy-postfix:
+    alias: "postfix hosts running the full mail stuff, including clamav, SA, postgrey, amavis, policyd-weight"
+    private: 1
   apache2-hosts:
     alias: hosts running apache2
     private: 1
@@ -561,27 +576,27 @@ services:
   -
     name: process - clamav - clamd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u clamav -C clamd -a '/usr/sbin/clamd'"
-    hostgroups: heavy-email
+    hostgroups: heavy-email, heavy-postfix
   -
     name: service - clamav
     nrpe: "/usr/lib/nagios/plugins/check_clamd -H /var/run/clamav/clamd.ctl"
-    hostgroups: heavy-email
+    hostgroups: heavy-email, heavy-postfix
     depends: process - clamav - clamd
   -
     name: process - clamav - freshclam
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u clamav -C freshclam -a '/usr/bin/freshclam -d --quiet'"
-    hostgroups: heavy-email
+    hostgroups: heavy-email, heavy-postfix
   #
   -
     name: unwanted process - clamav
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C clamd"
     hostgroups: computers
-    excludehostgroups: heavy-email
+    excludehostgroups: heavy-email, heavy-postfix
   -
     name: unwanted process - freshclam
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C freshclam"
     hostgroups: computers
-    excludehostgroups: heavy-email
+    excludehostgroups: heavy-email, heavy-postfix
  ###
   -
     name: process - spamd - master
@@ -623,6 +638,56 @@ services:
     hostgroups: computers
     excludehostgroups: heavy-email
 
+ ###
+  -
+    name: process - postgrey
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -C postgrey -a '/usr/sbin/postgrey --pidfile=/var/run/postgrey.pid --daemonize --inet=127.0.0.1:60000'"
+    hostgroups: heavy-postfix
+  #
+  -
+    name: unwanted process - postgrey
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C postgrey"
+    hostgroups: computers
+    excludehostgroups: heavy-postfix
+ ###
+  -
+    name: process - amavis - master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u amavis -C amavisd-new -a 'amavisd (master)'"
+    hostgroups: heavy-postfix
+  -
+    name: process - amavis - all
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1:10 -u amavis -C amavisd-new -a 'amavisd '"
+    hostgroups: heavy-postfix
+    depends: process - amavis - master
+  #
+  -
+    name: unwanted process - amavis
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C amavisd-new"
+    hostgroups: computers
+    excludehostgroups: heavy-postfix
+ ###
+  -
+    name: process - weightd - master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u polw -C policyd-weight -a 'policyd-weight (master)'"
+    hostgroups: heavy-postfix
+  -
+    name: process - weightd - cache
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u polw -C policyd-weight -a 'policyd-weight (cache)'"
+    hostgroups: heavy-postfix
+    depends: process - weightd - master
+  -
+    name: process - weightd - child
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:30 -c 1: -u polw -C policyd-weight -a 'policyd-weight (child)'"
+    hostgroups: heavy-postfix
+    depends: process - weightd - master
+  #
+  -
+    name: unwanted process - amavis
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C policyd-weight"
+    hostgroups: computers
+    excludehostgroups: heavy-postfix
+
+
 
  ###
   -
@@ -660,11 +725,6 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:10 -c 0:15 -u postfix -C proxymap -a 'proxymap -t unix -u'"
     hostgroups: postfix-hosts
     depends: process - postfix - master
-  -
-    name: process - postfix - smtpd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:10 -c 0:15 -u postfix -C smtpd -a 'smtpd -n smtp -t inet -u -c'"
-    hostgroups: postfix-hosts
-    depends: process - postfix - master
   -
     name: process - postfix - cleanup
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:30 -c 0:50 -u postfix -C cleanup -a 'cleanup -z -t unix -u -c'"
@@ -676,6 +736,29 @@ services:
     hostgroups: postfix-hosts
     depends: process - postfix - master
 
+  -
+    name: process - postfix - smtpd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:10 -c 0:15 -u postfix -C smtpd -a 'smtpd -n smtp -t inet -u -c'"
+    hostgroups: postfix-hosts
+    excludehosts: liszt
+    depends: process - postfix - master
+  -
+    name: process - postfix - smtp
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:10 -c 0:15 -u postfix -C smtp -a 'smtp -t unix -u -c'"
+    hostgroups: postfix-hosts
+    excludehosts: liszt
+    depends: process - postfix - master
+
+  -
+    name: process - postfix - smtpd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:100 -c 0:150 -u postfix -C smtpd -a 'smtpd -n smtp -t inet -u -c'"
+    hosts: liszt
+    depends: process - postfix - master
+  -
+    name: process - postfix - smtp
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:250 -c 0:500 -u postfix -C smtp -a 'smtp -t unix -u -c'"
+    hosts: liszt
+    depends: process - postfix - master
 
  ###
   -
@@ -774,12 +857,12 @@ services:
   -
     name: process - udevd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C udevd -a 'udevd'"
-    hosts: sperger, ries, steffani, merkel, spohr, peri, penalosa, albeniz, escher, verdi
+    hosts: sperger, ries, steffani, merkel, spohr, peri, penalosa, albeniz, escher, verdi, liszt
  ###
   -
     name: process - acpid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C acpid -a '/usr/sbin/acpid -c /etc/acpi/events -s /var/run/acpid.socket'"
-    hosts: ries, steffani
+    hosts: ries, steffani, liszt
 
  ###
   -