X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=171be6b733510a51be9d40bf7217b00670413289;hb=4c6e0e7faf1ad55b9ee0f810f43e350b2aaf5791;hp=653dda5722b383940e7d2381ea575b85504c2820;hpb=d365d29582a3009fcd5e2aed0e0a8715bb77f737;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 653dda5..171be6b 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'"
@@ -2482,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"