X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=config%2Fnagios-master.cfg;h=968103e11c834b2ccfdcd06ad548cfe879776300;hb=1cafff73a8627c1fc76767c0002cb19fa3a9f37f;hp=12ca89eb2f30958f0b80df0c5ae8b8b5a1cdba1d;hpb=6c66db7b781cf4357bdc186b7a74515e2e72055f;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 12ca89e..968103e 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -175,8 +175,7 @@ servers:
   powell:
     address: 87.106.64.223
     parents: gw-1und1
-    hostgroups: computers, service, spamd, heavy-exim, rsyncd-hosts, acpid-hosts, hassrvfs, hasvarfs, hasusrfs, xinetd-hosts, apache2-hosts, squeeze
-    contacts: joerg
+    hostgroups: computers, service, acpid-hosts, wheezy
   # }}}
   # {{{ gw-1und1-sec
   schumann:
@@ -283,10 +282,34 @@ servers:
     address: 5.153.231.242
     parents: gw-bytemark
     hostgroups: computers, bl460, acpid-hosts, service, wheezy
+  bm-bl3:
+    address: 5.153.231.243
+    parents: gw-bytemark
+    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+  bm-bl4:
+    address: 5.153.231.244
+    parents: gw-bytemark
+    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+  bm-bl5:
+    address: 5.153.231.245
+    parents: gw-bytemark
+    hostgroups: computers, bl460, acpid-hosts, service, wheezy
 
-  milanotti:
+  milanollo:
     address: 5.153.231.2
     parents: gw-bytemark
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, nfs-server
+  picconi:
+    address: 5.153.231.3
+    parents: gw-bytemark
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs
+  senfter:
+    address: 5.153.231.4
+    parents: gw-bytemark
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts
+  adayevskaya:
+    address: 5.153.231.5
+    parents: gw-bytemark
     hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts
   # }}}
   # {{{ gw-c3sl
@@ -1248,7 +1271,7 @@ services:
   -
     name: disk usage - all
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk -w 10% -c 5%  -A -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs --ignore-eregi-path=/srv/snapshot.debian.org"
+    nrpe: "/usr/lib/nagios/plugins/check_disk -w 5% -c 3%  -A -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs --ignore-eregi-path=/srv/snapshot.debian.org"
     hosts: stabile
   -
     name: disk usage - all
@@ -1297,7 +1320,7 @@ services:
     name: disk usage on /tmp
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: saens, powell, piatti
+    hosts: saens, piatti
   -
     name: disk usage on /usr
     servicegroups: diskspace
@@ -1342,7 +1365,7 @@ services:
   -
     name: disk usage on /srv/snapshot.debian.org
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 94 98 /srv/snapshot.debian.org"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 98 99 /srv/snapshot.debian.org"
     hosts: stabile
   -
     name: disk usage on /srv/snapshot.debian.org
@@ -1738,12 +1761,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'"
     hostgroups: spamd
-    excludehosts: powell, wagner
+    excludehosts: wagner
     excludehostgroups: deadslow
   -
     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 20 --min-spare=5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
-    hosts: powell, wagner
+    hosts: wagner
   -
     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'"
@@ -2587,10 +2610,6 @@ services:
     name: DNS SOA sync - alioth.debian.org
     check: "dsa_check_soas_add!alioth.debian.org!alioth.debian.org"
     hosts: global
-  -
-    name: DNS SOA sync - 2.5.1.1.8.0.0.8.d.8.0.1.0.0.2.ip6.arpa
-    check: "dsa_check_soas!2.5.1.1.8.0.0.8.d.8.0.1.0.0.2.ip6.arpa"
-    hosts: global
   -
     name: DNS SOA sync - 2.6.a.0.4.6.5.6.1.0.0.0.2.0.0.0.8.d.8.0.1.0.0.2.ip6.arpa
     check: "dsa_check_soas!2.6.a.0.4.6.5.6.1.0.0.0.2.0.0.0.8.d.8.0.1.0.0.2.ip6.arpa"