From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 3 Apr 2008 17:34:09 +0000 (-0400)
Subject: [project @ peter@palfrader.org-20080403173409-5p83lvwog8zjehy9]
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7e15fbf41af8c06dcc4e5e4caa15aea2c6f99f50;hp=ded581d9ae9cf77edf5f65c10e0dfd8a18715ac1;p=mirror%2Fdsa-nagios.git

[project @ peter@palfrader.org-20080403173409-5p83lvwog8zjehy9]
add raff
---

diff --git a/checkcommands.cfg b/checkcommands.cfg
index c103bb3..806a2bc 100644
--- a/checkcommands.cfg
+++ b/checkcommands.cfg
@@ -6,3 +6,7 @@ define command{
 	command_name    dsa_check_cert
 	command_line    /usr/lib/nagios/plugins/check_http -H $HOSTADDRESS$ -p $ARG1$ -S -C 14
 }
+define command{
+	command_name    dsa_check_http_port
+	command_line    /usr/lib/nagios/plugins/check_http -H $HOSTADDRESS$ -I $HOSTADDRESS$ -p $ARG1$
+}
diff --git a/nagios-master.cfg b/nagios-master.cfg
index a71f180..ef2c682 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -32,6 +32,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
@@ -101,6 +105,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
@@ -284,6 +291,12 @@ services:
     hostgroups: computers
     excludehostgroups: postfix-hosts
     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'"
@@ -396,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
@@ -500,6 +519,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