From 3dcccef808f270de19c4b69ffe71483601954cc7 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 4 Apr 2008 18:19:52 -0400
Subject: [PATCH 01/16] [project @
 peter@palfrader.org-20080404221952-j3x4lg4ls17z3dt5] mayer, mayr

---
 nagios-master.cfg | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 379faf6..8ff97a0 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -10,6 +10,7 @@
 #  - *: mailq
 #  - *: check munin stats collection works
 #  - *: check backups are successful
+#  - *: unwanted: process: inetd.  network: auth
 #  - goetz: gmond/gmetad
 #  -
 #  - agnesi
@@ -26,8 +27,6 @@
 #  - leisner
 #  - liszt
 #  - malo
-#  - mayer
-#  - mayr
 #  - mundy
 #  - murphy
 #  - paer
@@ -161,6 +160,14 @@ servers:
     address: 128.148.34.103
     parents: gw-osuosl
     hostgroups: computers, service, apache2-hosts, bind9-hosts, ftpd-hosts, dl385, rsyncd-hosts, postgres81-hosts, heavy-email
+  mayer:
+    address: 140.211.166.78
+    parents: gw-osuosl
+    hostgroups: computers, buildd
+  mayr:
+    address: 140.211.166.58
+    parents: gw-osuosl
+    hostgroups: computers, buildd
 
   rietz:
     address: 140.211.166.43
@@ -327,7 +334,7 @@ services:
   -
     name: disk usage on /boot
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /boot"
-    hosts: sperger, rietz, steffani, penalosa, peri, albeniz, escher, goetz
+    hosts: sperger, rietz, steffani, penalosa, peri, albeniz, escher, goetz, mayer, mayr
   -
     name: disk usage on /var
     nrpe: "/usr/lib/nagios/plugins/check_disk 50 75 /var"
-- 
2.20.1


From 80e4a9833c00b52826746d83c23f7be61e5c94cb Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 4 Apr 2008 19:15:24 -0400
Subject: [PATCH 02/16] [project @
 peter@palfrader.org-20080404231524-14fv8yfzsfe4cl0z] fix ries vs rietz
 location, add malo

---
 nagios-master.cfg | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 8ff97a0..240a477 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -26,7 +26,6 @@
 #  - lebrun
 #  - leisner
 #  - liszt
-#  - malo
 #  - mundy
 #  - murphy
 #  - paer
@@ -158,8 +157,9 @@ servers:
 
   ries:
     address: 128.148.34.103
-    parents: gw-osuosl
+    parents: gw-brown.edu
     hostgroups: computers, service, apache2-hosts, bind9-hosts, ftpd-hosts, dl385, rsyncd-hosts, postgres81-hosts, heavy-email
+
   mayer:
     address: 140.211.166.78
     parents: gw-osuosl
@@ -168,10 +168,13 @@ servers:
     address: 140.211.166.58
     parents: gw-osuosl
     hostgroups: computers, buildd
-
+  malo:
+    address: 140.211.166.27
+    parents: gw-osuosl
+    hostgroups: computers, buildd
   rietz:
     address: 140.211.166.43
-    parents: gw-brown.edu
+    parents: gw-osuosl
     hostgroups: computers, service, apache2-hosts, bind9-hosts, rsyncd-hosts, dl385, heavy-email
   rietz2:
     address: 140.211.166.44
@@ -874,3 +877,9 @@ services:
     name: process - iscsid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:2 -c 1: -u root -C iscsid '/usr/sbin/iscsid'"
     hosts: raptor
+
+ ###
+  -
+    name: process - tftpd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C in.tftpd -a '/usr/sbin/in.tftpd -l -B 1450 -s /var/lib/tftpboot'"
+    hosts: malo
-- 
2.20.1


From 28e178f57d7a9f4940b33b3a396332e2ff146635 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 5 Apr 2008 07:31:22 -0400
Subject: [PATCH 03/16] [project @
 peter@palfrader.org-20080405113122-pr0oldtqnj104r3m] more instances of ftp

