X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=aa54c0bfd9a4dc00878517639b81b192f6de96f7;hb=34871116beb578f22f845f0c70f0a4c22374e3fd;hp=6dc9df056db4711169d0dc0aeef88c9731f509da;hpb=942634914fb98ec896131aed797ca6576d19979b;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 6dc9df0..aa54c0b 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -177,7 +177,7 @@ servers:
   samosa:
     address: 192.25.206.57
     parents: spohr
-    hostgroups: computers, service, dl380, lenny, hassrvfs, hasbootfs, acpid-hosts, ulogd-hosts
+    hostgroups: computers, service, dl380, lenny, hassrvfs, hasbootfs, acpid-hosts, ulogd-hosts, nfs-client
   raff:
     address: 192.25.206.59
     parents: spohr
@@ -288,6 +288,11 @@ servers:
     address: 70.103.162.31
     parents: gw-brainfood
     hostgroups: computers, general, dl380, acpid-hosts, lenny, buildd, hasbootfs, hassrvfs
+  zee:
+    address: 80.245.147.40
+    parents: gw-brainfood
+    hostgroups: computers, porterbox, lenny, hassrvfs, hasbootfs
+
 
   ries:
     address: 128.148.34.103
@@ -479,6 +484,10 @@ servers:
     address: 137.82.84.70
     parents: gw-ubc
     hostgroups: computers, bl460, acpid-hosts, lenny
+  wolkenstein:
+    address: 137.82.84.89
+    parents: dijkstra
+    hostgroups: computers, lenny, hasbootfs, hassrvfs
   brahms:
     address: 137.82.84.74
     parents: dijkstra
@@ -928,7 +937,7 @@ services:
  ####
   -
     name: puppet
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-file_age -i 300 -f /var/lib/puppet/state/state.yaml"
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-file_age -i 540 -f /var/lib/puppet/state/state.yaml"
     hostgroups: lenny
     excludehosts: agnesi
 
@@ -1412,6 +1421,7 @@ services:
     name: unwanted process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
     hostgroups: computers
+    excludehosts: rietz
   -
     name: unwanted process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
@@ -1841,15 +1851,7 @@ services:
     hosts: global
   -
     name: mirror sync - security
-    check: "dsa_check_mirrorsync!security.debian.org!project/trace/security-master.debian.org"
-    hosts: global
-  -
-    name: mirror sync - security.eu
-    check: "dsa_check_mirrorsync!security.eu.debian.org!project/trace/security-master.debian.org"
-    hosts: global
-  -
-    name: mirror sync - security.us
-    check: "dsa_check_mirrorsync!security.us.debian.org!project/trace/security-master.debian.org"
+    check: "dsa_check_mirrorsync!security-nagios.debian.org!project/trace/security-master.debian.org"
     hosts: global
   -
     name: mirror sync - packages