X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=b2dd82761e9f49108b4d27baefeb7a90aa4e1642;hb=4c0a1ef5f28210415f6e29f5cce02cac230c4c35;hp=5b36238510da59f49e4ceb340a589f70ce4f5ad8;hpb=dada4218cea097e1007089fd24041d3bc4d35e43;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 5b36238..b2dd827 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -72,11 +72,6 @@ servers:
     address: 194.177.211.193
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
-  gw-helsinki:
-    address: 128.214.173.25
-    parents: gw-ubcece
-    hostgroups: layer3-infrastructure
-    contacts: holger
   gw-isc:
     address: 149.20.20.1
     parents: gw-ubcece
@@ -197,7 +192,7 @@ servers:
   praetorius:
     address: 130.239.18.121
     parents: gw-accumu
-    hostgroups: computers, buildd, hassrvfs, squeeze
+    hostgroups: computers, buildd, hassrvfs, wheezy
   # }}}
   # {{{ gw-arm
   abel:
@@ -419,13 +414,6 @@ servers:
     parents: gw-grnet
     hostgroups: computers, acpid-hosts, mptraid, buildd, wheezy
   # }}}
-  # {{{ gw-helsinki
-  piatti:
-    address: 193.167.161.225
-    parents: gw-helsinki
-    hostgroups: computers, dl385, acpid-hosts, apache2-hosts, hasbootfs, incomingmailrelayed2025, hasorgfs, service, squeeze
-    contacts: holger
-  # }}}
   # {{{ gw-isc
   schein:
     address: 149.20.20.6
@@ -573,7 +561,7 @@ servers:
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
-    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, wheezy, apache2-hosts, bind9-hosts
+    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, wheezy, bind9-hosts
     #, bosserver
   rietz2:
     address: 140.211.166.44
@@ -625,7 +613,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, apache2-hosts
+    hostgroups: computers, dl360, acpid-hosts, nfs-client, rsyncd-hosts, xinetd-hosts, service, squeeze, autofs
   merikanto2:
     address: 86.59.118.150
     parents: merikanto
@@ -803,7 +791,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
@@ -879,12 +867,11 @@ servers:
   sonntag:
     address: 206.12.19.142
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, nfs-client, autofs, hassrvfs
+    hostgroups: computers, service, kvmdomains, wheezy, nfs-client, autofs
   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
@@ -1311,7 +1298,7 @@ services:
     name: disk usage on /tmp
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: saens, piatti
+    hosts: saens
   -
     name: disk usage on /usr
     servicegroups: diskspace
@@ -2291,13 +2278,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
   -