---
 nagios-master.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 240a477..55488f8 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -824,7 +824,7 @@ services:
     hostgroups: ftpd-hosts
   -
     name: process - vsftp - instance
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:10 -c 0:30 -u ftp -C vsftpd -a 'vsftpd: '"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:30 -c 0:50 -u ftp -C vsftpd -a 'vsftpd: '"
     hostgroups: ftpd-hosts
   -
     name: network service - ftp
-- 
2.20.1


From 254b6e99d278e311818783ec67c644d83763332b Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 5 Apr 2008 09:17:28 -0400
Subject: [PATCH 04/16] [project @
 peter@palfrader.org-20080405131728-ri27m787dpi4kpw1] another firewalled host,
 verdi

---
 nagios-master.cfg | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 55488f8..8cd0a43 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -12,6 +12,7 @@
 #  - *: check backups are successful
 #  - *: unwanted: process: inetd.  network: auth
 #  - goetz: gmond/gmetad
+#  - verdi: pg upgrade, openvpn
 #  -
 #  - agnesi
 #  - bruckner
@@ -36,7 +37,6 @@
 #  - schulz
 #  - spontini
 #  - tartini
-#  - verdi
 #  - voltaire
 
 ---
@@ -104,6 +104,10 @@ servers:
     address: 213.188.99.215
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-lrz:
+    address: 129.187.0.150
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
 
   samosa:
     address: 192.25.206.57
@@ -234,6 +238,11 @@ servers:
     parents: gw-cst
     hostgroups: computers, porterbox
 
+  verdi:
+    address: 192.54.42.193
+    parents: gw-lrz
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, postgres81-hosts, postfix-hosts
+
 #############################
 # host groups
 #
@@ -345,7 +354,7 @@ services:
   -
     name: disk usage on /org
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
-    hosts: bartok, sperger, samosa, raff, lobos, villa, steffani, merkel, saens, pergolesi
+    hosts: bartok, sperger, samosa, raff, lobos, villa, steffani, merkel, saens, pergolesi, verdi
   -
     name: disk usage on /srv
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv"
@@ -710,7 +719,7 @@ 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
+    hosts: sperger, ries, steffani, merkel, spohr, peri, penalosa, albeniz, escher, verdi
  ###
   -
     name: process - acpid
-- 
2.20.1


From 3bb959493b12589c080983f9cb106a5836b8479d Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 5 Apr 2008 09:30:47 -0400
Subject: [PATCH 05/16] [project @
 peter@palfrader.org-20080405133047-8dayexf54k63iq4q] unwanted processes,
 mundy

---
 nagios-master.cfg | 37 +++++++++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 8cd0a43..56eaf69 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -13,6 +13,7 @@
 #  - *: unwanted: process: inetd.  network: auth
 #  - goetz: gmond/gmetad
 #  - verdi: pg upgrade, openvpn
+#  - mundy: salinfo_decode
 #  -
 #  - agnesi
 #  - bruckner
@@ -21,24 +22,25 @@
 #  - crest
 #  - elara
 #  - europa
-#  - goedel
 #  - kassia
 #  - kullervo
 #  - lebrun
-#  - leisner
 #  - liszt
-#  - mundy
 #  - murphy
 #  - paer
 #  - piatti
 #  - puccini
 #  - ravel
 #  - sarti
-#  - schulz
 #  - spontini
 #  - tartini
 #  - voltaire
 
+# down:
+#  - goedel
+#  - leisner
+#  - schulz
+
 ---
 #############################
 # hosts
@@ -136,6 +138,10 @@ servers:
     address: 192.25.206.68
     parents: samosa
     hostgroups: computers, buildd, sw-raid
+  mundy:
+    address: 192.25.206.62
+    parents: samosa
+    hostgroups: computers, buildd
 
   bartok:
     address: 82.195.75.91
