lucatelli: decomission

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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 1095388..092416a 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -810,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
@@ -819,7 +823,7 @@ servers:
     parents: gw-man-da
     hostgroups: computers, buildd, jessie, hassrvfs, sw-raid, hasbootfs
   mipsel-manda-03:
-    address: 82.195.75.66
+    address: 82.195.75.67
     parents: gw-man-da
     hostgroups: computers, buildd, jessie, hassrvfs
   seger:
@@ -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, sw-raid, sparc, wheezy
+    hostgroups: computers, sw-raid, sparc, wheezy, no-bacula
     contacts: tjrc1, dave
   # }}}
   # {{{ gw-scanplus
@@ -992,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
@@ -1345,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
@@ -1467,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
@@ -1642,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