X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=e0a3fbb23116a57dd432f4098f8cafd8bcfe5400;hb=d4b04d6bb4e86596fb23fd1a412038a38e41aa92;hp=193f9f2c7efb4c5143607d2ac133426a858e62cb;hpb=64beb64ce57199c59e8dac9d630d82ff46afa01d;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 193f9f2..e0a3fbb 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -218,6 +218,14 @@ servers:
     address: 217.140.96.57
     parents: gw-arm
     hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, broken_mq
+  arm-arm-01:
+    address: 217.140.96.58
+    parents: gw-arm
+    hostgroups: hasbootfs, hassrvfs, buildd, wheezy, broken_mq
+  arm-arm-02:
+    address: 217.140.96.59
+    parents: gw-arm
+    hostgroups: hasbootfs, hassrvfs, buildd, wheezy, broken_mq
   harris:
     address: 217.140.96.66
     parents: gw-arm
@@ -340,7 +348,7 @@ servers:
   coccia:
     address: 5.153.231.11
     parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, wheezy, autofs, nfs-client
+    hostgroups: computers, hassrvfs, kvmdomains, wheezy, autofs, nfs-client, uploadqueue, xinetd-hosts
   backuphost:
     address: 5.153.231.12
     parents: ganeti-bytemark
@@ -414,7 +422,7 @@ servers:
   paradis:
     address: 5.153.231.30
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, apache-https
   # }}}
   # {{{ gw-c3sl
   santoro:
@@ -526,19 +534,10 @@ servers:
     address: 185.17.185.180
     parents: gw-leaseweb
     hostgroups: computers, service, acpid-hosts, wheezy, dl180, nfs-server
-  lw05:
-    address: 185.17.185.181
-    parents: gw-leaseweb
-    hostgroups: computers,  service, acpid-hosts, wheezy, dl120, sw-raid, nfs-client, autofs, hassrvfs, apache2-hosts
-  lw06:
-    address: 185.17.185.182
-    parents: gw-leaseweb
-    hostgroups: computers,  service, acpid-hosts, wheezy, dl120, sw-raid, nfs-client, autofs, hassrvfs, apache2-hosts
   lw07:
     address: 185.17.185.187
     parents: gw-leaseweb
-    hostgroups: computers,  service, acpid-hosts, wheezy, dl180, nfs-client, autofs, hassrvfs, postgres91-hosts
-  #, apache2-hosts
+    hostgroups: computers,  service, acpid-hosts, wheezy, dl180, nfs-client, autofs, hassrvfs, postgres91-hosts, apache2-hosts
   lw08:
     address: 185.17.185.189
     parents: gw-leaseweb
@@ -574,6 +573,14 @@ servers:
     address: 82.195.75.110
     parents: ganeti3
     hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, spamd, heavy-exim, highload
+  mipsel-manda-01:
+    address: 82.195.75.72
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy
+  mipsel-manda-02:
+    address: 82.195.75.74
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy
   fils:
     address: 82.195.75.89
     parents: ganeti3
@@ -643,11 +650,11 @@ servers:
   mipsel-manda-01:
     address: 82.195.75.72
     parents: gw-man-da
-    hostgroups: computers, buildd, wheezy, hassrvfs
-  #mipsel-manda-02:
-  #  address: 82.195.75.74
-  #  parents: gw-man-da
-  #  hostgroups: computers, buildd, wheezy, hassrvfs
+    hostgroups: computers, buildd, wheezy, hassrvfs, sw-raid
+  mipsel-manda-02:
+    address: 82.195.75.74
+    parents: gw-man-da
+    hostgroups: computers, buildd, wheezy, hassrvfs, sw-raid
   # }}}
   # {{{ gw-marist
   zani:
@@ -772,7 +779,7 @@ servers:
   ravel:
     address: 206.12.19.5
     parents: sw-ubcece-kais
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-client, rsyncd-hosts, uploadqueue, hasorgfs, xinetd-hosts, wheezy, autofs
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-client, hasorgfs, wheezy, autofs
   dijkstra:
     address: 206.12.19.218
     parents: sw-ubcece-kais
@@ -1916,11 +1923,10 @@ services:
     normal_check_interval: 120
     hostgroups: dl585
   ###
-  -
-    name: HW - edac status
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-edac"
-    normal_check_interval: 120
-    hosts: lw05, lw06
+#  -
+#    name: HW - edac status
+#    nrpe: "/usr/lib/nagios/plugins/dsa-check-edac"
+#    normal_check_interval: 120
     #hostgroups: computers
     #excludehosts: villa, lobos, senfl, schein
   -