X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=config%2Fnagios-master.cfg;h=099bc2a9ecb7071d42db726dd0a83b42b930db18;hb=efb918076aed02fe22eee2737fa52c67b033a69b;hp=04db0e44ad09ebc6f021692df2dd2e8f210dd20b;hpb=db84f0a073b5a6027009de0596e0b554c0b3affe;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 04db0e4..099bc2a 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -206,10 +206,6 @@ servers:
     address: 217.140.96.56
     parents: gw-arm
     hostgroups: computers, hasbootfs, hassrvfs, porterbox, wheezy, deadslow
-  alain:
-    address: 217.140.96.58
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, deadslow
   alwyn:
     address: 217.140.96.59
     parents: gw-arm
@@ -282,6 +278,10 @@ servers:
     address: 5.153.231.248
     parents: gw-bytemark
     hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
+  bm-bl9:
+    address: 5.153.231.249
+    parents: gw-bytemark
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy
 
   milanollo:
     address: 5.153.231.2
@@ -337,20 +337,16 @@ servers:
     address: 5.153.231.13
     parents: ganeti-bytemark
     hostgroups: computers, hassrvfs, kvmdomains, wheezy, apache2-hosts
-  petrova:
-    address: 5.153.231.25
-    parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, wheezy, apache2-hosts
   couper:
     address: 5.153.231.14
     parents: ganeti-bytemark
     hostgroups: computers, hassrvfs, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs
   rainier:
-    address: 5.153.231.15
+    address: 5.153.231.16
     parents: ganeti-bytemark
     hostgroups: computers, kvmdomains, wheezy, no-bacula
   rapoport:
-    address: 5.153.231.16
+    address: 5.153.231.15
     parents: ganeti-bytemark
     hostgroups: computers, kvmdomains, wheezy, no-bacula
   delfin:
@@ -387,6 +383,18 @@ servers:
     address: 5.153.231.24
     parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, wheezy, bind9-hosts, no-bacula
+  petrova:
+    address: 5.153.231.25
+    parents: ganeti-bytemark
+    hostgroups: computers, kvmdomains, wheezy, apache2-hosts
+  oyens:
+    address: 5.153.231.26
+    parents: ganeti-bytemark
+    hostgroups: computers, kvmdomains, wheezy
+  barriere:
+    address: 5.153.231.27
+    parents: ganeti-bytemark
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, porterbox
   # }}}
   # {{{ gw-c3sl
   santoro:
@@ -491,27 +499,27 @@ servers:
   lw01:
     address: 185.17.185.177
     parents: gw-leaseweb
-    hostgroups: computers, wheezy, dl180
+    hostgroups: computers, service, acpid-hosts, wheezy, dl180
   lw02:
     address: 185.17.185.178
     parents: gw-leaseweb
-    hostgroups: computers, wheezy, dl180
+    hostgroups: computers, service, acpid-hosts, wheezy, dl180
   lw03:
     address: 185.17.185.179
     parents: gw-leaseweb
-    hostgroups: computers, wheezy, dl180
+    hostgroups: computers, service, acpid-hosts, wheezy, dl180
   lw04:
     address: 185.17.185.180
     parents: gw-leaseweb
-    hostgroups: computers,  wheezy, dl180
+    hostgroups: computers,  service, acpid-hosts, wheezy, dl180
   lw05:
     address: 185.17.185.181
     parents: gw-leaseweb
-    hostgroups: computers,  wheezy, dl120, sw-raid
+    hostgroups: computers,  service, acpid-hosts, wheezy, dl120, sw-raid
   lw06:
     address: 185.17.185.182
     parents: gw-leaseweb
-    hostgroups: computers,  wheezy, dl120, sw-raid
+    hostgroups: computers,  service, acpid-hosts, wheezy, dl120, sw-raid
   # }}}
   # {{{ gw-karlsruhe
   zemlinsky:
@@ -883,10 +891,6 @@ servers:
     address: 206.12.19.134
     parents: ganeti2
     hostgroups: computers, service, kvmdomains, wheezy, xinetd-hosts, nfs-client, autofs
-  barriere:
-    address: 206.12.19.135
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, porterbox
   diabelli:
     address: 206.12.19.136
     parents: traetta
@@ -956,10 +960,6 @@ servers:
     hostgroups: secondary-IPs
   # }}}
   # {{{ gw-ynic
-  hildegard:
-    address: 144.32.168.74
-    parents: gw-ynic
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, deadslow, buildd
   howells:
     address: 144.32.168.75
     parents: gw-ynic
@@ -2138,6 +2138,13 @@ 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
+    #hostgroups: computers
+    #excludehosts: villa, lobos, senfl, schein
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"