pettersson is an nfs client now

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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 9ba2ff8..2acfcb7 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -377,7 +377,7 @@ servers:
   widor:
     address: 93.94.130.161
     parents: gw-dg-i.net
-    hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs, heavy-exim
+    hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs
     contacts: bzed
 
   pergolesi:
@@ -539,7 +539,7 @@ servers:
   cimarosa:
     address: 206.12.19.8
     parents: gw-ubc
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, nfs-client, heavy-exim, apache2-hosts
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, nfs-client, apache2-hosts
   paganini:
     address: 206.12.19.10
     parents: tchaikovsky
@@ -568,6 +568,14 @@ servers:
     address: 206.12.19.111
     parents: luchesi
     hostgroups: computers, freebsd, squeeze
+  gabrielli:
+    address: 206.12.19.17
+    parents: tchaikovsky
+    hostgroups: computers, single-cpu 
+  corelli:
+    address: 206.12.19.16
+    parents: tchaikovsky
+    hostgroups: computers, single-cpu, buildd, ulogd-hosts
 
   lebrun:
     address: 193.198.184.10
@@ -576,7 +584,7 @@ servers:
   schroeder:
     address: 193.198.184.11
     parents: gw-carnet
-    hostgroups: computers, buildd, sw-raid, hasbootfs, hasorgfs
+    hostgroups: computers, buildd, sw-raid, hassrvfs
 
   tartini:
     address: 82.94.249.158
@@ -620,7 +628,7 @@ servers:
   pettersson:
     address: 130.239.18.123
     parents: gw-aca
-    hostgroups: computers, hasbootfs, aacraid
+    hostgroups: computers, hasbootfs, aacraid, nfs-client
 
   lafayette:
     address: 147.215.7.160
@@ -630,7 +638,7 @@ servers:
   grieg:
     address: 194.177.211.200
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, megaraid
+    hostgroups: computers, apache2-hosts, acpid-hosts, megaraid, heavy-exim, postgres84-hosts
   rautavaara:
     address: 194.177.211.199
     parents: gw-grnet
@@ -682,6 +690,20 @@ servers:
     address: 86.59.118.146
     parents: gw-sil
     hostgroups: computers, hasbootfs, aacraid, ulogd-hosts
+  merikanto:
+    address: 86.59.118.147
+    parents: gw-sil
+    hostgroups: computers, dl360, acpid-hosts, spamd, heavy-exim
+  englund:
+    address: 86.59.118.148
+    parents: gw-sil
+    hostgroups: computers, acpid-hosts
+    # which raid?
+  lindberg:
+    address: 86.59.118.149
+    parents: gw-sil
+    hostgroups: computers, acpid-hosts
+    # which raid?
 
 
 #############################
@@ -1750,7 +1772,7 @@ services:
   -
     name: network service - https
     check: check_https
-    hosts: ries, chopin, draghi, liszt, spohr, widor, rietz, tchaikovsky, cimarosa
+    hosts: ries, chopin, draghi, liszt, spohr, widor, rietz, tchaikovsky, grieg
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
@@ -1764,7 +1786,7 @@ services:
     # merkel2          nm.debian.org
     # liszt            lists.debian.org
     # cimarosa         buildd.debian.org
-    hosts: ries, chopin, spohr, tchaikovsky, draghi, merkel2, liszt, widor, rietz, cimarosa
+    hosts: ries, chopin, spohr, tchaikovsky, draghi, merkel2, liszt, widor, rietz, grieg
     depends: network service - https
     normal_check_interval: 60