zemlinsky on jessie

[mirror/dsa-nagios.git] / config / nagios-master.cfg

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 234a8e1..ebc505f 100644 (file)
--- 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
@@ -864,7 +868,7 @@ servers:
   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:
@@ -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
   #
   -
@@ -2346,7 +2350,7 @@ services:
     name: network service - http
     check: check_http
     hostgroups: apache2-hosts
-    excludehosts: klecker
+    excludehosts: klecker, oyens
     depends: process - apache2 - master
   -
     name: network service - http