X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=9d970a6869b54d44d29f93ce9e0bc68771e5dd2b;hb=228b55049c37a588bb971dd756dd7db4a387906d;hp=5c919859db37b62767172bd15799732a445bcbe8;hpb=c6c5af1872323de04179a044251cba20626aa525;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 5c91985..9d970a6 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -17,9 +17,6 @@
 #  - puccini: mailgraph
 #  -
 #  - agnesi
-#  - kassia
-#  - lebrun
-#  - murphy
 #  - piatti
 #  - tartini
 #sarge:
@@ -121,6 +118,14 @@ servers:
     address: 217.114.76.81
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-utwente:
+    address: 130.89.160.1
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
+  gw-ughent:
+    address: 157.193.39.254
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
 
   samosa:
     address: 192.25.206.57
@@ -182,7 +187,11 @@ servers:
   master:
     address: 70.103.162.29
     parents: gw-brainfood
-    hostgroups: computers, general, apache2-hosts, bind9-hosts, heavy-exim
+    hostgroups: computers, general, apache2-hosts, bind9-hosts, heavy-exim, highload
+  murphy:
+    address: 70.103.162.31
+    parents: gw-brainfood
+    hostgroups: computers, general, apache2-hosts, bind9-hosts, postfix-hosts
 
   ries:
     address: 128.148.34.103
@@ -283,7 +292,7 @@ servers:
 
   puccini:
     address: 87.106.4.56
-    parents: gw-frost
+    parents: gw-1und1
     hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts
 
   caballero:
@@ -309,6 +318,15 @@ servers:
     parents: gw-nmmn
     hostgroups: deadslow
 
+  kassia:
+    address: 130.89.175.54
+    parents: gw-utwente
+    hostgroups: computers, service, postfix-hosts, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360
+
+  allegri:
+    address: 157.193.39.233
+    parents: gw-ughent
+    hostgroups: computers, buildd, postfix-hosts, sw-raid
 
 #############################
 # host groups
@@ -354,6 +372,9 @@ hostgroups:
   dl385:
     alias: HP DL385 hosts
     private: 1
+  dl360:
+    alias: HP DL360 hosts
+    private: 1
   sw-raid:
     alias: Hosts with Linux software raid
     private: 1
@@ -411,6 +432,17 @@ services:
     name: PING
     check: "check_ping!300.0,20%!600.0,40%"
     hostgroups: all
+    excludehostgroups: routing-infrastructure
+    normal_check_interval: 5
+    max_check_attempts: 4
+    retry_check_interval: 1
+  -
+    name: PING
+    check: "check_ping!900.0,60%!1500.0,80%"
+    hostgroups: routing-infrastructure
+    normal_check_interval: 5
+    max_check_attempts: 4
+    retry_check_interval: 1
 
  ############ Services ############
  ###
@@ -436,11 +468,15 @@ services:
   -
     name: disk usage on /org
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
-    hosts: bartok, sperger, samosa, raff, lobos, villa, steffani, merkel, saens, pergolesi, verdi, puccini
+    hosts: bartok, sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, puccini
+  -
+    name: disk usage on /org
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /org"
+    hosts: merkel
   -
     name: disk usage on /srv
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv"
-    hosts: agricola, arcadelt, argento
+    hosts: agricola, arcadelt, argento, allegri
   -
     name: disk usage on /org/scratch2
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org/scratch2"
@@ -460,7 +496,11 @@ services:
   -
     name: disk usage on /home
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
-    hosts: gluck, raptor, escher, voltaire
+    hosts: raptor, escher, voltaire
+  -
+    name: disk usage on /home
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /home"
+    hosts: gluck
   -
     name: disk usage on /chroot
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /chroot"
@@ -472,7 +512,7 @@ services:
   -
     name: disk usage on /x
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /x"
-    hosts: voltaire
+    hosts: caballero
 
  ############ All Computers ############
  ####
@@ -492,13 +532,18 @@ services:
  ####
   -
     name: load
-    nrpe: "/usr/lib/nagios/plugins/check_load -w 12,10,8 -c 22,18,14"
+    nrpe: "/usr/lib/nagios/plugins/check_load -w 30,28,26 -c 50,45,50"
     hostgroups: computers
     excludehostgroups: highload
   -
     name: load
-    nrpe: "/usr/lib/nagios/plugins/check_load -w 100,80,60 -c 200,160,140"
+    nrpe: "/usr/lib/nagios/plugins/check_load -w 140,120,100 -c 240,220,200"
     hostgroups: highload
+    excludehosts: rietz
+  -
+    name: load
+    nrpe: "/usr/lib/nagios/plugins/check_load -w 200,200,200 -c 350,350,350"
+    hosts: rietz
  ####
   -
     name: processes - zombies
@@ -745,14 +790,8 @@ services:
     depends: process - weightd - master
   -
     name: process - weightd - child
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:10 -c 1: -u polw -C policyd-weight -a 'policyd-weight (child)'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:50 -c 1: -u polw -C policyd-weight -a 'policyd-weight (child)'"
     hostgroups: heavy-postfix
