X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=b2a3568f647a929b02d9520e9229d2b27a2d0888;hb=918134dc032881c59be17ce6539ed4f2e2bb24cc;hp=e17fec8224978cefbe2938526fcc222be0baee03;hpb=289bf40e71cbdfb086b0d6498ffeeac1a7bcf304;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index e17fec8..b2a3568 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
@@ -178,11 +182,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
@@ -263,23 +267,23 @@ servers:
   handel:
     address: 82.195.75.104
     parents: unger
-    hostgroups: computers, service, acpid-hosts, lenny, hasbootfs
+    hostgroups: computers, service, lenny, hasbootfs, kvmdomains
   geo1:
     address: 82.195.75.105
     parents: unger
-    hostgroups: computers, service, acpid-hosts, lenny, hasbootfs, bind9-hosts
+    hostgroups: computers, service, lenny, hasbootfs, bind9-hosts, kvmdomains
   draghi:
     address: 82.195.75.106
     parents: unger
-    hostgroups: computers, service, acpid-hosts, lenny, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, ulogd-hosts
+    hostgroups: computers, service, lenny, hasbootfs, hassrvfs, apache2-hosts, bind9-hosts, spamd, heavy-exim, ulogd-hosts, kvmdomains
   kaufmann:
     address: 82.195.75.107
     parents: unger
-    hostgroups: computers, service, lenny, hasbootfs, apache2-hosts, single-cpu, rsyncd-hosts
+    hostgroups: computers, service, lenny, hasbootfs, apache2-hosts, single-cpu, rsyncd-hosts, kvmdomains
   byrd:
     address: 82.195.75.101
     parents: unger
-    hostgroups: computers, service, lenny, hasbootfs, hassrvfs, postgres84-hosts, heavy-exim
+    hostgroups: computers, service, lenny, hasbootfs, hassrvfs, postgres84-hosts, heavy-exim, kvmdomains
 
   master:
     address: 70.103.162.29
@@ -319,7 +323,7 @@ servers:
   busoni:
     address: 140.211.15.34
     parents: gw-osuosl
-    hostgroups: computers, service, lenny, dl360, hassrvfs, acpid-hosts, apache2-hosts
+    hostgroups: computers, service, lenny, dl360, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim
   zee:
     address: 140.211.166.16
     parents: gw-osuosl
@@ -342,10 +346,10 @@ servers:
     address: 128.31.0.36
     parents: gw-mit-csail
     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, bind9-hosts, acpid-hosts, hasbootfs, lenny, hasorgfs
-  mahler:
-    address: 128.31.0.46
-    parents: gw-mit-csail
-    hostgroups: computers, single-cpu, lenny, porterbox, hasorgfs
+  #mahler:
+  #  address: 128.31.0.46
+  #  parents: gw-mit-csail
+  #  hostgroups: computers, single-cpu, lenny, porterbox, hasorgfs
   rore:
     address: 128.31.0.49
     parents: gw-mit-csail
@@ -353,11 +357,11 @@ 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
-  carver:
-    address: 128.31.0.50
-    parents: gw-mit-csail
-    hostgroups: computers, service, lenny, dl380, acpid-hosts, hassrvfs, ulogd-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
+  #  hostgroups: computers, service, lenny, dl380, acpid-hosts, hassrvfs, ulogd-hosts
 
   klecker:
     address: 194.109.137.218
@@ -378,7 +382,7 @@ servers:
   widor:
     address: 93.94.130.161
     parents: gw-dg-i.net
-    hostgroups: computers, apache2-hosts, sw-raid, lenny, acpid-hosts, hasorgfs
+    hostgroups: computers, apache2-hosts, sw-raid, lenny, acpid-hosts, hasorgfs, heavy-exim
     contacts: bzed
 
   pergolesi:
@@ -390,13 +394,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
@@ -437,15 +441,15 @@ servers:
   chopin:
     address: 195.20.242.124
     parents: schumann
-    hostgroups: computers, service, apache2-hosts, ulogd-hosts, lenny, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue
+    hostgroups: computers, service, apache2-hosts, ulogd-hosts, lenny, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, heavy-exim
   geo3:
     address: 195.20.242.125
     parents: schumann
-    hostgroups: computers, service, lenny, hasbootfs, single-cpu, bind9-hosts
+    hostgroups: computers, service, lenny, hasbootfs, single-cpu, bind9-hosts, kvmdomains
   soler:
     address: 195.20.242.126
     parents: schumann
-    hostgroups: computers, service, lenny, hasbootfs, hassrvfs
+    hostgroups: computers, service, lenny, hasbootfs, hassrvfs, kvmdomains
 
   caballero:
     address: 193.201.200.200
@@ -493,7 +497,7 @@ servers:
   ravel:
     address: 206.12.19.5
     parents: gw-ubcnew
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny, nfs-server, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny, nfs-server, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim
   dijkstra:
     address: 206.12.19.218
     parents: gw-ubcnew
