Add gombert

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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 2efa022..a98f1e9 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -199,13 +199,13 @@ servers:
   vasks:
     address: 217.196.43.140
     parents: gw-telegraaf2
-    hostgroups: computers, nfs-server, postgres84-hosts, apache2-hosts, acpid-hosts, apache-https
+    hostgroups: computers, nfs-server, postgres84-hosts, apache2-hosts, acpid-hosts, apache-https, brokensamhain
     contact_groups: alioth-admins
 
   wagner:
     address: 217.196.43.132
     parents: gw-telegraaf2
-    hostgroups: computers, bind9-hosts, apache2-hosts, nfs-client, xinetd-hosts, postgres90-hosts, apache-https, dl385
+    hostgroups: computers, bind9-hosts, apache2-hosts, nfs-client, xinetd-hosts, postgres90-hosts, apache-https, dl385, brokensamhain
     contact_groups: alioth-admins
 
   samosa:
@@ -241,7 +241,7 @@ servers:
   mundy:
     address: 192.25.206.62
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, lenny
+    hostgroups: computers, buildd, hassrvfs, sw-raid, acpid-hosts, squeeze, brokensamhain
   paer:
     address: 192.25.206.11
     parents: gw-HP-ftc
@@ -253,7 +253,7 @@ servers:
   alkman:
     address: 192.25.206.63
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, acpid-hosts, squeeze
+    hostgroups: computers, buildd, acpid-hosts, squeeze, brokensamhain
 
   sperger:
     address: 82.195.75.34
@@ -673,6 +673,14 @@ servers:
     address: 206.12.19.130
     parents: salieri
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
+  berlioz:
+    address: 206.12.19.131
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, apache2-hosts, hassrvfs
+  gombert:
+    address: 206.12.19.132
+    parents: traetta
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
 
   lebrun:
     address: 193.198.184.10
@@ -706,7 +714,7 @@ servers:
   zandonai:
     address: 80.245.147.46
     parents: gw-zivit
-    hostgroups: computers, buildd, hassrvfs, squeeze
+    hostgroups: computers, buildd, hassrvfs, squeeze, brokensamhain
 
   goedel:
     address: 213.188.99.214
@@ -817,7 +825,7 @@ servers:
   alain:
     address: 217.140.96.58
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, lenny
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, squeeze
   alwyn:
     address: 217.140.96.59
     parents: gw-arm
@@ -1061,6 +1069,10 @@ hostgroups:
     alias: "hosts who's ntp offset is often unknown"
     private: 1
 
+  brokensamhain:
+    alias: machines that can not run samhain
+    private: 1
+
 #############################
 # servicegroups
 #############################
@@ -1238,14 +1250,24 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-89"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-abf
+    name: disk usage on /srv/farm-snapshot/farm-ab
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-abf"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-ab"
     hosts: sibelius
   -
-    name: disk usage on /srv/farm-snapshot/farm-cde
+    name: disk usage on /srv/farm-snapshot/farm-cd
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-cde"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-cd"
+    hosts: sibelius
+  -
+    name: disk usage on /srv/farm-snapshot/farm-f
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-f"
+    hosts: sibelius
+  -
+    name: disk usage on /srv/farm-snapshot/farm-e
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 85 95 /srv/farm-snapshot/farm-e"
     hosts: sibelius
   -
     name: disk usage on /srv/fossology.debian.net
@@ -1362,7 +1384,7 @@ services:
     name: process - samhain
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C samhain -a '/usr/sbin/samhain'"
     hostgroups: computers
-    excludehosts: vasks, wagner
+    excludehostgroups: brokensamhain
   -
     name: samhain
     servicegroups: samhain
@@ -1371,7 +1393,7 @@ services:
     depends: process - samhain
     normal_check_interval: 60
     retry_check_interval: 5
-    excludehosts: vasks, wagner
+    excludehostgroups: brokensamhain
 
  ####
   -