@@ -676,6 +682,29 @@ services:
     excludehosts: arcadelt, agricola, argento, penalosa, peri, escher
 
 
+ ####
+ ###
+  -
+    name: unwanted process - system-tools-backends
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C system-tools-ba"
+    hostgroups: computers
+  -
+    name: unwanted process - dbus-daemon
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C dbus-daemon"
+    hostgroups: computers
+  -
+    name: unwanted process - gkrellmd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C gkrellmd"
+    hostgroups: computers
+  -
+    name: unwanted process - portmap
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C portmap"
+    hostgroups: computers
+  -
+    name: unwanted process - rpc.statd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C rpc.statd"
+    hostgroups: computers
+
 
  ############ Processes/Services that only run on some computers ############
  ####
-- 
2.20.1


From 4f6b4f479f0367e3df12fa2827f105b8dc9519b0 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 5 Apr 2008 09:37:53 -0400
Subject: [PATCH 06/16] [project @
 peter@palfrader.org-20080405133753-anbez5cngqrt4k0t] bruckner

---
 nagios-master.cfg | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 56eaf69..3c31dd0 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -16,7 +16,6 @@
 #  - mundy: salinfo_decode
 #  -
 #  - agnesi
-#  - bruckner
 #  - caballero
 #  - casals
 #  - crest
@@ -224,6 +223,10 @@ servers:
     address: 62.104.23.252
     parents: gw-freenet
     hostgroups: computers, porterbox, sw-raid
+  bruckner:
+    address: 62.104.23.253
+    parents: gw-freenet
+    hostgroups: computers, porterbox
 
   raptor:
     address: 195.243.109.162
@@ -679,7 +682,7 @@ services:
     name: process - irqbalance
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C irqbalance -a '/usr/sbin/irqbalance'"
     hostgroups: computers
-    excludehosts: arcadelt, agricola, argento, penalosa, peri, escher
+    excludehosts: arcadelt, agricola, argento, penalosa, peri, escher, bruckner
 
 
  ####
@@ -704,6 +707,10 @@ services:
     name: unwanted process - rpc.statd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C rpc.statd"
     hostgroups: computers
+  -
+    name: unwanted process - inetd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
+    hostgroups: computers
 
 
  ############ Processes/Services that only run on some computers ############
@@ -761,6 +768,12 @@ services:
     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, raptor
     hostgroups: rsyncd-hosts
+  -
+    name: unwanted process - xinetd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C xinetd"
+    hostgroups: computers
+    excludehosts: samosa, raptor
+    excludehostgroups: rsyncd-hosts
  ###
   -
     name: network service - finger
-- 
2.20.1


From 7d2f3572b9f82403657f90c543835c04a5597628 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 5 Apr 2008 12:45:35 -0400
Subject: [PATCH 07/16] [project @
 peter@palfrader.org-20080405164535-83n7z42iodojqbe0] voltaire

---
 nagios-master.cfg | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 3c31dd0..5cdbe4f 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -10,13 +10,12 @@
 #  - *: mailq
 #  - *: check munin stats collection works
 #  - *: check backups are successful
-#  - *: unwanted: process: inetd.  network: auth
+#  - *: unwanted: network: auth, discard, daytime, time (on some), cvs-pserver, rsync (on some), ftp (on some), http (on some)
 #  - goetz: gmond/gmetad
 #  - verdi: pg upgrade, openvpn
 #  - mundy: salinfo_decode
 #  -
 #  - agnesi
-#  - caballero
 #  - casals
 #  - crest
 #  - elara
@@ -29,13 +28,14 @@
 #  - paer
 #  - piatti
 #  - puccini
-#  - ravel
-#  - sarti
 #  - spontini
 #  - tartini
-#  - voltaire
+#sarge:
+#  - caballero
 
 # down:
+#  - ravel
+#  - sarti
 #  - goedel
 #  - leisner
 #  - schulz
