X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=c7fed747608e3330069939ecd0a78956b19c1757;hb=7de41b99f4fe0281df4cb027973305d5da524203;hp=5f517140bb8bb833b69cf58eee78ca691a5742a5;hpb=df5e1cd2799bc8d4a34b08212c6bd2bcf803b669;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 5f51714..c7fed74 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -98,6 +98,10 @@ servers:
     address: 193.201.200.129
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-grnet:
+    address: 194.177.211.193
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
   gw-nmmn:
     address: 217.114.76.81
     parents: gw-HP-ftc
@@ -169,6 +173,10 @@ servers:
     address: 150.203.164.38
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-sil:
+    address: 86.59.118.145
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
 
   global:
     hostgroups: notacomputer
@@ -178,11 +186,11 @@ servers:
   samosa:
     address: 192.25.206.57
     parents: spohr
-    hostgroups: computers, service, dl380, lenny, hassrvfs, hasbootfs, acpid-hosts, ulogd-hosts, nfs-client, postgres84-hosts
+    hostgroups: computers, service, dl380, lenny, hassrvfs, hasbootfs, acpid-hosts, ulogd-hosts, nfs-client, postgres84-hosts, bind9-hosts
   raff:
     address: 192.25.206.59
     parents: spohr
-    hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, rsyncd-hosts, heavy-exim, ulogd-hosts, nfs-client, lenny, hasvarfs, hasusrfs, hasorgfs
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny, no-udev, hassrvfs, acpid-hosts
   merkel:
     address: 192.25.206.16
     parents: spohr
@@ -220,6 +228,10 @@ servers:
     address: 192.25.206.58
     parents: spohr
     hostgroups: computers, porterbox, lenny, hasusrfs
+  alkman:
+    address: 192.25.206.63
+    parents: spohr
+    hostgroups: computers, buildd, lenny, acpid-hosts
 
   bartok:
     address: 82.195.75.91
@@ -353,7 +365,7 @@ servers:
   senfl:
     address: 128.31.0.51
     parents: gw-mit-csail
-    hostgroups: computers, service, lenny, dl360, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts, rsyncd-hosts
+    hostgroups: computers, service, lenny, dl360, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts, rsyncd-hosts, bind9-hosts
   #carver:
   #  address: 128.31.0.50
   #  parents: gw-mit-csail
@@ -390,13 +402,13 @@ servers:
     address: 193.62.202.27
     parents: gw-sanger
     # SMP kernel doesn't run stable
-    hostgroups: computers, porterbox, sw-raid, single-cpu, hasbootfs, lenny
+    hostgroups: computers, porterbox, sw-raid, single-cpu, hasbootfs, lenny, ntpsuckers
     contacts: tjrc1
   goetz:
     address: 193.62.202.26
     parents: gw-sanger
     # SMP kernel doesn't run stable
-    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, lenny
+    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, lenny, ntpsuckers
     contacts: tjrc1
   sibelius:
     address: 193.62.202.28
@@ -558,6 +570,14 @@ servers:
     # unless we implement runfrom for host alive checks
     pingable: false
     check_command: dsa_check_always_ok
+  fano:
+    address: 206.12.19.110
+    parents: luchesi
+    hostgroups: computers, freebsd
+  finzi:
+    address: 206.12.19.111
+    parents: luchesi
+    hostgroups: computers, freebsd
 
   lebrun:
     address: 193.198.184.10
@@ -587,12 +607,16 @@ servers:
   ball:
     address: 78.32.9.213
     parents: gw-ball
-    hostgroups: computers, buildd, no-udev, dialup, hasbootfs, lenny, hashomefs
+    hostgroups: computers, buildd, no-udev, dialup, hasbootfs, lenny, hashomefs, ntpsuckers
 
   zelenka:
     address: 80.245.147.40
     parents: gw-HP-ftc
     hostgroups: computers, porterbox, lenny, hassrvfs
+  zandonai:
+    address: 80.245.147.46
+    parents: gw-HP-ftc
+    hostgroups: computers, buildd, lenny, hassrvfs
 
   escher:
     address: 213.188.99.215
@@ -601,7 +625,7 @@ servers:
   goedel:
     address: 213.188.99.214
     parents: gw-cst
-    hostgroups: computers, single-cpu, hasbootfs, lenny
+    hostgroups: computers, single-cpu, hasbootfs, lenny, ntpsuckers
 
   schein:
     address: 149.20.20.6
@@ -611,13 +635,68 @@ servers:
   praetorius:
     address: 130.239.18.121
     parents: gw-aca
-    hostgroups: computers, buildd, lenny
+    hostgroups: computers, buildd, lenny, hassrvfs
 
   lafayette:
     address: 147.215.7.160
     parents: gw-esiee
     hostgroups: computers, buildd, lenny, sw-raid, hassrvfs, hasbootfs
 
