X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=1adfa9797ee2624a811f2fb97f68791f2f1a5963;hb=f9d8c7159f59ec2edd9b6f26a4c966816847ad3c;hp=02263ffcc0d9192c52e948de0fcde89cc05fa677;hpb=53f221ce7b3a4a7173b85d0a141e59aaccdc7857;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 02263ff..1adfa97 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -482,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
@@ -1197,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
   -
@@ -1278,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
@@ -1584,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