sibelius cleanup: upgrade, drop varnish

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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index b5930ad..8db85e9 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -335,10 +335,6 @@ servers:
     address: 5.153.231.4
     parents: gw-bytemark
     hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, no-bacula, apache-https, nfs-server, systemd-timesyncd
-  adayevskaya:
-    address: 5.153.231.5
-    parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, buster, systemd-timesyncd
   pejacevic:
     address: 5.153.231.6
     parents: gw-bytemark
@@ -801,6 +797,10 @@ servers:
     address: 82.195.75.68
     parents: ganeti-manda
     hostgroups: computers, service, kvmdomains, stretch, uploadqueue, queued, systemd-timesyncd
+  adayevskaya:
+    address: 82.195.75.75
+    parents: ganeti-manda
+    hostgroups: computers, service, kvmdomains, buster, systemd-timesyncd
   # }}}
   # {{{ gw-marist
   zani:
@@ -858,7 +858,7 @@ servers:
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
-    hostgroups: computers, service, apache2-hosts, sw-raid, jessie, rsyncd-hosts, hasvarlogfs, multipath-hosts, nfs-server, varnish-hosts
+    hostgroups: computers, service, apache2-hosts, sw-raid, buster, rsyncd-hosts, hasvarlogfs, multipath-hosts, nfs-server
     contacts: tjrc1, dave
   # }}}
   # {{{ gw-scanplus
@@ -1552,7 +1552,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_disk 95 97 /storage/snapshot-farm-4"
     hosts: lw04
   -
-    name: disk usage on /storage/snapshot-farm-90
+    name: disk usage on /storage/snapshot-farm-09
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 95 97 /storage/snapshot-farm-09"
     hosts: lw09
@@ -1729,6 +1729,7 @@ services:
     servicegroups: backup
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u bacula -C bacula-fd -a '/usr/sbin/bacula-fd -c /etc/bacula/bacula-fd.conf'"
     hostgroups: computers
+    excludehostgroups: buildd, pybuildd, porterbox, no-bacula
 
   -
     name: network backup status - draghi
@@ -1902,8 +1903,12 @@ services:
   -
     name: process - irqbalance
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C irqbalance -a '/usr/sbin/irqbalance'"
+    hostgroups: stretch
+  -
+    name: unexpected process - irqbalance
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C irqbalance"
     hostgroups: computers
-    excludehosts: harris
+    excludehostgroups: stretch
   ###
   -
     name: process - cron