X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=913eb7f8bd4cb6ea7701aca826cc99c741cea6f8;hb=c5b3a48cd1a6ad2db4a09877070f32dbe4f533dc;hp=16663038443b93653b100b117664706e73dec350;hpb=aee647f4ae9fd56e3a14a98210c592fd6640d6fb;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 1666303..913eb7f 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -121,10 +121,6 @@ servers:
     parents: gw-ubc
     hostgroups: routing-infrastructure
     contacts: holger
-  gw-cst:
-    address: 213.157.2.23
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
   gw-isc:
     address: 149.20.20.1
     parents: gw-ubc
@@ -200,10 +196,6 @@ servers:
     address: 192.25.206.57
     parents: gw-HP-ftc
     hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, nfs-client, postgres90-hosts, xinetd-hosts, apache2-hosts, squeeze
-  raff:
-    address: 192.25.206.59
-    parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, hassrvfs, acpid-hosts, squeeze
   spohr:
     address: 192.25.206.33
     parents: gw-HP-ftc
@@ -258,7 +250,7 @@ servers:
   bendel:
     address: 82.195.75.101
     parents: gw-man-da
-    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, squeeze
+    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, squeeze, postfix-hosts, heavy-postfix, acpid-hosts, apache-https
   heininen:
     address: 82.195.75.98
     parents: gw-man-da
@@ -299,10 +291,6 @@ servers:
     address: 82.195.75.97
     parents: gw-man-da
     hostgroups: computers, service, acpid-hosts, heavy-exim, mail-relay, apache2-hosts, squeeze
-  byrd:
-    address: 82.195.75.92
-    parents: unger
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
 #  lamb:
 #    address: 82.195.75.101
 #    parents: unger
@@ -617,10 +605,6 @@ servers:
     address: 206.12.19.21
     parents: tchaikovsky
     hostgroups: computers, dl585, acpid-hosts, service, squeeze
-  schuetz:
-    address: 206.12.19.119
-    parents: tchaikovsky
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
 #  locke:
 #    address: 206.12.19.120
 #    parents: tchaikovsky
@@ -719,11 +703,6 @@ servers:
     parents: gw-zivit
     hostgroups: computers, buildd, hassrvfs, squeeze
 
-  goedel:
-    address: 213.188.99.214
-    parents: gw-cst
-    hostgroups: computers, hasbootfs, ntpsuckers, buildd, lenny
-
   schein:
     address: 149.20.20.6
     parents: gw-isc
@@ -1925,7 +1904,7 @@ services:
     name: unwanted process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
     hostgroups: computers
-    excludehosts: grieg, byrd, abel, alwyn, vasks
+    excludehosts: grieg, abel, alwyn, vasks
   -
     name: unwanted process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
@@ -2119,7 +2098,7 @@ services:
   -
     name: process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C inetd -a '/usr/sbin/inetd'"
-    hosts: grieg, byrd, vasks
+    hosts: grieg, vasks
  ###
   -
     name: process - xinetd
@@ -2349,23 +2328,6 @@ services:
     hostgroups: squeeze, wheezy
     excludehosts: fano, fasch, field, finzi
  ####
-  -
-    name: process - krb - kdc
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C kdc -a '/usr/lib/heimdal-servers/kdc --config-file=/etc/heimdal-kdc/kdc.conf'"
-    hosts: schuetz, byrd
-  -
-    name: process - krb - iprop - slave
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C ipropd-slave -a '/usr/sbin/ipropd-slave byrd.debian.org'"
-    hosts: schuetz
-  -
-    name: process - krb - iprop - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C ipropd-master -a '/usr/sbin/ipropd-master'"
-    hosts: byrd
-  -
-    name: process - krb - kpasswdd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C kpasswdd -a '/usr/lib/heimdal-servers/kpasswdd'"
-    hosts: byrd
- ###
   -
     name: process - UPS - nut usbhid-ups - ups1
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u nut -C usbhid-ups  -a '/lib/nut/usbhid-ups -a ups1'"