X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=3f5d97e264284e07ede5bb1c3373e3334f320955;hb=757803e062618814a7aafa1d1e1a0dcafc10c59a;hp=91f86f403699df00917a1f294cf81f46cc7dd71d;hpb=1674af72dd8919caf244ed4ef5b65523f9406b6e;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 91f86f4..3f5d97e 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -17,18 +17,12 @@
 #  - puccini: mailgraph
 #  -
 #  - agnesi
-#  - casals
-#  - crest
-#  - elara
-#  - europa
 #  - kassia
-#  - kullervo
 #  - lebrun
 #  - murphy
 #  - piatti
 #  - tartini
 #sarge:
-#  - caballero
 #  - spontini
 
 # down:
@@ -115,6 +109,22 @@ servers:
     address: 195.20.247.53
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-blackcat:
+    address: 193.201.200.129
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
+  gw-xandros:
+    address: 142.46.212.33
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
+  gw-nmmn:
+    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
 
   samosa:
     address: 192.25.206.57
@@ -217,6 +227,10 @@ servers:
     address: 128.31.0.36
     parents: gw-mit-csail
     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid
+  casals:
+    address: 128.31.0.16
+    parents: gw-mit-csail
+    hostgroups: deadslow
 
   klecker:
     address: 194.109.137.218
@@ -273,9 +287,37 @@ 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:
+    address: 193.201.200.200
+    parents: gw-blackcat
+    hostgroups: computers, buildd, sw-raid
+
+  elara:
+    address: 142.46.212.46
+    parents: gw-xandros
+    hostgroups: deadslow
+  europa:
+    address: 142.46.212.46
+    parents: gw-xandros
+    hostgroups: deadslow
+
+  kullervo:
+    address: 217.114.76.82
+    parents: gw-nmmn
+    hostgroups: deadslow
+  crest:
+    address: 217.114.76.83
+    parents: gw-nmmn
+    hostgroups: deadslow
+
+  kassia:
+    address: 130.89.175.54
+    parents: gw-utwente
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, dl360
+
 #############################
 # host groups
 #
@@ -290,6 +332,8 @@ hostgroups:
     alias: Internet routers and friends
     extinfo-icon_image: base/switch40.png
     extinfo-icon_image_alt: router
+  deadslow:
+    alias: Systems too slow to run any real checks
 
   porterbox:
     alias: developer accessible porter machines
@@ -318,6 +362,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
@@ -391,7 +438,7 @@ services:
     hostgroups: computers
   -
     name: disk usage on /boot
-    nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /boot"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /boot"
     hosts: sperger, rietz, steffani, penalosa, peri, albeniz, escher, goetz, mayer, mayr, paer
   -
     name: disk usage on /var
@@ -433,6 +480,10 @@ services:
     name: disk usage on /mnt/hdc
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /mnt/hdc"
     hosts: voltaire
+  -
+    name: disk usage on /x
+    nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /x"
+    hosts: caballero
 
  ############ All Computers ############
  ####
@@ -496,6 +547,13 @@ services:
     depends: process - sshd
     normal_check_interval:  60
     notification_interval:  60
+
+  -
+    name: "network service - sshd"
+    check: check_ssh
+    hostgroups: deadslow
+    normal_check_interval:  180
+    notification_interval:  180
  ####
   -
     name: network service - nrpe
@@ -790,12 +848,12 @@ services:
  ###
   -
     name: network service - smtp
-    check: check_smtp
+    check: dsa_check_smtp
     hostgroups: postfix-hosts
     depends: process - postfix - master
   -
     name: network service - smtp
-    check: check_smtp
+    check: dsa_check_smtp
     hostgroups: computers
     excludehostgroups: postfix-hosts
     depends: process - exim
@@ -840,6 +898,11 @@ services:
     name: unwanted process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
     hostgroups: computers
+  -
+    name: unwanted process - snmpd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
+    hostgroups: computers
+    excludehosts: lobos, villa
 
 
  ############ Processes/Services that only run on some computers ############
@@ -869,11 +932,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
 
  ###
   -
@@ -884,12 +947,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
  ###
   -
     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
 
  ###
   -