X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-nagios.git;a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=0b8c442080f0aec0bd97b56514d7ea5f29f65115;hp=f22bac5fb874ea493bd15361bdec7ca20e6980ef;hb=b86fe19226b2779117a5f441e7737663e1075509;hpb=d7c2e3d207d7931ac3d72861c2df6fdf19589512

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index f22bac5..0b8c442 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -171,7 +171,7 @@ servers:
   pettersson:
     address: 130.239.18.123
     parents: gw-accumu
-    hostgroups: computers, hasbootfs, aacraid, nfs-client, service, apache2-hosts, buster, autofs, sw-raid, physical_x86_intel
+    hostgroups: computers, hasbootfs, aacraid, nfs-client, service, buster, autofs, sw-raid, physical_x86_intel
     contacts: zobel, tfheen, lfilipoz, zumbi, jcristau, pabs, aurel32, dsa-nsa
     contact_groups: ""
   mirror-accumu:
@@ -361,22 +361,10 @@ servers:
     address: 5.153.231.12
     parents: ganeti-bytemark
     hostgroups: computers, hassrvfs, kvmdomains, buster, systemd-timesyncd
-  rainier:
-    address: 5.153.231.16
-    parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, stretch, systemd-timesyncd
-  rapoport:
-    address: 5.153.231.15
-    parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, stretch, systemd-timesyncd
   delfin:
     address: 5.153.231.17
     parents: ganeti-bytemark
     hostgroups: computers, hassrvfs, kvmdomains, buster, apache2-hosts, apache-https, nfs-client, autofs, systemd-timesyncd
-  donizetti:
-    address: 5.153.231.20
-    parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, stretch, nfs-client, autofs, systemd-timesyncd
   dillon:
     address: 5.153.231.22
     parents: ganeti-bytemark
@@ -764,7 +752,7 @@ servers:
   suchon:
     address: 82.195.75.68
     parents: ganeti-manda
-    hostgroups: computers, service, kvmdomains, stretch, uploadqueue, queued, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, hassrvfs, stretch, uploadqueue, queued, systemd-timesyncd
   adayevskaya:
     address: 82.195.75.75
     parents: ganeti-manda
@@ -772,11 +760,19 @@ servers:
   postgresql-manda-01:
     address: 82.195.75.76
     parents: ganeti-manda
-    hostgroups: computers, service, kvmdomains, hassrvfs, buster, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, hassrvfs, buster, systemd-timesyncd, postgres11-hosts
   dinis:
     address: 82.195.75.77
     parents: ganeti-manda
     hostgroups: computers, general, kvmdomains, buster, hassrvfs, systemd-timesyncd
+  rainier:
+    address: 82.195.75.94
+    parents: ganeti-manda
+    hostgroups: computers, kvmdomains, stretch, systemd-timesyncd
+  rapoport:
+    address: 82.195.75.95
+    parents: ganeti-manda
+    hostgroups: computers, kvmdomains, stretch, systemd-timesyncd
   # }}}
   # {{{ gw-marist
   zani:
@@ -1022,6 +1018,10 @@ servers:
     address: 209.87.16.64
     parents: ganeti2-ubc
     hostgroups: computers, general, kvmdomains, buster, nfs-client, autofs, apache2-hosts, apache-https, service, broken_https_default_vhost, systemd-timesyncd
+  donizetti:
+    address: 209.87.16.65
+    parents: ganeti2-ubc
+    hostgroups: computers, general, kvmdomains, stretch, nfs-client, autofs, systemd-timesyncd
 
   ganeti3-ubc:
     address: 209.87.16.50