X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=0189860dcaa562cedb0f0e801adc0eeeccdd6450;hb=f24f1478082f4d96d2f6f5d5a6c2b64dd9ad06ce;hp=bd1f8a895dd9b57290426bb79ea55b998cbce838;hpb=f9729cd743bed8a9b1e69c197eedabf3c4f3001c;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index bd1f8a8..0189860 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -322,6 +322,14 @@ servers:
     address: 5.153.231.11
     parents: gw-bytemark
     hostgroups: computers, hassrvfs, kvmdomains, wheezy, autofs, nfs-client
+  backuphost:
+    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:
@@ -616,14 +624,6 @@ servers:
     address: 86.59.118.152
     parents: gw-sil
     hostgroups: computers, buildd, wheezy
-  merikanto:
-    address: 86.59.118.147
-    parents: gw-sil
-    hostgroups: computers, dl360, acpid-hosts, nfs-client, rsyncd-hosts, xinetd-hosts, service, squeeze, autofs
-  merikanto2:
-    address: 86.59.118.150
-    parents: merikanto
-    hostgroups: secondary-IPs
   # }}}
   # {{{ gw-telegraaf2
   vasks:
@@ -720,14 +720,10 @@ servers:
     address: 206.12.19.113
     parents: ganeti2
     hostgroups: computers, service, bind9-hosts, kvmdomains, wheezy
-  morricone:
-    address: 206.12.19.9
-    parents: sw-ubcece-kais
-    hostgroups: computers, hasbootfs, hasvarfs, hassrvfs, aacraid, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts, service, squeeze, uploadqueue
   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
@@ -881,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
@@ -1313,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
@@ -1324,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
@@ -1401,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
@@ -1408,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
@@ -2228,17 +2219,12 @@ services:
     check: check_tcp!873
     hostgroups: rsyncd-hosts
     depends: process - xinetd
-    excludehosts: merikanto, rietz
+    excludehosts: rietz
   -
     name: network service - rsync
     check: check_tcp!873
     hosts: rietz2
     depends: rietz:process - xinetd
-  -
-    name: network service - rsync
-    check: check_tcp!873
-    hosts: merikanto2
-    depends: merikanto:process - xinetd
   -
     name: network service - rsync
     check: check_tcp!873
@@ -2422,7 +2408,8 @@ services:
   -
     name: postgresql backups
     nrpe: "/usr/bin/sudo -u debbackup /usr/lib/nagios/plugins/dsa-check-backuppg"
-    hosts: beethoven
+    #hosts: beethoven
+    hosts: backuphost
  ####
  ####
   -