X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=6da6fe45288c541f05e8451cfaa7b0f666a27143;hb=763cc579a807e4b5f785de048e8231beaae31085;hp=ed3919ce28d95f6ced64cc914e1aad3c0e88b00f;hpb=d4f9c2e50ec03fddfb916369a74489cc48579896;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index ed3919c..6da6fe4 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -429,10 +429,6 @@ servers:
     address: 5.153.231.30
     parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd
-  x86-bm-01:
-    address: 5.153.231.32
-    parents: ganeti-bytemark
-    hostgroups: computers, pybuildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
   tate:
     address: 5.153.231.33
     parents: ganeti-bytemark
@@ -630,6 +626,10 @@ servers:
     address: 194.177.211.203
     parents: ganeti-grnet
     hostgroups: computers, pybuildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
+  x86-grnet-02:
+    address: 194.177.211.204
+    parents: ganeti-grnet
+    hostgroups: computers, pybuildd, hassrvfs, kvmdomains, buster, systemd-timesyncd
   vittoria:
     address: 194.177.211.205
     parents: ganeti-grnet
@@ -902,91 +902,95 @@ servers:
     address: 209.87.16.10
     parents: ubc-gateway
     hostgroups: computers, bl460g8, service, stretch, multipath-hosts, manyprocesses, physical_x86_intel
+  ganeti2-ubc:
+    address: 209.87.16.17
+    parents: ubc-gateway
+    hostgroups: notacomputer
 
   rachmaninoff:
     address: 209.87.16.20
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd
   x86-ubc-01:
     address: 209.87.16.21
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, buildd, hassrvfs, kvmdomains, stretch, systemd-timesyncd
   elgar:
     address: 209.87.16.24
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd
   gombert:
     address: 209.87.16.25
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, apache-https, systemd-timesyncd
   nono:
     address: 209.87.16.26
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, service, kvmdomains, stretch, heavy-exim, apache2-hosts, apache-https, broken_https_default_vhost, hassrvfs, systemd-timesyncd
   reger:
     address: 209.87.16.27
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, apache-https, heavy-exim, systemd-timesyncd
   diabelli:
     address: 209.87.16.28
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, apache-https, broken_https_default_vhost, systemd-timesyncd
   menotti:
     address: 209.87.16.29
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd
   danzi:
     address: 209.87.16.30
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, service, kvmdomains, stretch, postgres96-hosts, systemd-timesyncd
   geo2:
     address: 209.87.16.31
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, service, bind9-hosts, kvmdomains, stretch, systemd-timesyncd
   lotti:
     address: 209.87.16.32
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
   muffat:
     address: 209.87.16.33
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, service, kvmdomains, stretch, spamd, heavy-exim, mail-relay, systemd-timesyncd
   sonntag:
     address: 209.87.16.34
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, service, kvmdomains, stretch, nfs-client, autofs, systemd-timesyncd
   tchaikovsky:
     address: 209.87.16.35
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, general, apache2-hosts, kvmdomains, apache-https, stretch, systemd-timesyncd
   gretchaninov:
     address: 209.87.16.36
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, general, kvmdomains, stretch, hassrvfs, nfs-server, apache2-hosts, xinetd-hosts, apache-https, systemd-timesyncd
   tye:
     address: 209.87.16.37
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, service, kvmdomains, stretch, heavy-exim, apache2-hosts, apache-https, nfs-client, autofs, hassrvfs, systemd-timesyncd
   ullmann:
     address: 209.87.16.38
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, service, kvmdomains, stretch, postgres96-hosts, nfs-client, apache2-hosts, autofs, apache-https, systemd-timesyncd
   buxtehude:
     address: 209.87.16.39
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, heavy-exim, postgres96-hosts, hasvarlogfs, apache-https, spamd, nfs-server, systemd-timesyncd
   piu-slave-ubc-01:
     address: 209.87.16.42
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, service, kvmdomains, stretch, nfs-client, autofs, systemd-timesyncd
     contacts: holger
   hier:
     address: 209.87.16.43
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, nfs-client, autofs, systemd-timesyncd
   godard:
     address: 209.87.16.44
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd, postfix-hosts, postgres96-hosts, crazymanyprocesses
   godard-pages:
     address: 209.87.16.45
@@ -994,15 +998,15 @@ servers:
     hostgroups: notacomputer
   debussy:
     address: 209.87.16.46
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, apache2-hosts, apache-https, broken_https_default_vhost
   grabbe:
     address: 209.87.16.48
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, apache2-hosts, apache-https
   trabaci:
     address: 209.87.16.49
-    parents: ubc-gateway
+    parents: ganeti2-ubc
     hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
 
   ganeti3-ubc:
@@ -1012,15 +1016,15 @@ servers:
   ubc-node-arm01:
     address: 209.87.16.51
     parents: ubc-gateway
-    hostgroups: computers, stretch, service, sw-raid, drbd-hosts
+    hostgroups: computers, buster, service, sw-raid, drbd-hosts
   ubc-node-arm02:
     address: 209.87.16.52
     parents: ubc-gateway
-    hostgroups: computers, stretch, service, sw-raid, drbd-hosts
+    hostgroups: computers, buster, service, sw-raid, drbd-hosts
   ubc-node-arm03:
     address: 209.87.16.53
     parents: ubc-gateway
-    hostgroups: computers, stretch, service, sw-raid, drbd-hosts
+    hostgroups: computers, buster, service, sw-raid, drbd-hosts
 
   arm-ubc-01:
     address: 209.87.16.54