X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=1af9c03f011f9441ebe0a1906030f9e5dd52f308;hb=ea20f8b08c07b7b0a2b61d7a65dfe4f6e53b42d1;hp=94084b6d927d45f53a9709f20feedee84ce11fd1;hpb=ccd2087acea66f1d06b29f277155b1f960956146;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 94084b6..1af9c03 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -152,10 +152,10 @@ servers:
     address: 130.239.18.97
     parents: gw-ubc
     hostgroups: routing-infrastructure
-  gw-esiee:
-    address: 195.220.83.13
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
+#  gw-esiee:
+#    address: 195.220.83.13
+#    parents: gw-ubc
+#    hostgroups: routing-infrastructure
   gw-ghent:
     address: 193.191.17.50
     parents: gw-ubc
@@ -287,6 +287,10 @@ servers:
     address: 82.195.75.97
     parents: gw-man-da
     hostgroups: computers, service, acpid-hosts, postgres84-hosts
+  byrd:
+    address: 82.195.75.92
+    parents: unger
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
 
   master:
     address: 70.103.162.29
@@ -650,10 +654,10 @@ servers:
     parents: gw-aca
     hostgroups: computers, hasbootfs, aacraid, nfs-client, acpid-hosts, service
 
-  lafayette:
-    address: 147.215.7.160
-    parents: gw-esiee
-    hostgroups: computers, buildd, sw-raid, hassrvfs, hasbootfs
+#  lafayette:
+#    address: 147.215.7.160
+#    parents: gw-esiee
+#    hostgroups: computers, buildd, sw-raid, hassrvfs, hasbootfs
 
   grieg:
     address: 194.177.211.200
@@ -699,7 +703,7 @@ servers:
   orff:
     address: 194.177.211.209
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, bind9-hosts, mptraid, service
+    hostgroups: computers, acpid-hosts, bind9-hosts, mptraid, service, hassrvfs
   field:
     address: 194.177.211.210
     parents: rautavaara
@@ -1306,11 +1310,11 @@ services:
     name: process - munin-node
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u root -C munin-node -a '/usr/sbin/munin-node'"
     hostgroups: computers
-    excludehostgroups: squeeze
+    excludehostgroups: freebsd
   -
     name: process - munin-node
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u root -C perl -a '/usr/bin/perl -wT /usr/sbin/munin-node'"
-    hostgroups: squeeze
+    hostgroups: freebsd
   -
     name: network service - munin-node
     check: check_tcp!4949
@@ -1352,12 +1356,12 @@ services:
     name: process - syslog-ng
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
     hostgroups: computers
-    excludehostgroups: squeeze
+    excludehostgroups: freebsd
 
   -
     name: process - syslog-ng
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:2 -c 2: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
-    hostgroups: squeeze
+    hostgroups: freebsd
 
   -
     name: remote logging
@@ -2219,12 +2223,12 @@ services:
     name: DNS SEC - signature expiry
     hosts: global
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-zone-rrsig-expiration-many --warn 20d --critical 7d --geozonedir /srv/dns.debian.org/geo/zones /srv/dns.debian.org/var/gitdns/domains"
-    runfrom: draghi
+    runfrom: orff
   -
     name: DNS SEC - delegations
     hosts: global
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-dnssec-delegation --dir /srv/dns.debian.org/var/gitdns/domains --dir /srv/dns.debian.org/geo/zones check-header"
-    runfrom: draghi
+    runfrom: orff
 
  ############
   -
@@ -2242,6 +2246,6 @@ services:
     hosts: giustini
   -
     name: event log
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=789 $HOSTADDRESS$ public"
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=952 $HOSTADDRESS$ public"
     runfrom: dijkstra
     hosts: giustini