-    excludehosts: liszt
-    depends: process - weightd - master
-  -
-    name: process - weightd - child
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:40 -c 1: -u polw -C policyd-weight -a 'policyd-weight (child)'"
-    hosts: liszt
     depends: process - weightd - master
   #
   -
@@ -812,7 +851,7 @@ services:
 
   -
     name: process - postfix - smtpd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:10 -c 0:15 -u postfix -C smtpd -a 'smtpd -n smtp -t inet -u -c'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:20 -c 0:50 -u postfix -C smtpd -a 'smtpd -n smtp -t inet -u -c'"
     hostgroups: postfix-hosts
     excludehosts: liszt
     depends: process - postfix - master
@@ -825,7 +864,7 @@ services:
 
   -
     name: process - postfix - smtpd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:100 -c 0:150 -u postfix -C smtpd -a 'smtpd -n smtp -t inet -u -c'"
+    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'"
     hosts: liszt
     depends: process - postfix - master
   -
@@ -835,11 +874,6 @@ services:
     depends: process - postfix - master
 
  ###
-  -
-    name: network service - smtp
-    check: dsa_check_smtp
-    hostgroups: postfix-hosts
-    depends: process - postfix - master
   -
     name: network service - smtp
     check: dsa_check_smtp
@@ -847,7 +881,36 @@ services:
     excludehostgroups: postfix-hosts
     depends: process - exim
 
+  -
+    name: network service - smtp
+    check: dsa_check_smtp
+    hostgroups: postfix-hosts
+    excludehosts: verdi, kassia, allegri
+    depends: process - postfix - master
+  -
+    name: network service - smtp - port 2025
+    check: dsa_check_smtp_port!2025
+    hosts: verdi, kassia, murphy
+    depends: process - postfix - master
+  -
+    name: network service - smtp - port 8080
+    check: dsa_check_smtp_port!8080
+    hosts: allegri
+    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"
+    hostgroups: postfix-hosts
+    depends: process - postfix - master
+    normal_check_interval: 1440
+
 
+  -
+    name: setup - debian-admin in etc aliases
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-da-in-aliases"
+    hostgroups: computers
+    normal_check_interval: 1440
  ###
   -
     name: process - uptimed
@@ -858,19 +921,19 @@ services:
     name: process - irqbalance
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C irqbalance -a '/usr/sbin/irqbalance'"
     hostgroups: computers
-    excludehosts: arcadelt, agricola, argento, penalosa, peri, escher, bruckner
+    excludehosts: arcadelt, agricola, argento, penalosa, peri, escher, bruckner, allegri
 
 
  ####
  ###
-  -
-    name: unwanted process - system-tools-backends
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C system-tools-ba"
-    hostgroups: computers
-  -
-    name: unwanted process - dbus-daemon
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C dbus-daemon"
-    hostgroups: computers
+  #-
+  #  name: unwanted process - system-tools-backends
+  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C system-tools-ba"
+  #  hostgroups: computers
+  #-
+  #  name: unwanted process - dbus-daemon
+  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C dbus-daemon"
+  #  hostgroups: computers
   -
     name: unwanted process - gkrellmd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C gkrellmd"
@@ -921,11 +984,11 @@ services:
   -
     name: process - cpqarrayd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C cpqarrayd -a '/usr/sbin/cpqarrayd'"
-    hostgroups: dl385, dl380
+    hostgroups: dl385, dl380, dl360
   -
     name: RAID - arrayprobe
     nrpe: "sudo /usr/bin/arrayprobe"
-    hostgroups: dl385, dl380
+    hostgroups: dl385, dl380, dl360
 
  ###
   -
@@ -936,12 +999,12 @@ services:
   -
     name: process - udevd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C udevd -a 'udevd'"
-    hosts: sperger, ries, steffani, merkel, spohr, peri, penalosa, albeniz, escher, verdi, liszt
+    hosts: sperger, ries, steffani, merkel, spohr, peri, penalosa, albeniz, escher, verdi, liszt, kassia, agricola, arcadelt, argento, allegri
  ###
   -
     name: process - acpid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C acpid -a '/usr/sbin/acpid -c /etc/acpi/events -s /var/run/acpid.socket'"
-    hosts: ries, steffani, liszt
+    hosts: ries, steffani, liszt, kassia
 
  ###
   -
@@ -1061,7 +1124,7 @@ services:
     hostgroups: ftpd-hosts
   -
     name: process - vsftp - instance
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:30 -c 0:50 -u ftp -C vsftpd -a 'vsftpd: '"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:80 -c 0:100 -u ftp -C vsftpd -a 'vsftpd: '"
     hostgroups: ftpd-hosts
   -
     name: network service - ftp
@@ -1125,3 +1188,8 @@ services:
     name: process - dhcpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C dhcpd3 -a '/usr/sbin/dhcpd3 -q eth0'"
     hosts: paer
+ ###
+  -
+    name: process - monit
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C monit -a '/usr/sbin/monit -d 30 -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
+    hosts: villa, lobos, steffani, kassia, master