X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=847d0c981ee2e0e629faa4f70e56185093e530c8;hb=1b5b3f1c0220014d372459c7a54f8b79cf6392ff;hp=fd89d594ed2dab92d64d8adecf3d5ece57ff862f;hpb=17e44cd11fadb8231eecaca89393ebe931825970;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index fd89d59..847d0c9 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -175,7 +175,7 @@ servers:
   powell:
     address: 87.106.64.223
     parents: gw-1und1
-    hostgroups: computers, service, acpid-hosts, wheezy
+    hostgroups: computers, service, acpid-hosts, jessie
   pkgmirror-1and1:
     address: 213.165.95.4
     parents: powell
@@ -226,7 +226,7 @@ servers:
   mips-aql-02:
     address: 141.170.6.150
     parents: gw-aql
-    hostgroups: computers, buildd, wheezy, nfs-client
+    hostgroups: computers, buildd, jessie, nfs-client
   minkus:
     address: 141.170.6.151
     parents: gw-aql
@@ -345,7 +345,7 @@ servers:
   picconi:
     address: 5.153.231.3
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs, heavy-exim, spamd, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, nfs-client, autofs, heavy-exim, spamd, apache-https
   senfter:
     address: 5.153.231.4
     parents: gw-bytemark
@@ -429,7 +429,7 @@ servers:
   petrova:
     address: 5.153.231.25
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, wheezy, apache2-hosts
+    hostgroups: computers, kvmdomains, jessie, apache2-hosts
   oyens:
     address: 5.153.231.26
     parents: ganeti-bytemark
@@ -520,11 +520,11 @@ servers:
   csail-node01:
     address: 128.31.0.16
     parents: gw-csail
-    hostgroups: computers, service, dl360, acpid-hosts, wheezy, drbd-hosts
+    hostgroups: computers, service, dl360, acpid-hosts, jessie, drbd-hosts
   csail-node02:
     address: 128.31.0.46
     parents: gw-csail
-    hostgroups: computers, service, dl360, acpid-hosts, wheezy, drbd-hosts
+    hostgroups: computers, service, dl360, acpid-hosts, jessie, drbd-hosts
   ganeti-csail:
     address: 128.31.0.49
     parents: gw-bytemark
@@ -533,7 +533,7 @@ servers:
   falla:
     address: 128.31.0.65
     parents: ganeti-csail
-    hostgroups: computers, freebsd, hassrvfs, porterbox, wheezy
+    hostgroups: computers, freebsd, hassrvfs, porterbox, jessie
   fischer:
     address: 128.31.0.35
     parents: ganeti-csail
@@ -571,11 +571,11 @@ servers:
   grnet-node01:
     address: 194.177.211.195
     parents: gw-grnet
-    hostgroups: computers, service, dl380, acpid-hosts, wheezy, drbd-hosts
+    hostgroups: computers, service, dl380, acpid-hosts, jessie, drbd-hosts
   grnet-node02:
     address: 194.177.211.196
     parents: gw-grnet
-    hostgroups: computers, service, dl380, acpid-hosts, wheezy, drbd-hosts
+    hostgroups: computers, service, dl380, acpid-hosts, jessie, drbd-hosts
   rautavaara:
     address: 194.177.211.199
     parents: gw-grnet
@@ -765,7 +765,7 @@ servers:
   byrd:
     address: 140.211.166.20
     parents: gw-osuosl
-    hostgroups: computers, service, dl380, acpid-hosts, wheezy
+    hostgroups: computers, service, dl380, acpid-hosts, jessie
   buxtehude:
     address: 140.211.166.26
     parents: byrd
@@ -794,7 +794,7 @@ servers:
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
-    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, wheezy
+    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, jessie
     #, bosserver
   rietz2:
     address: 140.211.166.44
@@ -867,10 +867,6 @@ servers:
     parents: sw-ubcece-mcld
     hostgroups: computers, buildd, hasbootfs, hassrvfs, sparc, wheezy
     contacts: lfilipoz
-  ravel:
-    address: 206.12.19.5
-    parents: sw-ubcece-kais
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-client, hasorgfs, wheezy, autofs
   dijkstra:
     address: 206.12.19.218
     parents: sw-ubcece-kais
@@ -902,7 +898,7 @@ servers:
   tchaikovsky:
     address: 206.12.19.118
     parents: ganeti2
-    hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, apache-https, wheezy
+    hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, apache-https, jessie
   brahms:
     address: 206.12.19.115
     parents: ganeti2
@@ -936,7 +932,7 @@ servers:
   corelli:
     address: 206.12.19.16
     parents: sw-ubcece-kais
-    hostgroups: computers, buildd, wheezy
+    hostgroups: computers, buildd, jessie
   lucatelli:
     address: 206.12.19.15
     parents: sw-ubcece-kais
@@ -976,7 +972,7 @@ servers:
   elgar:
     address: 206.12.19.130
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy
+    hostgroups: computers, service, kvmdomains, jessie
   gombert:
     address: 206.12.19.132
     parents: ganeti2
@@ -2379,8 +2375,6 @@ services:
     check: dsa_check_port_closed!443
     hostgroups: apache2-hosts
     excludehostgroups: apache-https
-    # ravel does ssh on port 443
-    excludehosts: ravel
     normal_check_interval: 60
   # }}}
   # {{{ FTP