X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=df94fb2ffe9fec98f7c1c657904deb8c9390478d;hb=6b5c5e23e7f8a88ac8d97239940f7cb527ab7e3b;hp=ebf27023e943a554be4f2055bbc6061cb1d386d5;hpb=271cb11e2495acefc88a3744656972f0ca5ec611;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index ebf2702..df94fb2 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -72,10 +72,6 @@ servers:
     address: 62.104.23.249
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
-  gw-topalis:
-    address: 195.243.109.254
-    parents: gw-HP-ftc
-    hostgroups: routing-infrastructure
   gw-sanger:
     address: 193.62.202.18
     parents: gw-HP-ftc
@@ -341,11 +337,6 @@ servers:
     parents: gw-freenet
     hostgroups: computers, porterbox, sw-raid, lenny, puppet
 
-  raptor:
-    address: 195.243.109.162
-    parents: gw-topalis
-    hostgroups: computers, porterbox, postfix-hosts, lenny
-
   albeniz:
     address: 193.62.202.27
     parents: gw-sanger
@@ -473,6 +464,10 @@ servers:
     address: 137.82.84.74
     parents: dijkstra
     hostgroups: computers, lenny, puppet, buildd, hasbootfs, hassrvfs
+  geo2:
+    address: 137.82.84.71
+    parents: dijkstra
+    hostgroups: computers, service, lenny, hasbootfs, puppet, rsyslog-hosts
 
   lebrun:
     address: 193.198.184.10
@@ -791,17 +786,12 @@ services:
     name: disk usage on /home
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
-    hosts: raptor, voltaire, rem, ball, paer, escher
+    hosts: voltaire, rem, ball, paer, escher
   -
     name: disk usage on /home
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /home"
     hosts: gluck
-  -
-    name: disk usage on /chroot
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /chroot"
-    hosts: raptor
   -
     name: disk usage on /mnt/hdc
     servicegroups: diskspace
@@ -1019,18 +1009,18 @@ services:
     # etch: nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u ntp -C ntpd -a '/usr/sbin/ntpd -p /var/run/ntpd.pid'"
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -C ntpd -a '/usr/sbin/ntpd -p /var/run/ntpd.pid'"
     hostgroups: computers
-    excludehosts: raptor, zelenka
+    excludehosts: zelenka
   -
     name: network service - ntp
     check: dsa_check_ntp
     hostgroups: computers
     depends: process - ntpd
-    excludehosts: raptor, allegri, zelenka
+    excludehosts: allegri, zelenka
   #
   -
     name: network service - time
     check: dsa_check_time
-    hosts: raptor, allegri, zelenka
+    hosts: allegri, zelenka
     depends: process - xinetd
 
  ###
@@ -1305,7 +1295,7 @@ services:
     name: network service - smtp
     check: dsa_check_smtp
     hostgroups: postfix-hosts
-    excludehosts: verdi, kassia, allegri, raptor, piatti
+    excludehosts: verdi, kassia, allegri, piatti
     depends: process - postfix - master
   -
     name: network service - smtp - port 2025
@@ -1317,13 +1307,6 @@ services:
     check: dsa_check_smtp_port!8080
     hosts: murphy
     depends: process - postfix - master
-  -
-    name: network service - smtp - port 2025
-    remotecheck: /usr/lib/nagios/plugins/check_smtp -t 40 -H $HOSTADDRESS$ -p 2025
-    runfrom: murphy
-    hosts: raptor
-    depends: process - postfix - master
-
   -
     name: network service local - smtps cert
     nrpe: "/usr/lib/nagios/plugins/check_http -H localhost -p 465 -S -C 14 -t 45"
@@ -1492,13 +1475,13 @@ services:
   -
     name: process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xinetd -a '/usr/sbin/xinetd -pidfile /var/run/xinetd.pid -stayalive'"
-    hosts: samosa, raptor, allegri, gluck, zelenka
+    hosts: samosa, allegri, gluck, zelenka
     hostgroups: rsyncd-hosts
   -
     name: unwanted process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C xinetd"
     hostgroups: computers
-    excludehosts: samosa, raptor, allegri, gluck, zelenka
+    excludehosts: samosa, allegri, gluck, zelenka
     excludehostgroups: rsyncd-hosts
  ###
   -
@@ -1733,12 +1716,6 @@ services:
     hostgroups: buildd
     contacts: luk
 
- ###
-  -
-    name: process - iscsid
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:2 -c 1: -u root -C iscsid '/usr/sbin/iscsid'"
-    hosts: raptor
-
  ###
   #-
   #  name: process - tftpd