X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=f3dda47084691de3ab0f16aec8ae760fa56c3c0f;hb=f3999c35cda358a1e63bc9c50b271b811e0d0dcf;hp=403698d6615f92a20885acdde32489414d61471f;hpb=671e7dc4f3f816edd7525d1117621d3cec8c5af2;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 403698d..f3dda47 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -19,15 +19,6 @@ servers:
     hostgroups: notacomputer
     pingable: false
     check_command: dsa_check_always_ok
-  gw-1und1:
-    address: 195.20.247.54
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
-    contacts: joerg
-#  gw-1und1-sec:
-#    address: 212.227.126.33
-#    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
   gw-accumu:
     address: 130.239.18.97
     parents: gw-ubcece
@@ -45,11 +36,7 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-arm:
-    address: 82.44.141.46
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
-  gw-brainfood:
-    address: 70.103.162.1
+    address: 213.104.121.213
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-brown:
@@ -167,7 +154,7 @@ servers:
   # {{{ gw-1und1
   powell:
     address: 87.106.64.223
-    parents: gw-1und1
+    parents: gw-ubcece
     hostgroups: computers, service, acpid-hosts, wheezy
   pkgmirror-1and1:
     address: 213.165.95.4
@@ -253,7 +240,7 @@ servers:
   # {{{ gw-brainfood
   murphy:
     address: 97.107.116.31
-    parents: gw-brainfood
+    parents: gw-ubcece
     hostgroups: computers, general, dl380, acpid-hosts, buildd, hasbootfs, hassrvfs, squeeze
   # }}}
   # {{{ gw-brown
@@ -416,7 +403,7 @@ servers:
   fasch:
     address: 194.177.211.201
     parents: rautavaara
-    hostgroups: computers, freebsd, squeeze, buildd, hassrvfs
+    hostgroups: computers, freebsd, wheezy, buildd, hassrvfs
     contacts: christoph
   grieg:
     address: 194.177.211.200
@@ -1371,7 +1358,7 @@ services:
   -
     name: disk usage on /srv/mirrors
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/mirrors"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv/mirrors"
     hosts: beethoven, sibelius
   -
     name: disk usage on /srv/snapshot.debian.org
@@ -2497,9 +2484,8 @@ services:
     contact_groups: +buildd
   -
     name: processes - lvcreate
-    nrpe: "check_procs -m 'ELAPSED' -c 500 -C lvcreate -u root -a 'lvcreate'"
-    #hostgroups: buildd
-    hosts: mundy
+    nrpe: "/usr/lib/nagios/plugins/check_procs -m 'ELAPSED' -c 500 -C lvcreate -u root -a 'lvcreate'"
+    hostgroups: buildd
     contact_groups: +buildd
  ####
   -