Replace heininen with lully

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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index f642469..1adfa97 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -248,10 +248,6 @@ servers:
     address: 217.140.96.68
     parents: gw-arm
     hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd
-  hebden:
-    address: 217.140.96.69
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd
   henze:
     address: 217.140.96.70
     parents: gw-arm
@@ -486,6 +482,10 @@ servers:
     parents: gw-man-da
     hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, dl385, acpid-hosts, apache-https, lenny
     contacts: bzed
+  lully:
+    address: 82.195.75.99
+    parents: czerny
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
   heininen:
     address: 82.195.75.98
     parents: gw-man-da
@@ -1201,7 +1201,7 @@ services:
   -
     name: disk usage - all
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs 90 95"
+    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
   -
@@ -1282,7 +1282,7 @@ services:
     name: disk usage on /var/log
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/log"
-    hosts: busoni, wieck, heininen
+    hosts: busoni, wieck, heininen, lully
   -
     name: disk usage on /var/spool/postfix
     servicegroups: diskspace
@@ -1588,9 +1588,15 @@ services:
     hostgroups: freebsd
 
   -
-    name: remote logging
+    name: remote logging on lotti
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$"
+    runfrom: lotti
+    hostgroups: computers
+    excludehosts: vasks, wagner
+  -
+    name: remote logging on lully
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$"
-    runfrom: heininen
+    runfrom: lully
     hostgroups: computers
     excludehosts: vasks, wagner
  ### MAIL STUFF