Decommission lully.d.o

[mirror/dsa-nagios.git] / config / nagios-master.cfg

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 15ffda5..24ce505 100644 (file)
--- 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
@@ -830,13 +831,18 @@ servers:
     address: 140.211.166.194
     parents: gw-osuosl
     hostgroups: computers, stretch, service, manyprocesses
+  loghost-osuosl-01:
+    address: 140.211.166.202
+    parents: pijper
+    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
+
   pieta:
     address: 140.211.166.195
     parents: gw-osuosl
     hostgroups: computers, stretch, service, manyprocesses
   ppc64el-osuosl-01:
     address: 140.211.166.196
-    parents: pieta
+    parents: pijper
     hostgroups: computers, hassrvfs, buildd, stretch
   # }}}
   # {{{ gw-sanger
@@ -991,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
@@ -1053,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:
@@ -1733,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
@@ -2043,14 +2049,10 @@ services:
     nrpe: "/usr/bin/sudo /usr/lib/nagios/plugins/dsa-check-openmanage"
     hostgroups: pe1950, r540
     excludehosts: wieck, schumann
-  -
-    name: HW - OpenManage status
-    nrpe: "/usr/bin/sudo /usr/lib/nagios/plugins/dsa-check-openmanage -b bp=0"
-    hosts: wieck
   -
     name: HW - OpenManage status
     nrpe: "/usr/bin/sudo /usr/lib/nagios/plugins/dsa-check-openmanage -b bp=0 -b bat_charge=0:0"
-    hosts: schumann
+    hosts: wieck, schumann
   # }}}
   # }}}
   # {{{ ### mail stuff