X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=f78c3ae8c11a5e9b237756d5d91f6a31e447ab4b;hb=b7f262355ef855bc2119eeaf059a32687e5faad8;hp=2c23bb8ac46b25bc6608e2b7dabe30e99775530a;hpb=0563d875ea7b762563758fe046ffe52335709b9c;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 2c23bb8..f78c3ae 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -455,7 +455,7 @@ servers:
     address: 130.89.149.226
     parents: kassia
     hostgroups: secondary-IPs
-  kassia4:
+  kassia-volatile:
     address: 130.89.149.227
     parents: kassia
     hostgroups: secondary-IPs
@@ -1620,19 +1620,7 @@ services:
     name: network service - http
     check: check_http
     depends: kassia:process - apache2 - master
-    hosts: kassia-sec, kassia-ftp
-
-
-  # apache1 process on merkel
-  -
-    name: process - apache - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C apache -a /usr/sbin/apache"
-    hosts: merkel
-  -
-    name: process - apache - worker
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:75 -c 1:150 -u www-data -C apache -a /usr/sbin/apache"
-    hosts: merkel
-    depends: process - apache - master
+    hosts: kassia-sec, kassia-ftp, kassia-volatile
 
   # keyserver on raff
   -