@@ -505,23 +509,23 @@ servers:
   wolkenstein:
     address: 206.12.19.116
     parents: dijkstra
-    hostgroups: computers, lenny, hasbootfs, hassrvfs
+    hostgroups: computers, lenny, hasbootfs, hassrvfs, kvmdomains
   brahms:
     address: 206.12.19.115
     parents: dijkstra
-    hostgroups: computers, lenny, buildd, hasbootfs, hassrvfs
+    hostgroups: computers, lenny, buildd, hasbootfs, hassrvfs, kvmdomains
   geo2:
     address: 206.12.19.113
     parents: dijkstra
-    hostgroups: computers, service, lenny, hasbootfs, single-cpu, bind9-hosts
+    hostgroups: computers, service, lenny, hasbootfs, single-cpu, bind9-hosts, kvmdomains
   duarte:
     address: 206.12.19.114
     parents: dijkstra
-    hostgroups: computers, lenny, hasbootfs, hassrvfs, single-cpu, apache2-hosts
+    hostgroups: computers, lenny, hasbootfs, hassrvfs, apache2-hosts, kvmdomains
   valente:
     address: 206.12.19.112
     parents: dijkstra
-    hostgroups: computers, lenny, hasbootfs, single-cpu, hassrvfs, postgres83-hosts, ftpd-hosts, rsyncd-hosts
+    hostgroups: computers, lenny, hasbootfs, single-cpu, hassrvfs, postgres83-hosts, ftpd-hosts, rsyncd-hosts, kvmdomains, heavy-exim
   bellini:
     address: 137.82.84.79
     parents: gw-ubc
@@ -529,15 +533,15 @@ servers:
   morricone:
     address: 206.12.19.9
     parents: gw-ubcnew
-    hostgroups: computers, lenny, hasbootfs, hassrvfs, aacraid, postgres83-hosts, ftpd-hosts, rsyncd-hosts
+    hostgroups: computers, lenny, hasbootfs, hassrvfs, aacraid, postgres83-hosts, ftpd-hosts, rsyncd-hosts, heavy-exim
   stabile:
     address: 137.82.84.72
     parents: gw-ubc
-    hostgroups: computers, lenny, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts
+    hostgroups: computers, lenny, hashomefs, sw-raid, rsyncd-hosts, postgres84-hosts, apache2-hosts
   cimarosa:
     address: 137.82.84.80
     parents: gw-ubc
-    hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs, nfs-client
+    hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs, nfs-client, heavy-exim
   paganini:
     address: 206.12.19.10
     parents: gw-ubcnew
@@ -587,12 +591,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 +609,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 +619,23 @@ 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
+
+  rautavaara:
+    address: 194.177.211.199
+    parents: gw-grnet
+    hostgroups: computers, lenny
+
 #############################
 # host groups
 #
@@ -691,6 +709,10 @@ hostgroups:
     alias: hosts not running samhain properly
     private: 1
 
+  kvmdomains:
+    alias: Hosts that are KVM domains
+    private: 1
+
   postfix-hosts:
     alias: hosts running postfix instead of exim
     private: 1
@@ -792,6 +814,10 @@ hostgroups:
     # i.e. no port 25
     private: 1
 
+  ntpsuckers:
+    alias: hosts who's ntp offset is often unknown
+    private: 1
+
 #############################
 # servicegroups
 #############################
@@ -889,7 +915,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
@@ -1043,7 +1069,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
@@ -1127,6 +1153,7 @@ services:
     hostgroups: computers
     depends: process - ntpd
     excludehosts: zelenka, ancina
+    excludehostgroups: ntpsuckers
   #
   -
     name: network service - time
@@ -1493,6 +1520,23 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     normal_check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460
+ ###
+  -
+    name: HW - hpasmcli status
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"
+    normal_check_interval: 120
+    hostgroups: dl385, dl380, dl360, bl460
+    excludehosts: villa, lobos, liszt, senfl, schein, rore
+  -
+    name: HW - hpasmcli status
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --ps-no-redundant"
+    normal_check_interval: 120
+    hosts: villa, lobos, liszt
+  -
+    name: HW - hpasmcli status
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-no-redundant"
+    normal_check_interval: 120
+    hosts: senfl, schein, rore
  ###
   -
     name: RAID - areca
@@ -1552,7 +1596,7 @@ services:
     name: unexpected process - acpid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C acpid"
     hostgroups: computers
-    excludehostgroups: acpid-hosts
+    excludehostgroups: acpid-hosts, kvmdomains
 
  ###
   -
@@ -1621,7 +1665,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
@@ -1813,7 +1857,7 @@ services:
   -
     name: process - buildd
     servicegroups: buildd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u buildd -C buildd '/usr/bin/perl /usr/bin/buildd'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u buildd -C buildd -a '/usr/bin/buildd'"
     hostgroups: buildd
     contacts: luk
 
@@ -1860,7 +1904,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"
@@ -1941,3 +1985,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=0 $HOSTADDRESS$ public"
+    runfrom: dijkstra
+    hosts: giustini