+  grieg:
+    address: 194.177.211.200
+    parents: gw-grnet
+    hostgroups: computers, lenny, acpid-hosts
+  rautavaara:
+    address: 194.177.211.199
+    parents: gw-grnet
+    hostgroups: computers, lenny, acpid-hosts, ulogd-hosts
+  fasch:
+    address: 194.177.211.201
+    parents: rautavaara
+    hostgroups: computers, freebsd
+  holter:
+    address: 194.177.211.202
+    parents: gw-grnet
+    hostgroups: computers, lenny, acpid-hosts, hassrvfs, ulogd-hosts, apache2-hosts
+  barber:
+    address: 194.177.211.203
+    parents: gw-grnet
+    hostgroups: computers, lenny, acpid-hosts, buildd, hassrvfs
+  biber:
+    address: 194.177.211.204
+    parents: gw-grnet
+    hostgroups: computers, lenny, acpid-hosts, buildd, hassrvfs
+  cilea:
+    address: 194.177.211.205
+    parents: gw-grnet
+    hostgroups: computers, lenny, acpid-hosts
+  vitry:
+    address: 194.177.211.206
+    parents: gw-grnet
+    hostgroups: computers, lenny, acpid-hosts
+  krenek:
+    address: 194.177.211.207
+    parents: gw-grnet
+    hostgroups: computers, lenny, acpid-hosts
+  scelsi:
+    address: 194.177.211.208
+    parents: gw-grnet
+    hostgroups: computers, lenny, acpid-hosts
+  orff:
+    address: 194.177.211.209
+    parents: gw-grnet
+    hostgroups: computers, lenny, acpid-hosts, bind9-hosts
+  field:
+    address: 194.177.211.210
+    parents: rautavaara
+    hostgroups: computers, freebsd
+
+  beethoven:
+    address: 86.59.118.146
+    parents: gw-sil
+    hostgroups: computers, hasbootfs
+
+
 #############################
 # host groups
 #
@@ -639,6 +718,9 @@ hostgroups:
     alias: Systems too slow to run any real checks
   dialup:
     alias: Systems with slow network
+  freebsd:
+    alias: freebsd
+    private: 1
 
   porterbox:
     alias: developer accessible porter machines
@@ -796,6 +878,10 @@ hostgroups:
     # i.e. no port 25
     private: 1
 
+  ntpsuckers:
+    alias: "hosts who's ntp offset is often unknown"
+    private: 1
+
 #############################
 # servicegroups
 #############################
@@ -853,12 +939,12 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /"
     hostgroups: computers
-    excludehosts: ries, klecker, kassia
+    excludehosts: ries, klecker, kassia, spohr
   -
     name: disk usage on /
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 93 /"
-    hosts: ries, klecker, kassia
+    hosts: ries, klecker, kassia, spohr
   -
     name: disk usage on /boot
     servicegroups: diskspace
@@ -893,7 +979,7 @@ services:
     name: disk usage on /tmp
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: raff, saens, puccini, merkel, tartini, powell, piatti, escher
+    hosts: saens, puccini, merkel, tartini, powell, piatti, escher
   -
     name: disk usage on /usr
     servicegroups: diskspace
@@ -1047,7 +1133,7 @@ services:
     name: process - getty
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C getty -a /sbin/getty"
     hostgroups: computers
-    excludehosts: zelenka
+    excludehosts: zelenka, zandonai
  ####
   -
     name: process - sshd
@@ -1131,6 +1217,7 @@ services:
     hostgroups: computers
     depends: process - ntpd
     excludehosts: zelenka, ancina
+    excludehostgroups: ntpsuckers
   #
   -
     name: network service - time
@@ -1409,11 +1496,11 @@ services:
     name: process - irqbalance
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C irqbalance -a '/usr/sbin/irqbalance'"
     hostgroups: computers
-    excludehostgroups: single-cpu
+    excludehostgroups: single-cpu, freebsd
   -
     name: unwanted process - irqbalance
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C irqbalance"
-    hostgroups: single-cpu
+    hostgroups: single-cpu, freebsd
 
  ####
  ###
@@ -1443,7 +1530,7 @@ services:
     name: unwanted process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
     hostgroups: computers
-    excludehosts: rietz
+    excludehosts: rietz, grieg
   -
     name: unwanted process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
@@ -1559,11 +1646,11 @@ services:
     name: process - udevd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C udevd -a 'udevd'"
     hostgroups: computers
-    excludehostgroups: no-udev
+    excludehostgroups: no-udev, freebsd
   -
     name: unexpected process - udev
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C udevd"
-    hostgroups: no-udev
+    hostgroups: no-udev, freebsd
  ###
   -
     name: process - acpid
@@ -1575,6 +1662,11 @@ services:
     hostgroups: computers
     excludehostgroups: acpid-hosts, kvmdomains
 
+ ###
+  -
+    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
  ###
   -
     name: process - xinetd
@@ -1642,7 +1734,7 @@ services:
     depends: kassia:process - apache2 - master
     hosts: kassia-sec, kassia-ftp, kassia-volatile
 
-  # keyserver on raff
+  # keyserver on kaufmann
   -
     name: network service - http keyserver
     check: dsa_check_http_port!11371
@@ -1834,9 +1926,9 @@ services:
   -
     name: process - buildd
     servicegroups: buildd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u buildd -C buildd -a '/usr/bin/buildd'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -u buildd -C buildd -a '/usr/bin/buildd'"
     hostgroups: buildd
-    contacts: luk
+    contacts: luk, pkern, HE
 
  ###
   #-
@@ -1881,7 +1973,7 @@ services:
   -
     name: nfs mount ftp archive
     nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /org/mirrors/ftp.debian.org/ftp"
-    hosts: merkel, raff
+    hosts: merkel
   -
     name: nfs mount ftp archive
     nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /srv/ftp.debian.org/ftp"
@@ -1897,6 +1989,10 @@ services:
     name: mirror sync - security
     check: "dsa_check_mirrorsync!security-nagios.debian.org!project/trace/security-master.debian.org"
     hosts: global
+  -
+    name: mirror sync - volatile
+    check: "dsa_check_mirrorsync!volatile.debian.org!debian-volatile/project/trace/volatile-master.debian.org"
+    hosts: global
   -
     name: mirror sync - packages
     check: "dsa_check_mirrorsync!packages.debian.org!Pics/.trace"
@@ -1962,3 +2058,8 @@ services:
     remotecheck: "/usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C public -P 2c -o connUnitStatus -n -c 3 -w 3"
     runfrom: dijkstra
     hosts: giustini
+  -
+    name: event log
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=789 $HOSTADDRESS$ public"
+    runfrom: dijkstra
+    hosts: giustini