X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=24ce50583f497b944335ceb6fa05a270aa0e4283;hb=3fd2d79b557757398275242cebc72a71209b410d;hp=8e9db02949304f7991a533536a21ffc792366be7;hpb=78fef0a47ed5d68fa00d6d4ae80895d08e9af26b;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 8e9db02..24ce505 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -553,6 +553,11 @@ servers:
     address: 217.196.149.236
     parents: ganeti-conova
     hostgroups: computers, hassrvfs, porterbox, stretch
+
+  schmelzer:
+    address: 185.69.161.161
+    parents: gw-conova
+    hostgroups: computers, service, stretch, r540, manyprocesses, apache2-hosts, rsyncd-hosts, apache-https, systemd-timesyncd
   # }}}
   # {{{ gw-csail
   csail-node01:
@@ -741,10 +746,6 @@ servers:
     address: 82.195.75.98
     parents: ganeti3
     hostgroups: computers, service, kvmdomains, stretch, hassrvfs, apache2-hosts, apache-https, heavy-exim
-  lully:
-    address: 82.195.75.99
-    parents: ganeti3
-    hostgroups: computers, service, hasbootfs, kvmdomains, stretch, hasvarlogfs
   draghi:
     address: 82.195.75.106
     parents: ganeti3
@@ -841,7 +842,7 @@ servers:
     hostgroups: computers, stretch, service, manyprocesses
   ppc64el-osuosl-01:
     address: 140.211.166.196
-    parents: pieta
+    parents: pijper
     hostgroups: computers, hassrvfs, buildd, stretch
   # }}}
   # {{{ gw-sanger
@@ -996,10 +997,6 @@ servers:
     address: 209.87.16.46
     parents: ubc-gateway
     hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, apache2-hosts, apache-https, broken_https_default_vhost
-  kantuser:
-    address: 209.87.16.47
-    parents: ubc-gateway
-    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, apache2-hosts
   grabbe:
     address: 209.87.16.48
     parents: ubc-gateway
@@ -1058,6 +1055,10 @@ servers:
     address: 130.89.148.14
     parents: klecker
     hostgroups: secondary-IPs
+  smit:
+    address: 130.89.148.78
+    parents: gw-utwente
+    hostgroups: computers, service, stretch, r540, manyprocesses, incomingmailrelayed2025
   # }}}
   # {{{ gw-ynic
   henze:
@@ -1738,14 +1739,14 @@ services:
     runfrom: lotti
     hostgroups: computers
   -
-    name: remote logging on lully
+    name: remote logging on loghost-grnet-01
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$"
-    runfrom: lully
+    runfrom: loghost-grnet-01
     hostgroups: computers
   -
-    name: remote logging on loghost-grnet-01
+    name: remote logging on loghost-osuosl-01
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$"
-    runfrom: loghost-grnet-01
+    runfrom: loghost-osuosl-01
     hostgroups: computers
   # }}}
   # {{{ base service