@@ -109,6 +109,10 @@ servers:
     address: 129.187.0.150
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-frost:
+    address: 130.81.242.195
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
 
   samosa:
     address: 192.25.206.57
@@ -252,6 +256,11 @@ servers:
     parents: gw-lrz
     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, postgres81-hosts, postfix-hosts
 
+  voltaire:
+    address: 72.66.115.54
+    parents: gw-frost
+    hostgroups: computers, buildd
+
 #############################
 # host groups
 #
@@ -359,7 +368,7 @@ services:
   -
     name: disk usage on /var
     nrpe: "/usr/lib/nagios/plugins/check_disk 50 75 /var"
-    hosts: bartok, samosa, raff, lobos, villa, gluck, saens, escher
+    hosts: bartok, samosa, raff, lobos, villa, gluck, saens, escher, voltaire
   -
     name: disk usage on /org
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
@@ -387,11 +396,15 @@ services:
   -
     name: disk usage on /home
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
-    hosts: gluck, raptor, escher
+    hosts: gluck, raptor, escher, voltaire
   -
     name: disk usage on /chroot
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /chroot"
     hosts: raptor
+  -
+    name: disk usage on /mnt/hdc
+    nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /mnt/hdc"
+    hosts: voltaire
 
  ############ All Computers ############
  ####
@@ -867,6 +880,11 @@ services:
     check: check_dns
     hostgroups: bind9-hosts
     depends: process - named
+  -
+    name: unwanted process - named
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C named'"
+    hostgroups: computers
+    excludehostgroups: bind9-hosts
 
  ####
   -
-- 
2.20.1


From 1a4269630d9e84f88238106e01ba92328e36ee97 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 5 Apr 2008 13:17:25 -0400
Subject: [PATCH 08/16] [project @
 peter@palfrader.org-20080405171725-t4tb7ubzbtmy3pr3] paer, and fix a check

---
 nagios-master.cfg | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 5cdbe4f..15f5e18 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -25,7 +25,6 @@
 #  - lebrun
 #  - liszt
 #  - murphy
-#  - paer
 #  - piatti
 #  - puccini
 #  - spontini
@@ -145,6 +144,10 @@ servers:
     address: 192.25.206.62
     parents: samosa
     hostgroups: computers, buildd
+  paer:
+    address: 192.25.206.11
+    parents: samosa
+    hostgroups: computers, porterbox, bind9-hosts
 
   bartok:
     address: 82.195.75.91
@@ -184,7 +187,7 @@ servers:
   malo:
     address: 140.211.166.27
     parents: gw-osuosl
-    hostgroups: computers, buildd
+    hostgroups: computers, buildd, tftpd-hosts
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
@@ -328,6 +331,9 @@ hostgroups:
   ftpd-hosts:
     alias: hosts running vsftpd
     private: 1
+  tftpd-hosts:
+    alias: hosts running a tftpd (tftpd-hpa as a daemon)
+    private: 1
   rsyncd-hosts:
     alias: hosts providing rsync services via xinetd
     private: 1
@@ -364,7 +370,7 @@ services:
   -
     name: disk usage on /boot
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /boot"
-    hosts: sperger, rietz, steffani, penalosa, peri, albeniz, escher, goetz, mayer, mayr
+    hosts: sperger, rietz, steffani, penalosa, peri, albeniz, escher, goetz, mayer, mayr, paer
   -
     name: disk usage on /var
     nrpe: "/usr/lib/nagios/plugins/check_disk 50 75 /var"
@@ -882,7 +888,7 @@ services:
     depends: process - named
   -
     name: unwanted process - named
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C named'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C named"
     hostgroups: computers
     excludehostgroups: bind9-hosts
 
@@ -951,4 +957,9 @@ services:
   -
     name: process - tftpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C in.tftpd -a '/usr/sbin/in.tftpd -l -B 1450 -s /var/lib/tftpboot'"
