X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=038459d08d34e205d4df3fa932a81bc1c4f65698;hb=ed93c200a789aa7e73a8c6565cd21523f58b58be;hp=becb304531fd7951933bf2cb7943b4103b5a064c;hpb=9be95b183577a4a385b2a060f00457843f69112a;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index becb304..038459d 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -3,6 +3,11 @@
 # Strings ought to be in double quotes, but it works in most cases if they aren't :)
 #
 # vim:set syntax=yaml:
+
+# TODO
+#  - raff:  identd, hpasmd
+#  - *: mailq
+
 ---
 #############################
 # hosts
@@ -32,6 +37,10 @@ servers:
   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
@@ -49,7 +58,7 @@ servers:
 
   ries:
     address: 128.148.34.103
-    parents: gw-brown.edu
+    parents: gw-osuosl
     hostgroups: computers, apache2-hosts, bind9-hosts, ftpd-hosts, dl385, rsyncd-hosts
 
   rietz:
@@ -101,6 +110,9 @@ 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
@@ -283,11 +295,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
@@ -396,6 +414,11 @@ 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
 
 
 
@@ -467,6 +490,12 @@ services:
     hostgroups: rsyncd-hosts
     depends: process - xinetd
 
+  -
+    name: network service - rsync
+    check: check_tcp!873
+    hosts: rietz2
+    depends: rietz:process - xinetd
+
  ###
   -
     name: process - nagios1
@@ -494,6 +523,29 @@ services:
     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