X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=a638c8f96f9d4f9a2fab937ed186ccb120219fea;hb=3233a1de9ef751fa289c840689e995c1c313be38;hp=84f3e098a57abba49d4d12acca9852c978ab4667;hpb=dad817e01b27665189fa5ed1b281769a9d42b817;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 84f3e09..a638c8f 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -282,7 +282,7 @@ servers:
   franck:
     address: 138.16.160.12
     parents: gw-brown
-    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres91-hosts, spamd, acpid-hosts, uploadqueue, xinetd-hosts, apache-https, hassrvfs, wheezy
+    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres91-hosts, spamd, acpid-hosts, uploadqueue, xinetd-hosts, apache-https, hassrvfs, jessie
   # }}}
   # {{{ gw-bytemark
   bm-bl1:
@@ -403,7 +403,7 @@ servers:
   wuiet:
     address: 5.153.231.18
     parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, wheezy, service, apache-https, apache2-hosts, heavy-exim, xinetd-hosts
+    hostgroups: computers, general, kvmdomains, jessie, service, apache-https, apache2-hosts, heavy-exim, xinetd-hosts
   dinis:
     address: 5.153.231.19
     parents: ganeti-bytemark
@@ -555,7 +555,7 @@ servers:
   storace:
     address: 93.94.130.161
     parents: gw-dgi
-    hostgroups: computers, acpid-hosts, wheezy, dl380, nfs-client, hassrvfs
+    hostgroups: computers, acpid-hosts, jessie, dl380, nfs-client, hassrvfs
   # }}}
   # {{{ gw-gatech
   sechter:
@@ -693,7 +693,7 @@ servers:
   vento:
     address: 82.195.75.98
     parents: ganeti3
-    hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, apache-https, heavy-exim
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https, heavy-exim
   lully:
     address: 82.195.75.99
     parents: ganeti3
@@ -867,7 +867,7 @@ servers:
     parents: sw-ubcece-mcld
     hostgroups: computers, buildd, hasbootfs, hassrvfs, sparc, wheezy
     contacts: lfilipoz
-  dijkstra:
+  ubc-bl8:
     address: 206.12.19.218
     parents: sw-ubcece-kais
     hostgroups: computers, bl460, acpid-hosts, service, wheezy, drbd-hosts
@@ -996,7 +996,7 @@ servers:
   beach:
     address: 206.12.19.140
     parents: ganeti2
-    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, xinetd-hosts, hassrvfs, nfs-server, rsyncd-hosts, no-bacula, apache-https
+    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, xinetd-hosts, hassrvfs, nfs-server, rsyncd-hosts, no-bacula, apache-https
   ullmann:
     address: 206.12.19.141
     parents: ganeti2
@@ -2577,7 +2577,7 @@ services:
   -
     name: ping alive check
     remotecheck: "/usr/lib/nagios/plugins/check_ping -H $HOSTADDRESS$ -w 50,10% -c 200,30%"
-    runfrom: dijkstra
+    runfrom: ubc-bl8
     hosts: giustini
     normal_check_interval: 5
     max_check_attempts: 4
@@ -2585,12 +2585,12 @@ services:
   -
     name: Overall Unit Status
     remotecheck: "/usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C public -P 2c -o connUnitStatus -n -c 3 -w 3"
-    runfrom: dijkstra
+    runfrom: ubc-bl8
     hosts: giustini
   -
     name: event log
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=9966 $HOSTADDRESS$ public"
-    runfrom: dijkstra
+    runfrom: ubc-bl8
     hosts: giustini
   # }}}
   # {{{ porterbox