X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=7ba234ef8d59cde2782e6fa3131f0c0f845a331a;hb=8697761ada1e6d871949657b9f374a5b9112ec20;hp=267b551a62e4f7ebd45088bffe00ad8757d8b469;hpb=5555f33cfbb9e68d521cae26894e1e4884453963;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 267b551..7ba234e 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -348,22 +348,10 @@ servers:
     address: 5.153.231.1
     parents: gw-bytemark
     hostgroups: notacomputer
-  coccia:
-    address: 5.153.231.11
-    parents: ganeti-bytemark
-    hostgroups: computers, hassrvfs, kvmdomains, stretch, autofs, nfs-client, uploadqueue, apache-https, apache2-hosts, systemd-timesyncd
   backuphost:
     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
-    hostgroups: computers, service, kvmdomains, stretch, hassrvfs, nfs-client, heavy-exim, apache2-hosts, autofs, apache-https, systemd-timesyncd
   respighi:
     address: 5.153.231.29
     parents: ganeti-bytemark
@@ -502,7 +490,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:
@@ -564,7 +552,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
@@ -687,7 +675,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
@@ -752,6 +740,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:
@@ -1026,6 +1022,14 @@ servers:
     address: 209.87.16.71
     parents: ganeti2-ubc
     hostgroups: computers, hassrvfs, kvmdomains, buster, apache2-hosts, apache-https, nfs-client, autofs, systemd-timesyncd
+  coccia:
+    address: 209.87.16.72
+    parents: ganeti2-ubc
+    hostgroups: computers, hassrvfs, kvmdomains, stretch, autofs, nfs-client, uploadqueue, apache-https, apache2-hosts, systemd-timesyncd
+  quantz:
+    address: 209.87.16.73
+    parents: ganeti2-ubc
+    hostgroups: computers, service, kvmdomains, buster, hassrvfs, nfs-client, heavy-exim, apache2-hosts, autofs, apache-https, systemd-timesyncd
 
   ganeti3-ubc:
     address: 209.87.16.50
@@ -1463,6 +1467,12 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv"
     hostgroups: hassrvfs
+    excludehosts: vittoria
+  -
+    name: disk usage on /srv
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv"
+    hosts: vittoria
   -
     name: disk usage on /var/lib/postgresql
     servicegroups: diskspace
@@ -1651,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
@@ -2186,6 +2196,10 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C freshclam"
     hostgroups: computers
     excludehostgroups: heavy-exim, heavy-postfix
+  -
+    name: signature freshness - clamav
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-clamav-signatures"
+    hostgroups: heavy-exim, heavy-postfix
   # }}}
   # {{{ anti-spam
   -
@@ -2971,6 +2985,12 @@ services:
     hosts: gombert
     contact_groups: gobby
   ####
+  -
+    name: release - britney piuparts freshness
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile -a 1h /srv/release.debian.org/britney/state/piuparts-status.txt"
+    hosts: respighi
+    contacts: release-britney
+  ####
   -
     name: network service - sip-tls cert - 443
     check: dsa_check_cert!443