X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=18c4339ded18db0531c34b714a5412ce8259e29a;hb=a460f4aeeef6e9bdc15a46e1cf5e13ae4ab917ac;hp=0dfd2085da05a9eafdb2eab9d1575278ac118168;hpb=b3e6cd91e61b364de2e6a80d7e721166748aac11;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 0dfd208..18c4339 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -352,10 +352,6 @@ servers:
     address: 5.153.231.12
     parents: ganeti-bytemark
     hostgroups: computers, hassrvfs, kvmdomains, buster, systemd-timesyncd
-  dillon:
-    address: 5.153.231.22
-    parents: ganeti-bytemark
-    hostgroups: computers, general, kvmdomains, stretch, nfs-client, autofs, hassrvfs, systemd-timesyncd
   quantz:
     address: 5.153.231.28
     parents: ganeti-bytemark
@@ -498,7 +494,7 @@ servers:
   olin:
     address: 128.31.0.65
     parents: ganeti-csail
-    hostgroups: computers, kvmdomains, stretch, systemd-timesyncd
+    hostgroups: computers, kvmdomains, buster, systemd-timesyncd
   # }}}
   # {{{ gw-dgi
   storace:
@@ -560,7 +556,7 @@ servers:
   melartin:
     address: 194.177.211.208
     parents: ganeti-grnet
-    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, postgres96-hosts, hassrvfs
+    hostgroups: computers, service, kvmdomains, buster, systemd-timesyncd, postgres11-hosts, hassrvfs
   static-master-grnet-01:
     address: 194.177.211.209
     parents: ganeti-grnet
@@ -683,7 +679,7 @@ servers:
   denis:
     address: 82.195.75.91
     parents: ganeti-manda
-    hostgroups: computers, service, kvmdomains, stretch, bind9-hosts, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, buster, bind9-hosts, systemd-timesyncd
   vogler:
     address: 82.195.75.92
     parents: ganeti-manda
@@ -748,6 +744,14 @@ servers:
     address: 82.195.75.96
     parents: ganeti-manda
     hostgroups: computers, kvmdomains, stretch, apache2-hosts, apache-https, systemd-timesyncd
+  static-master-manda-01:
+    address: 82.195.75.97
+    parents: ganeti-manda
+    hostgroups: computers, kvmdomains, buster, hassrvfs, systemd-timesyncd
+  dillon:
+    address: 82.195.75.99
+    parents: ganeti-manda
+    hostgroups: computers, general, kvmdomains, stretch, hassrvfs, systemd-timesyncd
   # }}}
   # {{{ gw-marist
   zani:
@@ -1657,7 +1661,7 @@ services:
   -
     name: processes - total
     hostgroups: manyprocesses
-    nrpe: "/usr/lib/nagios/plugins/check_procs 1500 1700"
+    nrpe: "/usr/lib/nagios/plugins/check_procs 1700 2000"
   -
     name: processes - total
     hostgroups: crazymanyprocesses
@@ -2194,7 +2198,7 @@ services:
     excludehostgroups: heavy-exim, heavy-postfix
   -
     name: signature freshness - clamav
-    nrpe: "/usr/lib/nagios/plugins/check_clamav_signatures"
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-clamav-signatures"
     hostgroups: heavy-exim, heavy-postfix
   # }}}
   # {{{ anti-spam