X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=5ce33bb279b4a62cbfe38d3c5d103ca83249a32d;hb=2985c1e68d0eab77182de07683532f20c58a2d9c;hp=4046cebf44f0f9478bf1656a415567b78d8d2f5f;hpb=7e9dd96ace6175e723ecb21a7901ffea19f9980a;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 4046ceb..5ce33bb 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -5,17 +5,11 @@
 # vim:set syntax=yaml:
 
 # TODO
-#  - spohr: hpasmd
-#  - *: mailq
 #  - *: check munin stats collection works
 #  - *: check backups are successful
 #  - *: unwanted: network: auth, discard, daytime, time (on some), cvs-pserver, rsync (on some), ftp (on some), http (on some)
 #  - mundy: salinfo_decode
 
-# down:
-#  - sarti
-#  - leisner
-
 ---
 #############################
 # hosts
@@ -298,6 +292,14 @@ servers:
     address: 5.153.231.246
     parents: gw-bytemark
     hostgroups: computers, bl460, acpid-hosts, service, wheezy
+  bm-bl7:
+    address: 5.153.231.247
+    parents: gw-bytemark
+    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+  bm-bl8:
+    address: 5.153.231.248
+    parents: gw-bytemark
+    hostgroups: computers, bl460, acpid-hosts, service, wheezy
 
   milanollo:
     address: 5.153.231.2
@@ -315,6 +317,16 @@ servers:
     address: 5.153.231.5
     parents: gw-bytemark
     hostgroups: computers, service, kvmdomains, wheezy
+  pejacevic:
+    address: 5.153.231.6
+    parents: gw-bytemark
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts
+    contacts: holger
+  piu-slave-bm-a:
+    address: 5.153.231.7
+    parents: gw-bytemark
+    hostgroups: computers, service, kvmdomains, wheezy
+    contacts: holger
   # }}}
   # {{{ gw-c3sl
   santoro:
@@ -449,7 +461,8 @@ servers:
   zemlinsky:
     address: 129.143.160.6
     parents: gw-karlsruhe
-    hostgroups: computers, buildd, hassrvfs, squeeze
+    hostgroups: computers, buildd, hassrvfs, wheezy
+    contacts: pkern
   # }}}
   # {{{ gw-man-da
   agricola:
@@ -499,7 +512,7 @@ servers:
   rem:
     address: 82.195.75.68
     parents: gw-man-da
-    hostgroups: computers, buildd, hasbootfs, hassrvfs, squeeze
+    hostgroups: computers, buildd, hasbootfs, hassrvfs, wheezy
   unger:
     address: 82.195.75.102
     parents: gw-man-da
@@ -531,7 +544,7 @@ servers:
   wilder:
     address: 82.195.75.112
     parents: ganeti3
-    hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, wheezy, acpid-hosts, apache2-hosts, apache-https, bacula-client
+    hostgroups: computers, service, hassrvfs, apache2-hosts, kvmdomains, wheezy, acpid-hosts, apache2-hosts, apache-https, bacula-client, rsyncd-hosts, xinetd-hosts
   vieuxtemps:
     address: 82.195.75.113
     parents: ganeti3
@@ -1309,7 +1322,12 @@ services:
     name: disk usage on /srv
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv"
-    hosts: stabile, beach
+    hosts:  beach
+  -
+    name: disk usage on /srv
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv"
+    hosts: stabile
   -
     name: disk usage on /tmp
     servicegroups: diskspace
@@ -1414,7 +1432,6 @@ services:
     servicegroups: apt
     nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/apt"
     hostgroups: computers
-    excludehostgroups: wheezy
     normal_check_interval:  60
     retry_check_interval: 15
  ####
@@ -1453,7 +1470,7 @@ services:
   -
     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'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u bacula -C bacula-fd -a '/usr/sbin/bacula-fd -c /etc/bacula/bacula-fd.conf'"
     hostgroups: computers
     excludehostgroups: freebsd
     excludehosts: wagner, vasks