X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=a001252421f4b3724ed2ec2f6fd74c51a18f17e0;hb=12f4f49f7b8f84db853de08df620f62c5314bde6;hp=8db85e93d0b869e8626d4dd8ce1a6231eb7635b6;hpb=9ddbfeb2d2793b01de2a0275f050e3a3641313b6;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 8db85e9..a001252 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -445,10 +445,6 @@ servers:
     address: 5.153.231.43
     parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, stretch, hassrvfs, systemd-timesyncd
-  manziarly:
-    address: 5.153.231.44
-    parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, buster, autofs, nfs-client, apache2-hosts, apache-https, systemd-timesyncd
 
   casulana:
     address: 5.153.231.41
@@ -665,19 +661,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
@@ -925,6 +921,10 @@ servers:
     address: 209.87.16.22
     parents: ganeti2-ubc
     hostgroups: computers, buildd, hassrvfs, kvmdomains, buster, systemd-timesyncd
+  manziarly:
+    address: 209.87.16.23
+    parents: ganeti2-ubc
+    hostgroups: computers, service, kvmdomains, buster, autofs, nfs-client, apache2-hosts, apache-https, systemd-timesyncd, hassrvfs
   elgar:
     address: 209.87.16.24
     parents: ganeti2-ubc
@@ -1222,8 +1222,6 @@ hostgroups:
     alias: Physical machines with Intel CPUs
     private: 1
 
-  jessie:
-    alias: Hosts running jessie
   stretch:
     alias: Hosts running stretch
   buster:
@@ -1846,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'"
@@ -2483,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"
@@ -2544,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]'"