X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=21ee3352feaade4ed7895e2d6ceda4c99fd1ec29;hb=48437fb73afd844c7b0514251504efed2f5e6d27;hp=5623d55f53bc805877b9488ce52f39101be28091;hpb=e98fab12ca9b6747c8ffab2112ce295b500b7b0a;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 5623d55..21ee335 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -319,7 +319,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
@@ -378,7 +378,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:
@@ -437,7 +437,7 @@ servers:
   chopin:
     address: 195.20.242.124
     parents: schumann
-    hostgroups: computers, service, apache2-hosts, ulogd-hosts, lenny, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains
+    hostgroups: computers, service, apache2-hosts, ulogd-hosts, lenny, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, heavy-exim
   geo3:
     address: 195.20.242.125
     parents: schumann
@@ -493,7 +493,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
@@ -517,11 +517,11 @@ servers:
   duarte:
     address: 206.12.19.114
     parents: dijkstra
-    hostgroups: computers, lenny, hasbootfs, hassrvfs, single-cpu, apache2-hosts, kvmdomains
+    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, kvmdomains
+    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 +529,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
@@ -1497,12 +1497,23 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     normal_check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460
+ ###
   -
     name: HW - hpasmcli status
-    servicegroups: raid
     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
@@ -1823,7 +1834,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
 
@@ -1951,3 +1962,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