X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=caaef8e9d8fb2693f4b515e4f5a9123c1735f3be;hb=a3af6962dd5bad3a4fd886d59678c7c63e87ffcf;hp=0dd2d3542d145665ea6b1da13c7a0e5fe25ea29e;hpb=4ee1fd131b94425bffb47ea4b0e2d59493e78a9a;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 0dd2d35..caaef8e 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -291,6 +291,10 @@ servers:
     address: 82.195.75.92
     parents: unger
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
+  lamb:
+    address: 82.195.75.101
+    parents: unger
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa
 
   master:
     address: 70.103.162.29
@@ -604,6 +608,14 @@ servers:
     address: 206.12.19.119
     parents: tchaikovsky
     hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
+  locke:
+    address: 206.12.19.120
+    parents: tchaikovsky
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa
+  lotti:
+    address: 206.12.19.121
+    parents: tchaikovsky
+    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
 
   lebrun:
     address: 193.198.184.10
@@ -670,7 +682,7 @@ servers:
   rautavaara:
     address: 194.177.211.199
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, megaraid, service
+    hostgroups: computers, acpid-hosts, megaraid, service, squeeze
   fasch:
     address: 194.177.211.201
     parents: rautavaara
@@ -948,6 +960,9 @@ hostgroups:
   hasusrfs:
     alias: hosts with a /usr filesystem
     private: 1
+  hasvicepa:
+    alias: hosts with a /vicepa
+    private: 1
 
   incomingmailrelayed:
     alias: incoming mail needs to go through a mail relay
@@ -1152,6 +1167,11 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv/fossology.debian.net"
     hosts: vivaldi
+  -
+    name: disk usage on /vicepa
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /vicepa"
+    hostgroups: hasvicepa
 
  ############ All Computers ############
  ####
@@ -1653,7 +1673,7 @@ services:
     name: unwanted process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
     hostgroups: computers
-    excludehosts: grieg
+    excludehosts: grieg, byrd
   -
     name: unwanted process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
@@ -1817,7 +1837,7 @@ services:
   -
     name: process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C inetd -a '/usr/sbin/inetd'"
-    hosts: grieg
+    hosts: grieg, byrd
  ###
   -
     name: process - xinetd
@@ -2195,7 +2215,7 @@ services:
     retry_check_interval: 5
   -
     name: mirror sync - snapshot
-    check: "dsa_check_mirrorsync_skew!snapshot.debian.org!project/trace/snapshot-master.debian.org!1800:28800"
+    check: "dsa_check_mirrorsync_skew!snapshot.debian.org!project/trace/snapshot-master.debian.org!3600:28800"
     hosts: global
     normal_check_interval: 15
     max_check_attempts: 5