-    hosts: malo
+    hostgroups: tftpd-hosts
+ ###
+  -
+    name: process - dhcpd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C dhcpd3 -a '/usr/sbin/dhcpd3 -q eth0'"
+    hosts: paer
-- 
2.20.1


From 9c332a3ec233822d55696b624ae02fe7aaf6cfd0 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 5 Apr 2008 15:03:25 -0400
Subject: [PATCH 09/16] [project @
 peter@palfrader.org-20080405190325-o5j11cs0gftjdz04] spontini is still sarge

---
 nagios-master.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 15f5e18..c44d6c9 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -27,10 +27,10 @@
 #  - murphy
 #  - piatti
 #  - puccini
-#  - spontini
 #  - tartini
 #sarge:
 #  - caballero
+#  - spontini
 
 # down:
 #  - ravel
-- 
2.20.1


From 7a5d054ffe97730e782444cea8845095a5533446 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 5 Apr 2008 15:40:42 -0400
Subject: [PATCH 10/16] [project @
 peter@palfrader.org-20080405194042-nx0ns1hxtp9auo7b] liszt, puccini

---
 nagios-master.cfg | 121 ++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 102 insertions(+), 19 deletions(-)

diff --git a/nagios-master.cfg b/nagios-master.cfg
index c44d6c9..a10eb42 100644
--- 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
 
  ###
   -
-- 
2.20.1


From 9af0885b2e0133112c0306ed37352245abe181f5 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 5 Apr 2008 15:45:11 -0400
Subject: [PATCH 11/16] [project @
 peter@palfrader.org-20080405194511-we7csrrj3sqh8kn0] puccini disks

---
 nagios-master.cfg | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nagios-master.cfg b/nagios-master.cfg
index a10eb42..f8625ce 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -389,11 +389,11 @@ services:
   -
     name: disk usage on /var
     nrpe: "/usr/lib/nagios/plugins/check_disk 50 75 /var"
-    hosts: bartok, samosa, raff, lobos, villa, gluck, saens, escher, voltaire
+    hosts: bartok, samosa, raff, lobos, villa, gluck, saens, escher, voltaire, puccini
   -
     name: disk usage on /org
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
-    hosts: bartok, sperger, samosa, raff, lobos, villa, steffani, merkel, saens, pergolesi, verdi
+    hosts: bartok, sperger, samosa, raff, lobos, villa, steffani, merkel, saens, pergolesi, verdi, puccini
   -
     name: disk usage on /srv
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv"
@@ -409,11 +409,11 @@ services:
   -
     name: disk usage on /tmp
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: samosa, raff, gluck, saens, escher
+    hosts: samosa, raff, gluck, saens, escher, puccini
   -
     name: disk usage on /usr
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /usr"
-    hosts: samosa, raff, lobos, villa, gluck, saens, pergolesi
+    hosts: samosa, raff, lobos, villa, gluck, saens, pergolesi, puccini
   -
     name: disk usage on /home
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
-- 
2.20.1


From 5d4a0985d271f71aa9ab3f923d7e6b0566735ed3 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 5 Apr 2008 18:39:03 -0400
Subject: [PATCH 12/16] [project @
 peter@palfrader.org-20080405223903-m13knqxcpsk7bvrr]
 s/heavy-email/heavy-exim/

---
 nagios-master.cfg | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/nagios-master.cfg b/nagios-master.cfg
index f8625ce..70faaee 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -118,19 +118,19 @@ servers:
 
   samosa:
     address: 192.25.206.57
-    hostgroups: computers, service, dl380, apache2-hosts, bind9-hosts, heavy-email
+    hostgroups: computers, service, dl380, apache2-hosts, bind9-hosts, heavy-exim
   raff:
     address: 192.25.206.59
     parents: samosa
-    hostgroups: computers, service, dl380, apache1-hosts, bind9-hosts, rsyncd-hosts, heavy-email
+    hostgroups: computers, service, dl380, apache1-hosts, bind9-hosts, rsyncd-hosts, heavy-exim
   gluck:
     address: 192.25.206.10
     parents: samosa
