X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-nagios.git;a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=f2ef5d8e1c2b6e60062d1220245f24289748bbe1;hp=c1858408d5463d165b1111a62020177b41aaebe7;hb=53474a40dd94c064058aae4f9936b9e52577162d;hpb=55b2f00ebcc550b5a8fde97bc23631bf83be1058

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index c185840..f2ef5d8 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -665,19 +665,19 @@ servers:
   lw01:
     address: 185.17.185.177
     parents: gw-leaseweb
-    hostgroups: computers, service, stretch, dl180, nfs-server, rsyncd-hosts, physical_x86_intel
+    hostgroups: computers, service, stretch, dl180, nfs-server, physical_x86_intel
   lw02:
     address: 185.17.185.178
     parents: gw-leaseweb
-    hostgroups: computers, service, stretch, dl180, nfs-server, rsyncd-hosts, physical_x86_intel
+    hostgroups: computers, service, stretch, dl180, nfs-server, physical_x86_intel
   lw03:
     address: 185.17.185.179
     parents: gw-leaseweb
-    hostgroups: computers, service, stretch, dl180, nfs-server, rsyncd-hosts, physical_x86_intel
+    hostgroups: computers, service, stretch, dl180, nfs-server, physical_x86_intel
   lw04:
     address: 185.17.185.180
     parents: gw-leaseweb
-    hostgroups: computers, service, stretch, dl180, nfs-server, rsyncd-hosts, physical_x86_intel
+    hostgroups: computers, service, stretch, dl180, nfs-server, physical_x86_intel
   lw07:
     address: 185.17.185.187
     parents: gw-leaseweb
@@ -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
@@ -1222,8 +1222,6 @@ hostgroups:
     alias: Physical machines with Intel CPUs
     private: 1
 
-  jessie:
-    alias: Hosts running jessie
   stretch:
     alias: Hosts running stretch
   buster:
@@ -1729,6 +1727,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
@@ -1845,13 +1844,6 @@ services:
     hostgroups: computers
     max_check_attempts: -2
     notification_interval: 1440
-  -
-    name: process - nrpe
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1: -u nagios -C nrpe -a '/usr/sbin/nrpe -c /etc/nagios/nrpe.cfg -d'"
-    hostgroups: computers
-    excludehostgroups: stretch, buster
-    max_check_attempts: -1
-    depends: network service - nrpe
   -
     name: process - nrpe
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1: -u nagios -C nrpe -a '/usr/sbin/nrpe -c /etc/nagios/nrpe.cfg -f'"
@@ -1902,8 +1894,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
@@ -2478,7 +2474,6 @@ services:
     name: process - varnish
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1:15 -u vcache -a '/usr/sbin/varnishd -j unix,user=vcache -F -a '"
     hostgroups: varnish-hosts
-    excludehostgroups: jessie
   -
     name: unwanted process - varnish
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0 -C varnishd"
@@ -2539,11 +2534,6 @@ services:
     retry_interval: 5
   # }}}
   # {{{ NFS Stuff
-  -
-    name: process - statd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u statd -C rpc.statd -a '/sbin/rpc.statd'"
-    hostgroups: nfs-client, nfs-server
-    excludehostgroups: stretch, buster
   -
     name: process - nfsd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u root -C nfsd -a '[nfsd]'"