X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=0ed4706e4dc81f10ab96e5291c94daab69ae8032;hb=1b5dbc9c9b215a5876954f8b9199d63a05a8be3e;hp=8a1db58a92618afc64aa8ec1f1093ddb9fbe0c86;hpb=7193f6eb2d1f2a8a360fd6da66f7334ff1c335e7;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 8a1db58..0ed4706 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -136,6 +136,7 @@ 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
@@ -290,7 +291,7 @@ servers:
   raptor:
     address: 195.243.109.162
     parents: gw-topalis
-    hostgroups: computers, porterbox
+    hostgroups: computers, porterbox, postfix-hosts
 
   albeniz:
     address: 193.62.202.27
@@ -317,6 +318,7 @@ servers:
     address: 72.66.115.54
     parents: gw-frost
     hostgroups: computers, buildd
+    contacts: sfrost
 
   puccini:
     address: 87.106.4.56
@@ -369,6 +371,7 @@ servers:
     address: 137.82.84.42
     parents: gw-ubc
     hostgroups: computers, buildd
+    contacts: lfilipoz
 
   lebrun:
     address: 161.53.160.165
@@ -483,6 +486,8 @@ servicegroups:
     alias: diskusage checks
   buildd:
     alias: buildd checks
+  raid:
+    alias: raid checks
 
 #############################
 # services
@@ -913,7 +918,7 @@ services:
     depends: process - postfix - master
   -
     name: process - postfix - anvil
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:1 -c 1: -u postfix -C anvil -a 'anvil -l -t unix -u'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:1 -c 0: -u postfix -C anvil -a 'anvil -l -t unix -u'"
     hostgroups: postfix-hosts
     depends: process - postfix - master
 
@@ -974,13 +979,19 @@ services:
     name: network service - smtp
     check: dsa_check_smtp
     hostgroups: postfix-hosts
-    excludehosts: verdi, kassia, allegri
+    excludehosts: verdi, kassia, allegri, raptor
     depends: process - postfix - master
   -
     name: network service - smtp - port 2025
     check: dsa_check_smtp_port!2025
     hosts: verdi, kassia, murphy, allegri
     depends: process - postfix - master
+  -
+    name: network service - smtp - port 2025
+    remotecheck: /usr/lib/nagios/plugins/check_smtp -t 40 -H $HOSTADDRESS$ -p 2025
+    runfrom: murphy
+    hosts: raptor
+    depends: process - postfix - master
 
   -
     name: network service local - smtps cert
@@ -1011,7 +1022,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
 
@@ -1064,22 +1075,38 @@ services:
  ###
   -
     name: process - mdadm monitor
+    servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C mdadm -a '/sbin/mdadm --monitor --pid-file /var/run/mdadm/monitor.pid --daemonise --scan'"
     hostgroups: sw-raid
   -
     name: RAID - sw raid
+    servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-sw"
     hostgroups: sw-raid
 
  ###
   -
     name: process - cpqarrayd
+    servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C cpqarrayd -a '/usr/sbin/cpqarrayd'"
     hostgroups: dl385, dl380, dl360
   -
     name: RAID - arrayprobe
+    servicegroups: raid
     nrpe: "sudo /usr/bin/arrayprobe"
     hostgroups: dl385, dl380, dl360
+ ###
+  -
+    name: RAID - DAC960
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-dac960"
+    hosts: verdi
+ ###
+  -
+    name: RAID - 3ware
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-3ware"
+    hosts: puccini
 
  ###
   -
@@ -1220,7 +1247,7 @@ services:
  ####
   -
     name: process - debianqueued
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u dak -C debianqueued -a '/usr/bin/perl -w ./debianqueued'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u dak -C debianqueued"
     hosts: ries
 
  ###