X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=5aaf2fed9cd5ceba1df825fdc43180ad2941cd04;hb=8905858d3e7177ab42ca06685107510d299c69d8;hp=529e30cb56cd86fd4f73838ccb05a85653536003;hpb=f5748c282b8f69aebb61faf352951594979079e9;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 529e30c..5aaf2fe 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -622,6 +622,10 @@ servers:
     address: 194.177.211.204
     parents: ganeti-grnet
     hostgroups: computers, service, hassrvfs, kvmdomains, jessie
+  vittoria:
+    address: 194.177.211.205
+    parents: ganeti-grnet
+    hostgroups: computers, service, hassrvfs, kvmdomains, jessie
   # }}}
   # {{{ gw-isc
   schein:
@@ -805,10 +809,6 @@ servers:
     parents: pieta
     hostgroups: computers, jessie, hassrvfs, porterbox
   # malo TODO
-  mayer:
-    address: 140.211.166.78
-    parents: gw-osuosl
-    hostgroups: computers, buildd, hasbootfs, jessie
 #  mayr:
 #    address: 140.211.166.58
 #    parents: gw-osuosl
@@ -1502,7 +1502,7 @@ services:
   -
     name: disk usage on /srv/ftp-master.debian.org
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/ftp-master.debian.org"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 93 96 /srv/ftp-master.debian.org"
     hosts: franck
   -
     name: disk usage on /storage/snapshot-farm-1
@@ -2348,6 +2348,12 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1:100 -u www-data -a /usr/sbin/apache2"
     hostgroups: apache2-hosts
     depends: process - apache2 - master
+    excludehosts: klecker
+  -
+    name: process - apache2 - worker
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:80 -c 1:150 -u www-data -a /usr/sbin/apache2"
+    hosts: klecker
+    depends: process - apache2 - master
   -
     name: unwanted process - apache2
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C apache2"