decommission heininen (RT#3870)

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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 1adfa97..62f3ed1 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -199,7 +199,7 @@ servers:
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-sec
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, squeeze, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, squeeze, security_mirror, hasvarlogfs
   # }}}
   # {{{ gw-accumu
   pettersson:
@@ -255,7 +255,7 @@ servers:
   hoiby:
     address: 217.140.96.71
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd
   # }}}
   # {{{ gw-brainfood
   master:
@@ -468,7 +468,7 @@ servers:
   bendel:
     address: 82.195.75.100
     parents: czerny
-    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, squeeze, postfix-hosts, heavy-postfix, acpid-hosts, apache-https, amavis-hosts
+    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, squeeze, postfix-hosts, heavy-postfix, acpid-hosts, apache-https, amavis-hosts, hasvarlogfs
   new-master:
     address: 82.195.75.110
     parents: czerny
@@ -485,11 +485,7 @@ servers:
   lully:
     address: 82.195.75.99
     parents: czerny
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
-  heininen:
-    address: 82.195.75.98
-    parents: gw-man-da
-    hostgroups: computers, acpid-hosts, service, squeeze, megactl
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvarlogfs
   rem:
     address: 82.195.75.68
     parents: gw-man-da
@@ -539,7 +535,7 @@ servers:
   busoni:
     address: 140.211.15.34
     parents: gw-osuosl
-    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres84-hosts, squeeze
+    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres84-hosts, squeeze, hasvarlogfs
   # malo TODO
   mayer:
     address: 140.211.166.78
@@ -582,7 +578,7 @@ servers:
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
-    hostgroups: computers, acpid-hosts, postgres90-hosts, service, apache2-hosts, sw-raid, squeeze, rsyncd-hosts, xinetd-hosts
+    hostgroups: computers, acpid-hosts, postgres90-hosts, service, apache2-hosts, sw-raid, squeeze, rsyncd-hosts, xinetd-hosts, hasvarlogfs
     contacts: tjrc1, dave
   smetana:
     address: 193.62.202.29
@@ -739,6 +735,10 @@ servers:
     # unless we implement runfrom for host alive checks
     pingable: false
     check_command: dsa_check_always_ok
+  falla:
+    address: 206.12.19.117
+    parents: luchesi
+    hostgroups: computers, freebsd, hassrvfs, porterbox, squeeze
   fano:
     address: 206.12.19.110
     parents: luchesi
@@ -747,6 +747,10 @@ servers:
     address: 206.12.19.111
     parents: luchesi
     hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
+  fischer:
+    address: 206.12.19.112
+    parents: luchesi
+    hostgroups: computers, freebsd, hassrvfs, porterbox, squeeze
   gabrielli:
     address: 206.12.19.17
     parents: sw-ubcece-kais
@@ -1112,6 +1116,9 @@ hostgroups:
   hasvarfs:
     alias: hosts with a /var filesystem
     private: 1
+  hasvarlogfs:
+    alias: hosts with a /var/log filesystem
+    private: 1
   hasusrfs:
     alias: hosts with a /usr filesystem
     private: 1
@@ -1203,7 +1210,12 @@ services:
     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=/home/buildd/build-trees"
     hostgroups: computers
-    excludehosts: sibelius
+    excludehosts: sibelius,stabile
+  -
+    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"
+    hosts: stabile
   -
     name: disk usage - all
     servicegroups: diskspace
@@ -1273,16 +1285,10 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/lib/postgresql"
     hosts: samosa, stabile, sibelius, busoni
 
-  -
-    name: disk usage on /var/log
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 50 80 /var/log"
-    hosts: bendel
-  -
     name: disk usage on /var/log
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/log"
-    hosts: busoni, wieck, heininen, lully
+    hostgroups: hasvarlogfs
   -
     name: disk usage on /var/spool/postfix
     servicegroups: diskspace
@@ -1297,13 +1303,18 @@ services:
   -
     name: disk usage on /srv/mirrors
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/mirrors"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/mirrors"
     hosts: beethoven, sibelius
+  -
+    name: disk usage on /srv/snapshot.debian.org
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 94 98 /srv/snapshot.debian.org"
+    hosts: stabile
   -
     name: disk usage on /srv/snapshot.debian.org
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 94 /srv/snapshot.debian.org"
-    hosts: stabile,sibelius
+    hosts: sibelius
   -
     name: disk usage on /srv/farm-snapshot/farm-misc
     servicegroups: diskspace
@@ -2333,7 +2344,7 @@ services:
     name: process - stunnel4 - puppet-ekeyd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -u stunnel4 -C stunnel4 -a '/usr/bin/stunnel4 /etc/stunnel/puppet-ekeyd.conf'"
     hostgroups: squeeze, wheezy
-    excludehosts: fano, fasch, field, finzi
+    excludehostgroups: freebsd
  ####
   -
     name: process - UPS - nut usbhid-ups - ups1