armhf buildd relocation arm->ynic

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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 30c0fd9..6a55fec 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -1019,11 +1019,15 @@ servers:
     hostgroups: secondary-IPs
   # }}}
   # {{{ gw-ynic
-  howells:
+  henze:
+    address: 144.32.168.74
+    parents: gw-ynic
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd
+  hasse:
     address: 144.32.168.75
     parents: gw-ynic
     hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd
-  hummel:
+  antheil:
     address: 144.32.168.76
     parents: gw-ynic
     hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd
@@ -1352,7 +1356,7 @@ services:
   -
     name: disk usage - all
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs 95 98"
+    nrpe: "/usr/lib/nagios/plugins/check_disk -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs -x /srv/farm-snapshot/farm-misc 95 98"
     hosts: sibelius
 
   -
@@ -1416,9 +1420,24 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 94 /srv/snapshot.debian.org"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-misc
+    name: disk usage on /srv/farm-snapshot/farm-1
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-1"
+    hosts: sibelius
+  -
+    name: disk usage on /srv/farm-snapshot/farm-2
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-2"
+    hosts: sibelius
+  -
+    name: disk usage on /srv/farm-snapshot/farm-3
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-misc"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-3"
+    hosts: sibelius
+  -
+    name: disk usage on /srv/farm-snapshot/farm-4
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 97 95 /srv/farm-snapshot/farm-4"
     hosts: sibelius
   -
     name: disk usage on /var/lib/postgresql/9.1
@@ -1529,7 +1548,7 @@ services:
     servicegroups: backup
     nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-dabackup"
     hostgroups: computers
-    excludehosts: backuphost
+    excludehosts: backuphost, storace
     normal_check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
@@ -1537,7 +1556,7 @@ services:
     name: backup server config
     servicegroups: backup
     nrpe: "/usr/lib/nagios/plugins/dsa-check-dabackup-server"
-    hosts: backuphost
+    hosts: backuphost, storace
     normal_check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
@@ -1864,18 +1883,10 @@ services:
   # }}}
   # {{{ HW health/raid
   -
-    name: process - mdadm monitor
-    servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C mdadm -a '/sbin/mdadm --monitor --pid-file /var/run/mdadm/monitor.pid --daemonise --scan'"
-    hostgroups: sw-raid
-    excludehostgroups: wheezy
-  -
-    # wheezy:
     name: process - mdadm monitor
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C mdadm -a '/sbin/mdadm --monitor --pid-file /run/mdadm/monitor.pid --daemonise --scan'"
     hostgroups: sw-raid
-    excludehostgroups: squeeze
   -
     name: RAID - sw raid
     servicegroups: raid
@@ -2295,7 +2306,7 @@ services:
   -
     name: postgresql backups
     nrpe: "/usr/bin/sudo -u debbackup /usr/lib/nagios/plugins/dsa-check-backuppg"
-    hosts: backuphost
+    hosts: storace
   # }}}
   # {{{ power
 #  -