X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=65f737eb7da7d49078013605558f7f0a63247100;hb=9b2891ae2b321a2854f031cff606caa21d79b512;hp=9de6d3eeff1b6b4ee4d0c2b8d3441a4cbc15172d;hpb=40af1e054a9721d6d848a88f0d27ed7d8d1511d5;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 9de6d3e..65f737e 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -303,7 +303,7 @@ servers:
   pejacevic:
     address: 5.153.231.6
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs, apache-https
     contacts: holger
   piu-slave-bm-a:
     address: 5.153.231.7
@@ -326,6 +326,26 @@ 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
+  couper:
+    address: 5.153.231.14
+    parents: gw-bytemark
+    hostgroups: computers, hassrvfs, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs
+  rainier:
+    address: 5.153.231.15
+    parents: gw-bytemark
+    hostgroups: computers, kvmdomains, wheezy
+  rapoport:
+    address: 5.153.231.16
+    parents: gw-bytemark
+    hostgroups: computers, kvmdomains, wheezy
+  delfin:
+    address: 5.153.231.17
+    parents: gw-bytemark
+    hostgroups: computers, hassrvfs, kvmdomains, wheezy, apache2-hosts
   # }}}
   # {{{ gw-c3sl
   santoro:
@@ -719,7 +739,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
@@ -870,10 +890,6 @@ servers:
     address: 206.12.19.143
     parents: ganeti2
     hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, apache-https
-  coincy:
-    address: 206.12.19.144
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy
   stanley:
     address: 206.12.19.145
     parents: ganeti2
@@ -1305,7 +1321,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 +1332,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
@@ -2507,8 +2517,8 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C rpc.mountd -a '/sbin/rpc.mountd'"
     hostgroups: nfs-server
   -
-    name: nfs server stabile reachable
-    nrpe: "/usr/lib/nagios/plugins/check_ping -H 192.168.2.13 -w 50,10% -c 200,30%"
+    name: nfs server glinka reachable
+    nrpe: "/usr/lib/nagios/plugins/check_ping -H 192.168.2.76 -w 50,10% -c 200,30%"
     hosts: quantz
   #
   -