X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=inline;f=config%2Fnagios-master.cfg;h=c557c83f41095aaafa1e1f53e3db31c379c2fffa;hb=c5c30d0b067e1d402054bacedd0f3d3263dc9e09;hp=0d3314cd1dbe7a932785adfec7bea3db458012b8;hpb=5ee3d3aeca8028df6df5a93b636cbc9e1adf3f3d;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 0d3314c..c557c83 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -551,7 +551,7 @@ servers:
   fischer:
     address: 128.31.0.35
     parents: ganeti-csail
-    hostgroups: computers, freebsd, hassrvfs, porterbox, wheezy
+    hostgroups: computers, freebsd, hassrvfs, porterbox, jessie
   mirror-csail:
     address: 128.31.0.62
     parents: ganeti-csail
@@ -665,7 +665,7 @@ servers:
   zemlinsky:
     address: 129.143.160.6
     parents: gw-karlsruhe
-    hostgroups: computers, buildd, wheezy
+    hostgroups: computers, buildd, jessie
     contacts: pkern
   # }}}
   # {{{ gw-man-da
@@ -681,7 +681,7 @@ servers:
   bendel:
     address: 82.195.75.100
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, wheezy, postfix-hosts, heavy-postfix, acpid-hosts, apache-https, amavis-hosts, hasvarlogfs
+    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, jessie, postfix-hosts, heavy-postfix, acpid-hosts, apache-https, amavis-hosts, hasvarlogfs
   master:
     address: 82.195.75.110
     parents: ganeti3
@@ -689,11 +689,11 @@ servers:
   mipsel-manda-01:
     address: 82.195.75.72
     parents: gw-man-da
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie
   mipsel-manda-02:
     address: 82.195.75.74
     parents: gw-man-da
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie
   fils:
     address: 82.195.75.89
     parents: ganeti3
@@ -796,6 +796,10 @@ servers:
     address: 140.211.166.197
     parents: pieta
     hostgroups: computers, hassrvfs, buildd, jessie
+  pizzetti:
+    address: 140.211.166.198
+    parents: pieta
+    hostgroups: computers, jessie, hassrvfs, porterbox
   # malo TODO
   mayer:
     address: 140.211.166.78
@@ -860,11 +864,11 @@ servers:
   eysler:
     address: 86.59.118.152
     parents: gw-sil
-    hostgroups: computers, buildd, wheezy
+    hostgroups: computers, buildd, jessie
   eberlin:
     address: 86.59.118.155
     parents: gw-sil
-    hostgroups: computers, buildd, wheezy, sw-raid
+    hostgroups: computers, buildd, jessie, sw-raid
   # }}}
   # {{{ gw-ubcece
   sw-ubcece:
@@ -940,12 +944,12 @@ servers:
   fano:
     address: 206.12.19.110
     parents: ganeti2
-    hostgroups: computers, freebsd, wheezy, buildd, hassrvfs
+    hostgroups: computers, freebsd, jessie, buildd, hassrvfs
     contacts: christoph
   finzi:
     address: 206.12.19.111
     parents: ganeti2
-    hostgroups: computers, freebsd, wheezy, buildd, hassrvfs
+    hostgroups: computers, freebsd, jessie, buildd, hassrvfs
     contacts: christoph
   gabrielli:
     address: 206.12.19.17
@@ -2170,7 +2174,7 @@ services:
     hosts: picconi
   -
     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'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd -d --pidfile=/var/run/spamassassin.pid --create-prefs --max-children 10 --helper-home-dir'"
     hosts: bendel
   -
     name: process - spamd - child
@@ -2204,7 +2208,7 @@ services:
     excludehostgroups: wheezy
   -
     name: process - postgrey
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -a '/usr/sbin/postgrey --pidfile=/var/run/postgrey.pid --daemonize --inet=127.0.0.1:60000'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -a 'postgrey --pidfile=/var/run/postgrey.pid --daemonize --inet=127.0.0.1:60000'"
     hostgroups: heavy-postfix
   #
   -
@@ -2607,7 +2611,7 @@ services:
     hosts: giustini
   -
     name: event log
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=10791 $HOSTADDRESS$ public"
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=10867 $HOSTADDRESS$ public"
     runfrom: ubc-bl8
     hosts: giustini
   # }}}