-    hostgroups: computers, general, dl380, apache1-hosts, bind9-hosts, rsyncd-hosts, heavy-email
+    hostgroups: computers, general, dl380, apache1-hosts, bind9-hosts, rsyncd-hosts, heavy-exim
   merkel:
     address: 192.25.206.16
     parents: samosa
-    hostgroups: computers, general, apache1-hosts, bind9-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-email
+    hostgroups: computers, general, apache1-hosts, bind9-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim
   spohr:
     address: 192.25.206.33
     parents: samosa
@@ -176,12 +176,12 @@ servers:
   master:
     address: 70.103.162.29
     parents: gw-brainfood
-    hostgroups: computers, general, apache2-hosts, bind9-hosts, heavy-email
+    hostgroups: computers, general, apache2-hosts, bind9-hosts, heavy-exim
 
   ries:
     address: 128.148.34.103
     parents: gw-brown.edu
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, ftpd-hosts, dl385, rsyncd-hosts, postgres81-hosts, heavy-email
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, ftpd-hosts, dl385, rsyncd-hosts, postgres81-hosts, heavy-exim
 
   mayer:
     address: 140.211.166.78
@@ -198,7 +198,7 @@ servers:
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, rsyncd-hosts, dl385, heavy-email
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, rsyncd-hosts, dl385, heavy-exim
   rietz2:
     address: 140.211.166.44
     parents: rietz
@@ -221,12 +221,12 @@ servers:
   klecker:
     address: 194.109.137.218
     parents: gw-xs4all
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, bind9-hosts, dl385, postgres81-hosts, heavy-email
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, bind9-hosts, dl385, postgres81-hosts, heavy-exim
 
   saens:
     address: 128.101.240.212
     parents: gw-umn.edu
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, heavy-email
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, heavy-exim
 
   argento:
     address: 195.49.152.174
@@ -328,7 +328,7 @@ hostgroups:
   postfix-hosts:
     alias: hosts running postfix instead of exim
     private: 1
-  heavy-email:
+  heavy-exim:
     alias: "hosts running the full mail stuff, including clamav, SA, and greylistd"
     private: 1
   heavy-postfix:
@@ -576,38 +576,38 @@ 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, heavy-postfix
+    hostgroups: heavy-exim, heavy-postfix
   -
     name: service - clamav
     nrpe: "/usr/lib/nagios/plugins/check_clamd -H /var/run/clamav/clamd.ctl"
-    hostgroups: heavy-email, heavy-postfix
+    hostgroups: heavy-exim, 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, heavy-postfix
+    hostgroups: heavy-exim, heavy-postfix
   #
   -
     name: unwanted process - clamav
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C clamd"
     hostgroups: computers
-    excludehostgroups: heavy-email, heavy-postfix
+    excludehostgroups: heavy-exim, heavy-postfix
   -
     name: unwanted process - freshclam
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C freshclam"
     hostgroups: computers
-    excludehostgroups: heavy-email, heavy-postfix
+    excludehostgroups: heavy-exim, heavy-postfix
  ###
   -
     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: heavy-email
+    hostgroups: heavy-exim
     excludehosts: rietz
   -
     name: process - spamd - child
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -C spamd -a 'spamd child'"
-    hostgroups: heavy-email
+    hostgroups: heavy-exim
     depends: process - spamd - master
     excludehosts: rietz
   #
@@ -624,19 +624,19 @@ services:
     name: unwanted process - spamd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd"
     hostgroups: computers
-    excludehostgroups: heavy-email
+    excludehostgroups: heavy-exim
 
  ###
   -
     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'"
-    hostgroups: heavy-email
+    hostgroups: heavy-exim
   #
   -
     name: unwanted process - greylistd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C greylistd"
     hostgroups: computers
-    excludehostgroups: heavy-email
+    excludehostgroups: heavy-exim
 
  ###
   -
-- 
2.20.1


