X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=ad8a1de62de7e53a9d5530a3826df83b315cf58f;hb=99d26a04875b5a05086751697181661b4f4cbcb5;hp=63ea62e4c1943b2026842980964cc5f3ce453719;hpb=e93906ce603da1ac67a8b28f2b1efd8088e19735;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 63ea62e..ad8a1de 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -236,12 +236,6 @@ servers:
     parents: gw-arm
     hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd, deadslow
   # }}}
-  # {{{ gw-brainfood
-  murphy:
-    address: 97.107.116.31
-    parents: gw-ubcece
-    hostgroups: computers, general, dl380, acpid-hosts, buildd, hasbootfs, hassrvfs, squeeze
-  # }}}
   # {{{ gw-brown
   franck:
     address: 138.16.160.12
@@ -289,7 +283,11 @@ servers:
   milanollo:
     address: 5.153.231.2
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, nfs-server
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, nfs-server, xinetd-hosts
+  milanollo2:
+    address: 5.153.231.9
+    parents: milanollo
+    hostgroups: secondary-IPs
   picconi:
     address: 5.153.231.3
     parents: gw-bytemark
@@ -613,7 +611,7 @@ servers:
   merikanto:
     address: 86.59.118.147
     parents: gw-sil
-    hostgroups: computers, dl360, acpid-hosts, spamd, heavy-exim, nfs-client, rsyncd-hosts, xinetd-hosts, service, mail-relay, squeeze, autofs
+    hostgroups: computers, dl360, acpid-hosts, nfs-client, rsyncd-hosts, xinetd-hosts, service, squeeze, autofs
   merikanto2:
     address: 86.59.118.150
     parents: merikanto
@@ -791,7 +789,7 @@ servers:
   quantz:
     address: 206.12.19.122
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, postgres84-hosts, apache2-hosts, autofs
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, apache2-hosts, autofs
   nono:
     address: 206.12.19.123
     parents: traetta
@@ -871,8 +869,7 @@ servers:
   menotti:
     address: 206.12.19.143
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts
-    #, apache-https
+    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, apache-https
   coincy:
     address: 206.12.19.144
     parents: ganeti2
@@ -1210,7 +1207,7 @@ servicegroups:
 services:
   -
     name: PING
-    check: "check_ping!300.0,20%!600.0,40%"
+    check: "check_ping!350.0,20%!600.0,40%"
     hostgroups: pingable
     excludehostgroups: layer3-infrastructure, high-RTT
     normal_check_interval: 5
@@ -1239,7 +1236,7 @@ services:
   -
     name: disk usage - all
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk -w 10% -c 5%  -A -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs --ignore-eregi-path=/home/buildd/build-trees"
+    nrpe: "/usr/lib/nagios/plugins/check_disk -w 5% -c 2%  -A -X devpts -X proc -X linprocfs -X devfs -X fdescfs -X sysfs -X nfs --ignore-eregi-path=/home/buildd/build-trees"
     hostgroups: computers
     excludehosts: sibelius,stabile
   -
@@ -1256,7 +1253,7 @@ services:
   -
     name: disk usage on /
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /"
     hostgroups: computers
     excludehosts: spohr
   -
@@ -1279,22 +1276,11 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
     hostgroups: hasorgfs
-  -
-    name: disk usage on /srv
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv"
-    hostgroups: hassrvfs
-    excludehosts: stabile, beach
-  -
-    name: disk usage on /srv
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv"
-    hosts:  beach
   -
     name: disk usage on /srv
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv"
-    hosts: stabile
+    hostgroups: hassrvfs
   -
     name: disk usage on /tmp
     servicegroups: diskspace
@@ -2231,6 +2217,11 @@ services:
     check: check_tcp!873
     hosts: merikanto2
     depends: merikanto:process - xinetd
+  -
+    name: network service - rsync
+    check: check_tcp!873
+    hosts: milanollo2
+    depends: milanollo:process - xinetd
 
  ###
   -
@@ -2279,13 +2270,13 @@ services:
     name: network service - https
     check: check_https
     hostgroups: apache-https
-    excludehosts: handel
+    excludehosts: handel,menotti
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
     name: network service - https
     check: dsa_check_https_want_auth
-    hosts: handel
+    hosts: handel,menotti
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -