X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=1c9971c1aa2cb6da5bf69edb2eaffa572a1aedb8;hb=dd431157057e9594008e55310ef33c25e9ea0a55;hp=94f5f23f50ca4793bc87025a9b6f101c9de52caf;hpb=6e9eb72d534e1311dcff84344f003a01712f805e;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 94f5f23..1c9971c 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -16,9 +16,6 @@
 #  - mundy: salinfo_decode
 #  - puccini: mailgraph
 #  - lebrun: ippl
-#  -
-#  - piatti
-#  - tartini
 
 # down:
 #  - ravel
@@ -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
@@ -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
+
+  piatti:
+    address: 193.167.161.225
+    parents: gw-helsinki
+    hostgroups: computers, postfix-hosts, dl385
+    contacts: holger
+
 #############################
 # host groups
 #
@@ -526,12 +545,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 +565,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 +575,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
@@ -977,12 +996,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
@@ -1105,6 +1129,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 +1300,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'"