X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=ef2c682fdf6faf165d66513343e2fbf5eac40855;hb=7e15fbf41af8c06dcc4e5e4caa15aea2c6f99f50;hp=05d07482d078b9c6c110120331b634979bfd98f7;hpb=b598c03f9b5dd18be34fc4a249f69ad954e56814;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 05d0748..ef2c682 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -24,10 +24,18 @@ servers:
     address: 128.148.34.1
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-osuosl:
+    address: 140.211.166.1
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
 
   samosa:
     address: 192.25.206.57
     hostgroups: computers, dl380, apache2-hosts, bind9-hosts
+  raff:
+    address: 192.25.206.59
+    parents: samosa
+    hostgroups: computers, dl380, apache1-hosts, bind9-hosts, rsyncd-hosts
 
   bartok:
     address: 82.195.75.91
@@ -46,7 +54,16 @@ servers:
   ries:
     address: 128.148.34.103
     parents: gw-brown.edu
-    hostgroups: computers, apache2-hosts, bind9-hosts, ftpd-hosts
+    hostgroups: computers, apache2-hosts, bind9-hosts, ftpd-hosts, dl385, rsyncd-hosts
+
+  rietz:
+    address: 140.211.166.43
+    parents: gw-brown.edu
+    hostgroups: computers, apache2-hosts, bind9-hosts, rsyncd-hosts, dl385
+  rietz2:
+    address: 140.211.166.44
+    parents: rietz
+    hostgroups: secondary-IPs
 
 #############################
 # host groups
@@ -88,12 +105,22 @@ hostgroups:
   apache2-hosts:
     alias: hosts running apache2
     private: 1
+  apache1-hosts:
+    alias: hosts running apache1
+    private: 1
   bind9-hosts:
     alias: hosts running bind9
     private: 1
   ftpd-hosts:
     alias: hosts running vsftpd
     private: 1
+  rsyncd-hosts:
+    alias: hosts providing rsync services via xinetd
+    private: 1
+
+  secondary-IPs:
+    alias: secondary IP addresses
+    private: 1
 
 #############################
 # services
@@ -263,11 +290,17 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u Debian-exim -C exim4 -a '/usr/sbin/exim4 -bd -q'"
     hostgroups: computers
     excludehostgroups: postfix-hosts
-    excludehosts: master
+    excludehosts: master, rietz
+  -
+    name: process - exim - total
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1: -C exim4"
+    hostgroups: computers
+    excludehostgroups: postfix-hosts
+    excludehosts: master, rietz
   -
     name: process - exim
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:300 -c 1:500 -C exim4 -a '/usr/sbin/exim4'"
-    hosts: master
+    hosts: master, rietz
  ###
   -
     name: process - clamav - clamd
@@ -292,18 +325,28 @@ services:
     #hosts: samosa
     hostgroups: computers
     excludehostgroups: postfix-hosts
+    excludehosts: rietz
   -
     name: process - spamd - child
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -C spamd -a 'spamd child'"
-    #hosts: samosa
     hostgroups: computers
     excludehostgroups: postfix-hosts
     depends: process - spamd - master
+    excludehosts: rietz
+  #
+  -
+    name: process - spamd - master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u debbugs -C spamd -a '/usr/sbin/spamd -d '"
+    hosts: rietz
+  -
+    name: process - spamd - child
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -u debbugs -C spamd -a 'spamd child'"
+    hosts: rietz
+
  ###
   -
     name: process - greylistd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u greylist -C greylistd -a '/usr/bin/python /usr/sbin/greylistd'"
-    #hosts: samosa
     hostgroups: computers
     excludehostgroups: postfix-hosts
 
@@ -366,11 +409,17 @@ services:
     name: process - uptimed
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u daemon -C uptimed -a '/usr/sbin/uptimed'"
     hostgroups: computers
+ ###
+  -
+    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
 
 
 
  ############ Processes/Services that only run on some computers ############
  ####
+ # XXX - raff:  identd, hpasmd
  ###
   -
     name: process - rngd
@@ -422,7 +471,8 @@ services:
   -
     name: process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xinetd -a '/usr/sbin/xinetd -pidfile /var/run/xinetd.pid -stayalive'"
-    hosts: samosa, ries
+    hosts: samosa
+    hostgroups: rsyncd-hosts
  ###
   -
     name: network service - finger
@@ -433,9 +483,15 @@ services:
   -
     name: network service - rsync
     check: check_tcp!873
-    hosts: ries
+    hostgroups: rsyncd-hosts
     depends: process - xinetd
 
+  -
+    name: network service - rsync
+    check: check_tcp!873
+    hosts: rietz2
+    depends: rietz:process - xinetd
+
  ###
   -
     name: process - nagios1
@@ -462,6 +518,30 @@ services:
     check: check_http
     hostgroups: apache2-hosts
     depends: process - apache2 - master
+
+
+
+  -
+    name: process - apache - master
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C apache -a /usr/sbin/apache"
+    hostgroups: apache1-hosts
+  -
+    name: process - apache - worker
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:50 -c 1:100 -u www-data -C apache -a /usr/sbin/apache"
+    hostgroups: apache1-hosts
+    depends: process - apache - master
+  -
+    name: network service - http
+    check: check_http
+    hostgroups: apache1-hosts
+    depends: process - apache - master
+
+  -
+    name: network service - http keyserver
+    check: dsa_check_http_port!11371
+    hosts: raff
+    depends: process - apache - master
+
   -
     name: network service - https
     check: check_https