From fb96d1bd36ae499929f1c8d6dd0b4be39b30af3b Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 5 Apr 2008 18:42:45 -0400
Subject: [PATCH 13/16] [project @
 peter@palfrader.org-20080405224245-g85gx8kzpnyw0tsv] liszt is hard to place
 in our list of email setup groups

---
 nagios-master.cfg | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 70faaee..0d48fe6 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -343,6 +343,9 @@ hostgroups:
   bind9-hosts:
     alias: hosts running bind9
     private: 1
+  amavis-hosts:
+    alias: hosts running amavis
+    private: 1
   ftpd-hosts:
     alias: hosts running vsftpd
     private: 1
@@ -601,12 +604,13 @@ services:
   -
     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
+    hosts: liszt
     hostgroups: heavy-exim
     excludehosts: rietz
   -
     name: process - spamd - child
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -C spamd -a 'spamd child'"
+    hosts: liszt
     hostgroups: heavy-exim
     depends: process - spamd - master
     excludehosts: rietz
@@ -625,6 +629,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd"
     hostgroups: computers
     excludehostgroups: heavy-exim
+    excludehosts: listz
 
  ###
   -
@@ -653,18 +658,20 @@ services:
   -
     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
+    hostgroups: amavis-hosts
+    excludehosts: liszt
   -
     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
+    hostgroups: amavis-hosts
+    excludehosts: liszt
     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
+    excludehostgroups: amavis-hosts
  ###
   -
     name: process - weightd - master
@@ -682,7 +689,7 @@ services:
     depends: process - weightd - master
   #
   -
-    name: unwanted process - amavis
+    name: unwanted process - policyd-weight
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C policyd-weight"
     hostgroups: computers
     excludehostgroups: heavy-postfix
-- 
2.20.1


From 0b6ce2476adbb789ef0a6f853ad492621e6977de Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 5 Apr 2008 18:43:25 -0400
Subject: [PATCH 14/16] [project @
 peter@palfrader.org-20080405224325-ur9wi4phv755fl51] Allow a few more smtp
 instances

---
 nagios-master.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 0d48fe6..91bb54c 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -763,7 +763,7 @@ services:
     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'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:350 -c 0:500 -u postfix -C smtp -a 'smtp -t unix -u -c'"
     hosts: liszt
     depends: process - postfix - master
 
-- 
2.20.1


From c22c8a3c4587b32f1fb698f96267e9f8ca940710 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 5 Apr 2008 18:44:31 -0400
Subject: [PATCH 15/16] [project @
 peter@palfrader.org-20080405224431-1oc2a6hyodd9nwnw] fixes

---
 nagios-master.cfg | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 91bb54c..ead14c8 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -274,7 +274,7 @@ servers:
   puccini:
     address: 87.106.4.56
     parents: gw-frost
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts
 
 #############################
 # host groups
@@ -629,7 +629,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd"
     hostgroups: computers
     excludehostgroups: heavy-exim
-    excludehosts: listz
+    excludehosts: liszt
 
  ###
   -
@@ -659,12 +659,10 @@ services:
     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: amavis-hosts
-    excludehosts: liszt
   -
     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: amavis-hosts
-    excludehosts: liszt
     depends: process - amavis - master
   #
   -
-- 
2.20.1


From 91569dfd920e4c2fb3b334d84dd88c2949208b48 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 5 Apr 2008 19:52:49 -0400
Subject: [PATCH 16/16] [project @
 peter@palfrader.org-20080405235249-hc728rqrbtrk9jit] More children for SA on
 liszt

---
 nagios-master.cfg | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nagios-master.cfg b/nagios-master.cfg
index ead14c8..0c0efef 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -604,9 +604,12 @@ services:
   -
     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: liszt
     hostgroups: heavy-exim
     excludehosts: rietz
+  -
+    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 10 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
+    hosts: liszt
   -
     name: process - spamd - child
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -C spamd -a 'spamd child'"
-- 
2.20.1