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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index c148ce6..0dfd208 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -348,10 +348,6 @@ 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
@@ -1026,6 +1022,10 @@ 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
 
   ganeti3-ubc:
     address: 209.87.16.50
@@ -1463,6 +1463,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
@@ -1686,23 +1692,6 @@ services:
     hostgroups: computers
   # }}}
   # {{{ backup
-  -
-    name: backup
-    servicegroups: backup
-    nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-dabackup"
-    hostgroups: computers
-    excludehosts: backuphost, storace
-    check_interval: 60
-    max_check_attempts: 2
-    retry_interval: 5
-  -
-    name: backup server config
-    servicegroups: backup
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-dabackup-server"
-    hosts: storace
-    check_interval: 60
-    max_check_attempts: 2
-    retry_interval: 5
   -
     name: backup - bacula - last backup
     servicegroups: backup
@@ -2203,6 +2192,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/check_clamav_signatures"
+    hostgroups: heavy-exim, heavy-postfix
   # }}}
   # {{{ anti-spam
   -
@@ -2988,6 +2981,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