lucatelli: decomission

[mirror/dsa-nagios.git] / config / nagios-master.cfg

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 07f0ae5..092416a 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -259,15 +259,15 @@ servers:
   arm-arm-01:
     address: 217.140.96.58
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie, broken_mq
-  arm-arm-02:
-    address: 217.140.96.59
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie, broken_mq
+    hostgroups: computers, hassrvfs, buildd, jessie, broken_mq
   arm-arm-03:
     address: 217.140.96.60
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie, broken_mq
+    hostgroups: computers, hassrvfs, buildd, jessie, broken_mq
+  arm-arm-04:
+    address: 217.140.96.61
+    parents: gw-arm
+    hostgroups: computers, hassrvfs, buildd, jessie, broken_mq
   harris:
     address: 217.140.96.66
     parents: gw-arm
@@ -280,10 +280,6 @@ servers:
     address: 217.140.96.71
     parents: gw-arm
     hostgroups: computers, hasbootfs, hassrvfs, armhf, jessie, buildd, broken_mq
-  arm-arm-04:
-    address: 217.140.96.61
-    parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, buildd, broken_mq, sw-raid, acpid-hosts
   # }}}
   # {{{ gw-brown
   franck:
@@ -814,6 +810,10 @@ servers:
     address: 82.195.75.65
     parents: ganeti3
     hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, apache2-hosts, jessie, apache-https
+  mips-manda-01:
+    address: 82.195.75.66
+    parents: gw-man-da
+    hostgroups: computers, buildd, jessie, hassrvfs
   mipsel-manda-01:
     address: 82.195.75.72
     parents: gw-man-da
@@ -822,6 +822,10 @@ servers:
     address: 82.195.75.74
     parents: gw-man-da
     hostgroups: computers, buildd, jessie, hassrvfs, sw-raid, hasbootfs
+  mipsel-manda-03:
+    address: 82.195.75.67
+    parents: gw-man-da
+    hostgroups: computers, buildd, jessie, hassrvfs
   seger:
     address: 82.195.75.93
     parents: ganeti3
@@ -864,10 +868,6 @@ servers:
     address: 140.211.166.198
     parents: pieta
     hostgroups: computers, jessie, hassrvfs, porterbox
-  merulo:
-    address: 140.211.166.46
-    parents: gw-osuosl
-    hostgroups: computers, porterbox, hasusrfs, wheezy
   partch:
     address: 140.211.15.152
     parents: gw-osuosl
@@ -888,7 +888,7 @@ servers:
   smetana:
     address: 193.62.202.29
     parents: gw-sanger
-    hostgroups: computers, porterbox, sw-raid, sparc, wheezy
+    hostgroups: computers, sw-raid, sparc, wheezy, no-bacula
     contacts: tjrc1, dave
   # }}}
   # {{{ gw-scanplus
@@ -906,6 +906,14 @@ servers:
     address: 86.59.118.155
     parents: gw-sil
     hostgroups: computers, buildd, jessie, sw-raid
+  mips-sil-01:
+    address: 86.59.118.146
+    parents: gw-sil
+    hostgroups: computers, buildd, jessie, hassrvfs
+  mipsel-sil-01:
+    address: 86.59.118.147
+    parents: gw-sil
+    hostgroups: computers, buildd, jessie, hassrvfs
   # }}}
   # {{{ gw-ubcece
   sw-ubcece:
@@ -984,10 +992,6 @@ servers:
     parents: ganeti2
     hostgroups: computers, freebsd, jessie, buildd, hassrvfs
     contacts: christoph
-  lucatelli:
-    address: 206.12.19.15
-    parents: sw-ubcece-kais
-    hostgroups: computers, buildd, jessie
 #  locke:
 #    address: 206.12.19.120
 #    parents: sw-ubcece-kais
@@ -1337,9 +1341,6 @@ hostgroups:
   hasvarlogfs:
     alias: hosts with a /var/log filesystem
     private: 1
-  hasusrfs:
-    alias: hosts with a /usr filesystem
-    private: 1
 
   incomingmailrelayed:
     alias: incoming mail needs to go through a mail relay
@@ -1459,11 +1460,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv"
     hostgroups: hassrvfs
-  -
-    name: disk usage on /usr
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /usr"
-    hostgroups: hasusrfs
   -
     name: disk usage on /var/lib/postgresql
     servicegroups: diskspace
@@ -1634,7 +1630,7 @@ services:
     servicegroups: backup
     nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-dabackup"
     hostgroups: computers
-    excludehosts: backuphost, storace, backuphost
+    excludehosts: backuphost, storace
     check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5