Introduce hasusrfs and hasvarfs hostgroups

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index f4f6829..d01a087 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -173,15 +173,15 @@ servers:
   samosa:
     address: 192.25.206.57
     parents: spohr
-    hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, heavy-exim, lenny, puppet
+    hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, heavy-exim, lenny, puppet, hasvarfs, hasusrfs
   raff:
     address: 192.25.206.59
     parents: spohr
-    hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, rsyncd-hosts, heavy-exim, ulogd-hosts, nfs-client, lenny, puppet
+    hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, rsyncd-hosts, heavy-exim, ulogd-hosts, nfs-client, lenny, puppet, hasvarfs, hasusrfs
   gluck:
     address: 192.25.206.10
     parents: spohr
-    hostgroups: computers, no-udev, general, dl380, apache2-hosts, bind9-hosts, heavy-exim, highload, nfs-client, ulogd-hosts, lenny, puppet
+    hostgroups: computers, no-udev, general, dl380, apache2-hosts, bind9-hosts, heavy-exim, highload, nfs-client, ulogd-hosts, lenny, puppet, hasvarfs, hasusrfs
   merkel:
     address: 192.25.206.16
     parents: spohr
@@ -214,17 +214,17 @@ servers:
   merulo:
     address: 192.25.206.58
     parents: spohr
-    hostgroups: computers, porterbox, lenny, puppet
+    hostgroups: computers, porterbox, lenny, puppet, hasusrfs
 
   bartok:
     address: 82.195.75.91
     parents: gw-man-da
-    hostgroups: computers, service, dl385, bind9-hosts, lenny, puppet
+    hostgroups: computers, service, dl385, bind9-hosts, lenny, puppet, hasvarfs
     contacts: joerg, bzed
   morales:
     address: 82.195.75.97
     parents: gw-man-da
-    hostgroups: computers, porterbox, single-cpu, no-samhain, hasbootfs, hassrvfs, lenny, puppet
+    hostgroups: computers, porterbox, single-cpu, no-samhain, hasbootfs, hassrvfs, lenny, puppet, hasvarfs, hasusrfs
     contacts: bzed
   sperger:
     address: 82.195.75.98
@@ -303,11 +303,11 @@ servers:
   villa:
     address: 212.211.132.32
     parents: gw-scanplus-villa
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, puppet
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, puppet, hasvarfs, hasusrfs
   lobos:
     address: 212.211.132.250
     parents: gw-scanplus-lobos
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, puppet
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, puppet, hasvarfs, hasusrfs
 
   steffani:
     address: 128.31.0.36
@@ -334,7 +334,7 @@ servers:
   saens:
     address: 128.101.240.212
     parents: gw-umn.edu
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, puppet
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, puppet, hasvarfs, hasusrfs
 
   argento:
     address: 93.94.130.160
@@ -351,7 +351,7 @@ servers:
   pergolesi:
     address: 62.104.23.252
     parents: gw-freenet
-    hostgroups: computers, porterbox, sw-raid, lenny, puppet
+    hostgroups: computers, porterbox, sw-raid, lenny, puppet, hasusrfs
 
   albeniz:
     address: 193.62.202.27
@@ -379,7 +379,7 @@ servers:
   voltaire:
     address: 72.66.115.54
     parents: gw-frost
-    hostgroups: computers, buildd, puppet, lenny
+    hostgroups: computers, buildd, puppet, lenny, hasvarfs
     contacts: sfrost
 
   puccini:
@@ -390,7 +390,7 @@ servers:
   powell:
     address: 87.106.64.223
     parents: gw-1und1
-    hostgroups: computers, service, heavy-exim, rsyncd-hosts, ulogd-hosts, acpid-hosts, lenny, puppet, hassrvfs
+    hostgroups: computers, service, heavy-exim, rsyncd-hosts, ulogd-hosts, acpid-hosts, lenny, puppet, hassrvfs, hasvarfs, hasusrfs
     contacts: joerg
 
   schumann:
@@ -496,7 +496,7 @@ servers:
   tartini:
     address: 82.94.249.158
     parents: gw-telegraaf
-    hostgroups: computers, sw-raid, apache2-hosts, mysql-hosts, hasbootfs, hassrvfs, ulogd-hosts, lenny, puppet
+    hostgroups: computers, sw-raid, apache2-hosts, mysql-hosts, hasbootfs, hassrvfs, ulogd-hosts, lenny, puppet, hasvarfs, hasusrfs
 
   piatti:
     address: 193.167.161.225
@@ -522,7 +522,7 @@ servers:
   escher:
     address: 213.188.99.215
     parents: gw-cst
-    hostgroups: computers, single-cpu, hasbootfs
+    hostgroups: computers, single-cpu, hasbootfs, hasvarfs
   goedel:
     address: 213.188.99.214
     parents: gw-cst
@@ -692,10 +692,16 @@ hostgroups:
     alias: hosts with smartd
     private: 1
   hasbootfs:
-    alias: hosts with a /boot
+    alias: hosts with a /boot filesystem
     private: 1
   hassrvfs:
-    alias: hosts with a /srv
+    alias: hosts with a /srv filesystem
+    private: 1
+  hasvarfs:
+    alias: hosts with a /var filesystem
+    private: 1
+  hasusrfs:
+    alias: hosts with a /usr filesystem
     private: 1
 
   incomingmailrelayed:
@@ -779,7 +785,7 @@ services:
     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, voltaire, tartini, morales, powell, escher
+    hostgroups: hasvarfs
   -
     name: disk usage on /org
     servicegroups: diskspace
@@ -809,7 +815,7 @@ services:
     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, merulo, tartini, morales, powell
+    hostgroups: hasusrfs
   -
     name: disk usage on /home
     servicegroups: diskspace