X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=f964a6f17b0736019cddeee5d3f7f9b2088eb3ab;hb=0cbfb5f9a87b7ed44b45720e654880303747ff48;hp=93bd473967f2ac9d850cc5fa444d7452d1870cb6;hpb=8bedfe2330fff5cfbfca498f50607e2da008e1e6;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 93bd473..f964a6f 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -402,10 +402,6 @@ servers:
     address: 5.153.231.20
     parents: ganeti-bytemark
     hostgroups: computers, general, kvmdomains, stretch, nfs-client, autofs, systemd-timesyncd
-  moszumanska:
-    address: 5.153.231.21
-    parents: ganeti-bytemark
-    hostgroups: secondary-IPs
   dillon:
     address: 5.153.231.22
     parents: ganeti-bytemark
@@ -557,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
   # }}}
   # {{{ gw-csail
   csail-node01:
@@ -728,11 +729,11 @@ servers:
   manda-node03:
     address: 82.195.75.69
     parents: gw-manda
-    hostgroups: computers, service, stretch, r540, drbd-hosts
+    hostgroups: computers, service, stretch, r540, drbd-hosts, manyprocesses
   manda-node04:
     address: 82.195.75.70
     parents: gw-manda
-    hostgroups: computers, service, stretch, r540, drbd-hosts
+    hostgroups: computers, service, stretch, r540, drbd-hosts, manyprocesses
   bendel:
     address: 82.195.75.100
     parents: ganeti3
@@ -830,13 +831,22 @@ servers:
     parents: byrd
     hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, hassrvfs, rsyncd-hosts, apache-https
 
+  pijper:
+    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 +1001,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
@@ -1742,6 +1748,11 @@ services:
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$"
     runfrom: loghost-grnet-01
     hostgroups: computers
+  -
+    name: remote logging on loghost-osuosl-01
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-log-age-loghost $HOSTNAME$"
+    runfrom: loghost-osuosl-01
+    hostgroups: computers
   # }}}
   # {{{ base service
   -
@@ -2045,7 +2056,7 @@ services:
     excludehosts: wieck, schumann
   -
     name: HW - OpenManage status
-    nrpe: "/usr/bin/sudo /usr/lib/nagios/plugins/dsa-check-openmanage -b bp=0"
+    nrpe: "/usr/bin/sudo /usr/lib/nagios/plugins/dsa-check-openmanage -b bp=0 -b bat_charge=0:0"
     hosts: wieck, schumann
   # }}}
   # }}}
@@ -2691,6 +2702,16 @@ services:
     check: "dsa_check_staticsync!miniconf10.debconf.org"
     hosts: global
     servicegroups: mirror
+  -
+    name: mirror static sync - wiki
+    check: "dsa_check_staticsync!wiki.debconf.org"
+    hosts: global
+    servicegroups: mirror
+  -
+    name: mirror static sync - www
+    check: "dsa_check_staticsync!www.debconf.org"
+    hosts: global
+    servicegroups: mirror
   # }}}
   # {{{ DNS
   -