X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=6dc9df056db4711169d0dc0aeef88c9731f509da;hb=942634914fb98ec896131aed797ca6576d19979b;hp=ea54ed868ba34e9b578c58f4d703fef9f7977ea6;hpb=ca030884c178628aa81ab57e509506da67d92528;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index ea54ed8..6dc9df0 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -10,7 +10,6 @@
 #  - *: check munin stats collection works
 #  - *: check backups are successful
 #  - *: unwanted: network: auth, discard, daytime, time (on some), cvs-pserver, rsync (on some), ftp (on some), http (on some)
-#  - verdi: pg upgrade, openvpn
 #  - mundy: salinfo_decode
 
 # down:
@@ -395,12 +394,6 @@ servers:
     hostgroups: computers, porterbox, sw-raid, lenny
     contacts: tjrc1
 
-  verdi:
-    address: 192.54.42.193
-    parents: gw-lrz
-    hostgroups: computers, service, postfix-hosts
-    #hostgroups: computers, service, apache2-hosts, ftpd-hosts, postgres81-hosts, postfix-hosts
-
   voltaire:
     address: 72.66.115.54
     parents: gw-frost
@@ -506,6 +499,10 @@ servers:
     address: 137.82.84.79
     parents: gw-ubc
     hostgroups: computers, lenny, hasbootfs, nfs-client, hassrvfs, aacraid
+  morricone:
+    address: 137.82.84.81
+    parents: gw-ubc
+    hostgroups: computers, lenny, hasbootfs, hassrvfs, aacraid, postgres83-hosts, ftpd-hosts, rsyncd-hosts
   stabile:
     address: 137.82.84.72
     parents: gw-ubc
@@ -827,7 +824,7 @@ services:
     name: disk usage on /org
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
-    hosts: sperger, raff, lobos, villa, steffani, saens, pergolesi, verdi, spontini, ravel, mahler, schroeder, piatti, pescetti, widor, schein, lebrun
+    hosts: sperger, raff, lobos, villa, steffani, saens, pergolesi, spontini, ravel, mahler, schroeder, piatti, pescetti, widor, schein, lebrun
   -
     name: disk usage on /org
     servicegroups: diskspace
@@ -1118,11 +1115,11 @@ services:
   -
     name: process - syslogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslogd  -a '/sbin/syslogd'"
-    hosts: rietz, verdi
+    hosts: rietz
   -
     name: process - klogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C klogd  -a '/sbin/klogd -x'"
-    hosts: rietz, verdi
+    hosts: rietz
 
  ### MAIL STUFF
  ###
@@ -1320,19 +1317,6 @@ services:
     hostgroups: postfix-hosts
     depends: process - postfix - master
 
-  -
-    name: process - postfix - smtpd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:40 -c 0:90 -u postfix -C smtpd -a 'smtpd -n smtp -t inet -u -c'"
-    hostgroups: postfix-hosts
-    excludehosts: liszt
-    depends: process - postfix - master
-  -
-    name: process - postfix - smtp
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:10 -c 0:15 -u postfix -C smtp -a 'smtp -t unix -u -c'"
-    hostgroups: postfix-hosts
-    excludehosts: liszt
-    depends: process - postfix - master
-
   -
     name: process - postfix - smtpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:150 -c 0:200 -u postfix -C smtpd -a 'smtpd -n smtp -t inet -u -c'"
@@ -1356,7 +1340,6 @@ services:
     name: network service - smtp
     check: dsa_check_smtp
     hostgroups: postfix-hosts
-    excludehosts: verdi
     depends: process - postfix - master
   -
     name: network service - submission
@@ -1368,11 +1351,6 @@ services:
     check: dsa_check_smtp_port!2025
     hostgroups: incomingmailrelayed2025
     depends: process - exim
-  -
-    name: network service - smtp - port 2025
-    check: dsa_check_smtp_port!2025
-    hosts: verdi
-    depends: process - postfix - master
   -
     name: network service local - smtps cert
     nrpe: "/usr/lib/nagios/plugins/check_http -H localhost -p 465 -S -C 14 -t 45"
@@ -1488,12 +1466,6 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-areca"
     hosts: powell
- ###
-  -
-    name: RAID - DAC960
-    servicegroups: raid
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-dac960"
-    hosts: verdi
  ###
   -
     name: RAID - aacraid