X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=87dc7f2993d890df0fe5a5d82196aebf66e4400e;hb=b2b4f18c4027de984ad273d4e9da01f34ddb898a;hp=4c5edd31401d3ebdcdf05535b1c33f83d6d5b767;hpb=f04b408863bc4510d3fe464273b208819a22f23b;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 4c5edd3..87dc7f2 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -272,11 +272,11 @@ servers:
   franck:
     address: 138.16.160.12
     parents: gw-brown
-    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres94-hosts, uploadqueue, xinetd-hosts, apache-https, hassrvfs, jessie
+    hostgroups: computers, service, apache2-hosts, dl380, rsyncd-hosts, postgres94-hosts, xinetd-hosts, apache-https, hassrvfs, jessie
   fasolo:
     address: 138.16.160.17
     parents: gw-brown
-    hostgroups: computers, service, dl380, hpnewraid, jessie, hassrvfs, postgres94-hosts
+    hostgroups: computers, service, apache2-hosts, apache-https, dl380, hpnewraid, rsyncd-hosts, xinetd-hosts, jessie, hassrvfs, postgres94-hosts
   # }}}
   # {{{ gw-bytemark
   bm-bl1:
@@ -526,6 +526,14 @@ servers:
     hostgroups: secondary-IPs
   # }}}
   # {{{ gw-conova
+  aagaard:
+    address: 217.196.149.227
+    parents: gw-conova
+    hostgroups: computers, jessie, service, sw-raid
+  acker:
+    address: 217.196.149.228
+    parents: gw-conova
+    hostgroups: computers, jessie, service, sw-raid
   # }}}
   # {{{ gw-csail
   steffani:
@@ -578,6 +586,10 @@ servers:
     address: 128.31.0.51
     parents: ganeti-csail
     hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https, hassrvfs
+  usper:
+    address: 128.31.0.69
+    parents: ganeti-csail
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs, uploadqueue, xinetd-hosts
   # }}}
   # {{{ gw-dgi
   storace:
@@ -955,10 +967,6 @@ servers:
     address: 206.12.19.126
     parents: ganeti2
     hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, nfs-client, autofs, xinetd-hosts
-  jenko:
-    address: 206.12.19.133
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie
   # }}}
   # {{{ ubc-gateway
   ubc-enc2bl1: