More ubcece removal

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 4e44632..1311126 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -1986,7 +1986,7 @@ services:
     nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-stunnel-sanity"
     hostgroups: computers
     excludehostgroups: freebsd, alioth
-    excludehosts: czerny, grnet-node01, storace, ubc-bl2
+    excludehosts: czerny, grnet-node01, storace
   ###
   -
     name: process - rngd
@@ -2149,12 +2149,6 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-drbd -d All"
     hostgroups: drbd-hosts
-    excludehosts: ubc-bl2, ubc-bl3, ubc-bl6, ubc-bl7, ubc-bl8
-  -
-    name: RAID - DRBD
-    servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-drbd -d All --ok-no-devices"
-    hosts: ubc-bl2, ubc-bl3, ubc-bl6, ubc-bl7, ubc-bl8
   # }}}
   # }}}
   # {{{ ### mail stuff
@@ -2866,25 +2860,6 @@ services:
     runfrom: denis
   # }}}
   # {{{ storage
-  -
-    name: ping alive check
-    remotecheck: "/usr/lib/nagios/plugins/check_ping -H $HOSTADDRESS$ -w 50,10% -c 200,30%"
-    runfrom: ubc-bl8
-    hosts: giustini
-    check_interval: 5
-    max_check_attempts: 4
-    retry_interval: 1
-  -
-    name: Overall Unit Status
-    remotecheck: "/usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C public -P 2c -o connUnitStatus -n -c 3 -w 3"
-    runfrom: ubc-bl8
-    hosts: giustini
-  -
-    name: event log
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=11298 $HOSTADDRESS$ public"
-    runfrom: ubc-bl8
-    hosts: giustini
-  ###
   -
     name: process - multipathd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:15 -c 1: -u root -C multipathd -a '/sbin/multipathd'"