X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=2f3dc37b2557b321b2a4902bf0b6d8fb6f0408ac;hb=07ce807297ebb6c5a131955c1107b19e8417dfe7;hp=42f76f1faad63ee93cb2b40b11bc41751be24fd4;hpb=1749876011d300fbd90218b22f1fc999e62224bb;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 42f76f1..2f3dc37 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -16,9 +16,6 @@
 #  - mundy: salinfo_decode
 #  - puccini: mailgraph
 #  - lebrun: ippl
-#  -
-#  - piatti
-#  - tartini
 
 # down:
 #  - ravel
@@ -113,7 +110,7 @@ servers:
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
   gw-xandros:
-    address: 142.46.212.33
+    address: 67.210.160.81
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
   gw-nmmn:
@@ -136,10 +133,20 @@ servers:
     address: 137.82.84.41
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+    contacts: lfilipoz
   gw-carnet:
     address: 161.53.160.1
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-telegraaf:
+    address: 82.94.249.153
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
+  gw-helsinki:
+    address: 128.214.173.25
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
+    contacts: holger
 
   samosa:
     address: 192.25.206.57
@@ -196,12 +203,12 @@ servers:
   agricola:
     address: 82.195.75.86
     parents: gw-man-da
-    hostgroups: computers, porterbox, sw-raid, single-cpu
+    hostgroups: computers, porterbox, sw-raid, single-cpu, lenny
     contacts: bzed
   arcadelt:
     address: 82.195.75.87
     parents: gw-man-da
-    hostgroups: computers, buildd, sw-raid, single-cpu
+    hostgroups: computers, buildd, sw-raid, single-cpu, lenny
     contacts: bzed
   liszt:
     address: 82.195.75.100
@@ -216,7 +223,7 @@ servers:
   murphy:
     address: 70.103.162.31
     parents: gw-brainfood
-    hostgroups: computers, general, apache2-hosts, bind9-hosts, postfix-hosts
+    hostgroups: computers, general, apache2-hosts, bind9-hosts, postfix-hosts, dl380
 
   ries:
     address: 128.148.34.103
@@ -275,7 +282,7 @@ servers:
   argento:
     address: 195.49.152.174
     parents: gw-dg-i.net
-    hostgroups: computers, buildd, sw-raid, single-cpu
+    hostgroups: computers, buildd, sw-raid, single-cpu, lenny
     contacts: bzed
 
   pergolesi:
@@ -328,14 +335,14 @@ servers:
   caballero:
     address: 193.201.200.200
     parents: gw-blackcat
-    hostgroups: computers, buildd, sw-raid
+    hostgroups: computers, buildd, sw-raid, bind9-hosts
 
   elara:
-    address: 142.46.212.46
+    address: 67.210.160.90
     parents: gw-xandros
     hostgroups: deadslow
   europa:
-    address: 142.46.212.46
+    address: 67.210.160.89
     parents: gw-xandros
     hostgroups: deadslow
 
@@ -358,7 +365,7 @@ servers:
   allegri:
     address: 157.193.39.233
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, postfix-hosts, sw-raid, single-cpu
+    hostgroups: computers, buildd, postfix-hosts, sw-raid, single-cpu, lenny
     contacts: luk
 
   agnesi:
@@ -370,12 +377,24 @@ servers:
     address: 137.82.84.42
     parents: gw-ubc
     hostgroups: computers, buildd
+    contacts: lfilipoz
 
   lebrun:
     address: 161.53.160.165
     parents: gw-carnet
     hostgroups: computers, buildd
 
+  tartini:
+    address: 82.94.249.158
+    parents: gw-telegraaf
+    hostgroups: computers, sw-raid
+
+  piatti:
+    address: 193.167.161.225
+    parents: gw-helsinki
+    hostgroups: computers, postfix-hosts, dl385
+    contacts: holger
+
 #############################
 # host groups
 #
@@ -430,6 +449,10 @@ hostgroups:
     alias: Hosts with only one CPU
     private: 1
 
+  lenny:
+    alias: Hosts running lenny, not etch
+    private: 1
+
   syslog-ng-hosts:
     alias: hosts running syslog-ng instead of sysklogd
     private: 1
@@ -486,6 +509,8 @@ servicegroups:
     alias: buildd checks
   raid:
     alias: raid checks
+  kernel:
+    alias: kernel checks
 
 #############################
 # services
@@ -526,12 +551,12 @@ services:
     name: disk usage on /boot
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /boot"
-    hosts: sperger, rietz, steffani, penalosa, peri, albeniz, escher, goetz, mayer, mayr, paer, spontini
+    hosts: sperger, rietz, steffani, penalosa, peri, albeniz, escher, goetz, mayer, mayr, paer, spontini, tartini
   -
     name: disk usage on /var
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var"
-    hosts: bartok, samosa, raff, lobos, villa, gluck, saens, escher, voltaire, puccini, lebrun
+    hosts: bartok, samosa, raff, lobos, villa, gluck, saens, escher, voltaire, puccini, lebrun, tartini
   -
     name: disk usage on /org
     servicegroups: diskspace
@@ -546,7 +571,7 @@ services:
     name: disk usage on /srv
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv"
-    hosts: agricola, arcadelt, argento, allegri
+    hosts: agricola, arcadelt, argento, allegri, tartini
   -
     name: disk usage on /org/scratch
     servicegroups: diskspace
