X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=config%2Fnagios-master.cfg;h=f05b767f99204a2dc885f8ceaefd242733c42dc5;hb=f295d1e8f6e63e63cac4802dff5087e8a699790e;hp=818ba2383c7857ef28deeeb0b214d1b0d58032f1;hpb=078f48ebbc1fb502c52e776c7a5d7e98d102a40a;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 818ba23..f05b767 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -255,7 +255,7 @@ servers:
   old-master:
     address: 97.107.116.29
     parents: gw-brainfood
-    hostgroups: computers, general, apache2-hosts, spamd, heavy-exim, highload, xinetd-hosts, mptraid, squeeze, bacula-client
+    hostgroups: computers, general, spamd, heavy-exim, highload, xinetd-hosts, mptraid, squeeze, bacula-client
   murphy:
     address: 97.107.116.31
     parents: gw-brainfood
@@ -510,11 +510,11 @@ servers:
   byrd:
     address: 140.211.166.20
     parents: gw-osuosl
-    hostgroups: computers, service, dl380, acpid-hosts, squeeze
+    hostgroups: computers, service, dl380, acpid-hosts, wheezy
   buxtehude:
     address: 140.211.166.26
     parents: byrd
-    hostgroups: computers, service, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres91-hosts, squeeze, hasvarlogfs
+    hostgroups: computers, service, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres91-hosts, wheezy, hasvarlogfs
   # malo TODO
   mayer:
     address: 140.211.166.78
@@ -757,7 +757,7 @@ servers:
   rossini:
     address: 206.12.19.19
     parents: sw-ubcece-kais
-    hostgroups: computers, dl585, acpid-hosts, service, squeeze
+    hostgroups: computers, dl585, acpid-hosts, service, wheezy
   salieri:
     address: 206.12.19.20
     parents: sw-ubcece-kais
@@ -1174,6 +1174,8 @@ servicegroups:
     alias: buildd checks
   raid:
     alias: raid checks
+  backup:
+    alias: backup checks
   kernel:
     alias: kernel checks
   weaksshkeys:
@@ -1384,6 +1386,7 @@ services:
  ####
   -
     name: backup
+    servicegroups: backup
     nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-dabackup"
     hostgroups: computers
     normal_check_interval: 60
@@ -1391,6 +1394,7 @@ services:
     retry_check_interval: 5
   -
     name: backup server config
+    servicegroups: backup
     nrpe: "/usr/lib/nagios/plugins/dsa-check-dabackup-server"
     hosts: beethoven
     normal_check_interval: 60
@@ -1398,17 +1402,38 @@ services:
     retry_check_interval: 5
   -
     name: backup - bacula
+    servicegroups: backup
     remotecheck: "sudo /usr/lib/nagios/plugins/dsa-check-bacula -H $HOSTNAME$"
     runfrom: dinis
     hostgroups: bacula-client
+    normal_check_interval:  60
+    retry_check_interval: 15
+  -
+    name: backup - bacula - last backup
+    servicegroups: backup
+    remotecheck: "sudo /usr/lib/nagios/plugins/dsa-check-bacula-lastbackup-wrap any $HOSTNAME$"
+    runfrom: dinis
+    hostgroups: bacula-client
+    normal_check_interval:  60
+    retry_check_interval: 15
+  -
+    name: backup - bacula - last full backup
+    servicegroups: backup
+    remotecheck: "sudo /usr/lib/nagios/plugins/dsa-check-bacula-lastbackup-wrap full $HOSTNAME$"
+    runfrom: dinis
+    hostgroups: bacula-client
+    normal_check_interval:  60
+    retry_check_interval: 15
   -
     name: process - bacula-fd
+    servicegroups: backup
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C bacula-fd -a '/usr/sbin/bacula-fd -c /etc/bacula/bacula-fd.conf'"
     hostgroups: computers
     excludehostgroups: freebsd
     excludehosts: wagner, vasks
   -
     name: process - bacula-fd
+    servicegroups: backup
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C bacula-fd -a '/usr/sbin/bacula-fd -c /etc/bacula/bacula-fd.conf'"
     hostgroups: freebsd
 
@@ -2027,6 +2052,7 @@ services:
     nrpe: "sudo /usr/bin/arrayprobe"
     hostgroups: dl385, dl380, dl360, bl460, dl585
     excludehosts: franck
+    excludehostgroups: wheezy
   -
     name: RAID - arrayprobe
     servicegroups: raid