coincy has apache

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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index df951eb..0189860 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -326,6 +326,10 @@ servers:
     address: 5.153.231.12
     parents: gw-bytemark
     hostgroups: computers, hassrvfs, kvmdomains, wheezy
+  philp:
+    address: 5.153.231.13
+    parents: gw-bytemark
+    hostgroups: computers, hassrvfs, kvmdomains, wheezy, apache2-hosts
   # }}}
   # {{{ gw-c3sl
   santoro:
@@ -719,7 +723,7 @@ servers:
   stabile:
     address: 206.12.19.13
     parents: sw-ubcece-kais
-    hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, apache2-hosts, xinetd-hosts, service, nfs-server, squeeze, hassrvfs
+    hostgroups: computers, hashomefs, sw-raid, rsyncd-hosts, apache2-hosts, xinetd-hosts, service, nfs-server, squeeze, hassrvfs
   paganini:
     address: 206.12.19.10
     parents: sw-ubcece-kais
@@ -873,7 +877,7 @@ servers:
   coincy:
     address: 206.12.19.144
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts
   stanley:
     address: 206.12.19.145
     parents: ganeti2
@@ -1305,7 +1309,7 @@ services:
     name: disk usage on /var/lib/postgresql
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/lib/postgresql"
-    hosts: stabile, sibelius, busoni, buxtehude
+    hosts: sibelius, busoni, buxtehude
   -
     name: disk usage on /var/log
     servicegroups: diskspace
@@ -1316,12 +1320,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/spool/postfix"
     hosts: bendel
-
-  #-
-  #  name: disk usage on /srv/morgue.debian.org
-  #  servicegroups: diskspace
-  #  nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv/morgue.debian.org"
-  #  hosts: stabile
   -
     name: disk usage on /srv/mirrors
     servicegroups: diskspace
@@ -1393,6 +1391,7 @@ services:
     servicegroups: backup
     nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-dabackup"
     hostgroups: computers
+    excludehosts: backuphost
     normal_check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
@@ -1400,7 +1399,7 @@ services:
     name: backup server config
     servicegroups: backup
     nrpe: "/usr/lib/nagios/plugins/dsa-check-dabackup-server"
-    hosts: beethoven
+    hosts: beethoven, backuphost
     normal_check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5