@@ -556,12 +581,12 @@ services:
     name: disk usage on /tmp
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: samosa, raff, gluck, saens, escher, puccini, merkel
+    hosts: samosa, raff, gluck, saens, escher, puccini, merkel, tartini
   -
     name: disk usage on /usr
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /usr"
-    hosts: samosa, raff, lobos, villa, gluck, saens, pergolesi, puccini, merulo
+    hosts: samosa, raff, lobos, villa, gluck, saens, pergolesi, puccini, merulo, tartini
   -
     name: disk usage on /home
     servicegroups: diskspace
@@ -612,6 +637,15 @@ services:
     max_check_attempts: 2
     retry_check_interval: 5
 
+ ####
+  -
+    name: running kernel
+    servicegroups: kernel
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-running-kernel"
+    hostgroups: computers
+    normal_check_interval: 180
+    retry_check_interval: 5
+
  ####
   -
     name: users
@@ -668,6 +702,7 @@ services:
     hostgroups: computers
     depends: process - sshd
     normal_check_interval:  60
+    notification_interval: 1440
 
   -
     name: "network service - sshd"
@@ -680,16 +715,44 @@ services:
     check: dsa_check_ssh_port!2260
     hosts: agnesi
     normal_check_interval:  180
+  -
+    name: "network service - sshd - 443"
+    check: dsa_check_ssh_port!443
+    hosts: gluck
+    normal_check_interval:  180
+
+  -
+    name: "network service - sshd - version"
+    check: "dsa_check_ssh_port_version!22!OpenSSH_4.3p2 Debian-9etch2"
+    depends: network service - sshd
+    hostgroups: computers, deadslow
+    excludehosts: agnesi
+    excludehostgroups: lenny
+    normal_check_interval:  360
+  -
+    name: "network service - sshd - version"
+    check: "dsa_check_ssh_port_version!22!OpenSSH_4.7p1 Debian-9"
+    depends: network service - sshd
+    hostgroups: lenny
+    normal_check_interval:  360
+  -
+    name: "network service - sshd - version - 2260"
+    check: "dsa_check_ssh_port_version!2260!OpenSSH_4.3p2 Debian-9etch2"
+    depends: network service - sshd - 2260
+    hosts: agnesi
+    normal_check_interval:  360
  ####
   -
     name: network service - nrpe
     check: check_tcp!5666
     hostgroups: computers
-    max_check_attempts: -1
+    max_check_attempts: -2
+    notification_interval: 1440
   -
     name: process - nrpe
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1: -u nagios -C nrpe -a '/usr/sbin/nrpe -c /etc/nagios/nrpe.cfg -d'"
     hostgroups: computers
+    max_check_attempts: -1
     depends: network service - nrpe
  ###
   -
@@ -977,12 +1040,17 @@ services:
     name: network service - smtp
     check: dsa_check_smtp
     hostgroups: postfix-hosts
-    excludehosts: verdi, kassia, allegri, raptor
+    excludehosts: verdi, kassia, allegri, raptor, piatti
     depends: process - postfix - master
   -
     name: network service - smtp - port 2025
     check: dsa_check_smtp_port!2025
-    hosts: verdi, kassia, murphy, allegri
+    hosts: verdi, kassia, murphy, allegri, piatti
+    depends: process - postfix - master
+  -
+    name: network service - smtp - port 8080
+    check: dsa_check_smtp_port!8080
+    hosts: murphy, piatti
     depends: process - postfix - master
   -
     name: network service - smtp - port 2025
@@ -1020,7 +1088,7 @@ services:
     hostgroups: computers
     excludehostgroups: single-cpu
   -
-    name: unwanted process - named
+    name: unwanted process - irqbalance
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C irqbalance"
     hostgroups: single-cpu
 
@@ -1093,6 +1161,11 @@ services:
     servicegroups: raid
     nrpe: "sudo /usr/bin/arrayprobe"
     hostgroups: dl385, dl380, dl360
+  -
+    name: HW - hpacucli status
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
+    hostgroups: dl385, dl380, dl360
  ###
   -
     name: RAID - DAC960
@@ -1105,6 +1178,12 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-3ware"
     hosts: puccini
+ ###
+  -
+    name: RAID - MPT
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-mpt"
+    hosts: master
 
  ###
   -
@@ -1270,7 +1349,21 @@ services:
     depends: process - postresql81 - master
 
  ####
-  # XXX is this needed
+  -
+    name: process - xenconsoled
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xenconsoled -a 'xenconsoled'"
+    hosts: piatti
+  -
+    name: process - xenstored
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xenstored -a '/usr/lib/xen-3.0.3-1/bin/xenstored --pid-file /var/run/xenstore.pid'"
+    hosts: piatti
+  -
+    name: process - xend
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:2 -c 2: -u root -C python -a 'python /usr/lib/xen-3.0.3-1/bin/xend start'"
+    hosts: piatti
+
+ ####
+  # XXX is this needed?
   -
     name: process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u snmp -C snmpd -a '/usr/sbin/snmpd -Lsd -Lf /dev/null -u snmp -I -smux -p /var/run/snmpd.pid 127.0.0.1'"