X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=3cb9e2a9edf5e6a4644715d778e7c3bd2c1de4be;hb=2779e1ff41151a27d92763ad633f4eb41fbab064;hp=8768552001bcd33d41fe30c1538ec7be9ea5fc90;hpb=a8af7c17337c0c2075d5147ce2a95bcaff1e8c18;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 8768552..3cb9e2a 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -361,10 +361,6 @@ servers:
     address: 5.153.231.12
     parents: ganeti-bytemark
     hostgroups: computers, hassrvfs, kvmdomains, buster, systemd-timesyncd
-  philp:
-    address: 5.153.231.13
-    parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, stretch, apache2-hosts, apache-https, systemd-timesyncd, broken_https_default_vhost
   rainier:
     address: 5.153.231.16
     parents: ganeti-bytemark
@@ -377,14 +373,6 @@ servers:
     address: 5.153.231.17
     parents: ganeti-bytemark
     hostgroups: computers, hassrvfs, kvmdomains, buster, apache2-hosts, apache-https, nfs-client, autofs, systemd-timesyncd
-  wuiet:
-    address: 5.153.231.18
-    parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, stretch, service, apache-https, apache2-hosts, heavy-exim, systemd-timesyncd
-  dinis:
-    address: 5.153.231.19
-    parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, buster, hassrvfs, systemd-timesyncd
   donizetti:
     address: 5.153.231.20
     parents: ganeti-bytemark
@@ -421,10 +409,6 @@ servers:
     address: 5.153.231.34
     parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
-  lindsay:
-    address: 5.153.231.36
-    parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, buster, autofs, nfs-client, systemd-timesyncd
   sor:
     address: 5.153.231.38
     parents: ganeti-bytemark
@@ -437,14 +421,6 @@ servers:
     address: 5.153.231.40
     parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, stretch, hassrvfs, nfs-client, autofs, systemd-timesyncd
-  pinel:
-    address: 5.153.231.42
-    parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, nfs-client, autofs, heavy-exim, systemd-timesyncd
-  rusca:
-    address: 5.153.231.43
-    parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
 
   casulana:
     address: 5.153.231.41
@@ -797,6 +773,14 @@ servers:
     address: 82.195.75.75
     parents: ganeti-manda
     hostgroups: computers, service, kvmdomains, buster, systemd-timesyncd
+  postgresql-manda-01:
+    address: 82.195.75.76
+    parents: ganeti-manda
+    hostgroups: computers, service, kvmdomains, hassrvfs, buster, systemd-timesyncd
+  dinis:
+    address: 82.195.75.77
+    parents: ganeti-manda
+    hostgroups: computers, general, kvmdomains, buster, hassrvfs, systemd-timesyncd
   # }}}
   # {{{ gw-marist
   zani:
@@ -1022,6 +1006,22 @@ servers:
     address: 209.87.16.49
     parents: ganeti2-ubc
     hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
+  wuiet:
+    address: 209.87.16.60
+    parents: ganeti2-ubc
+    hostgroups: computers, general, kvmdomains, stretch, service, apache-https, apache2-hosts, heavy-exim, systemd-timesyncd
+  philp:
+    address: 209.87.16.61
+    parents: ganeti2-ubc
+    hostgroups: computers, hassrvfs, kvmdomains, stretch, apache2-hosts, apache-https, systemd-timesyncd, broken_https_default_vhost
+  lindsay:
+    address: 209.87.16.62
+    parents: ganeti2-ubc
+    hostgroups: computers, service, kvmdomains, buster, autofs, nfs-client, systemd-timesyncd
+  pinel:
+    address: 209.87.16.63
+    parents: ganeti2-ubc
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, nfs-client, autofs, heavy-exim, systemd-timesyncd
 
   ganeti3-ubc:
     address: 209.87.16.50
@@ -1115,14 +1115,10 @@ servers:
     address: 130.89.148.13
     parents: klecker
     hostgroups: secondary-IPs
-  klecker-static:
-    address: 130.89.148.14
-    parents: klecker
-    hostgroups: secondary-IPs
   new-klecker:
     address: 130.89.148.77
     parents: gw-utwente
-    hostgroups: computers, service, buster, r540, manyprocesses, incomingmailrelayed2025, physical_x86_intel, hassrvfs
+    hostgroups: computers, service, buster, r540, manyprocesses, incomingmailrelayed2025, physical_x86_intel, hassrvfs, apache2-hosts, apache-https
   smit:
     address: 130.89.148.78
     parents: gw-utwente