X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=0fab62d7be105a1dce9af17325d8050cc211d5cd;hb=43056d61e7214e4a161e58fb9ddcb9fc59088d61;hp=a3ebbb37b01e7c42ba2bbe8113edc3d85c8d9c63;hpb=6d7e43da1bd44f2955a431b98ed77db5270015c9;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index a3ebbb3..0fab62d 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -308,6 +308,7 @@ servers:
     address: 87.106.4.56
     parents: gw-1und1
     hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts
+    contacts: joerg
 
   caballero:
     address: 193.201.200.200
@@ -354,7 +355,7 @@ servers:
 
   lebrun:
     address: 161.53.160.165
-    parents: gw-ubc
+    parents: gw-carnet
     hostgroups: computers, buildd
 
 #############################
@@ -456,6 +457,14 @@ hostgroups:
     alias: secondary IP addresses
     private: 1
 
+
+#############################
+# servicegroups
+#############################
+servicegroups:
+  diskspace:
+    alias: diskusage checks
+
 #############################
 # services
 #############################
@@ -483,66 +492,82 @@ services:
  ####
   -
     name: disk usage - all
+    servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95"
     hostgroups: computers
   -
     name: disk usage on /
+    servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /"
     hostgroups: computers
   -
     name: disk usage on /boot
+    servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /boot"
     hosts: sperger, rietz, steffani, penalosa, peri, albeniz, escher, goetz, mayer, mayr, paer, spontini
   -
     name: disk usage on /var
+    servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var"
-    hosts: bartok, samosa, raff, lobos, villa, gluck, saens, escher, voltaire, puccini
+    hosts: bartok, samosa, raff, lobos, villa, gluck, saens, escher, voltaire, puccini, lebrun
   -
     name: disk usage on /org
+    servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
     hosts: bartok, sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, puccini, spontini
   -
     name: disk usage on /org
+    servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /org"
     hosts: merkel
   -
     name: disk usage on /srv
+    servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv"
     hosts: agricola, arcadelt, argento, allegri
   -
     name: disk usage on /org/scratch
+    servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org/scratch"
     hosts: merkel
   -
     name: disk usage on /tmp
+    servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
     hosts: samosa, raff, gluck, saens, escher, puccini, merkel
   -
     name: disk usage on /usr
+    servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /usr"
     hosts: samosa, raff, lobos, villa, gluck, saens, pergolesi, puccini, merulo
   -
     name: disk usage on /home
+    servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
-    hosts: raptor, escher, voltaire
+    hosts: raptor, escher, voltaire, lebrun
   -
     name: disk usage on /home
+    servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /home"
     hosts: gluck
   -
     name: disk usage on /chroot
+    servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /chroot"
     hosts: raptor
   -
     name: disk usage on /mnt/hdc
+    servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /mnt/hdc"
     hosts: voltaire
   -
     name: disk usage on /mnt/sdb1
+    servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /mnt/sdb1"
     hosts: spontini
   -
     name: disk usage on /x
+    servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /x"
     hosts: caballero