From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 3 Apr 2008 21:26:35 +0000 (-0400)
Subject: [project @ peter@palfrader.org-20080403212635-7grde8gkcjzzkyzv]
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;ds=sidebyside;h=5bd55f5ecdd165e25fd9bea70762768f1f797c6f;p=mirror%2Fdsa-nagios.git

[project @ peter@palfrader.org-20080403212635-7grde8gkcjzzkyzv]
Add gluck, change apache1 limits, add smtp checks
---

diff --git a/nagios-master.cfg b/nagios-master.cfg
index f0242a0..cc8bbde 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -53,6 +53,10 @@ servers:
     address: 192.25.206.59
     parents: samosa
     hostgroups: computers, dl380, apache1-hosts, bind9-hosts, rsyncd-hosts
+  gluck:
+    address: 192.25.206.10
+    parents: samosa
+    hostgroups: computers, dl380, apache1-hosts, bind9-hosts, rsyncd-hosts
 
   bartok:
     address: 82.195.75.91
@@ -434,6 +438,19 @@ services:
     depends: process - postfix - master
 
 
+ ###
+  -
+    name: network service - smtp
+    check: check_smtp
+    hostgroups: postfix-hosts
+    depends: process - postfix - master
+  -
+    name: network service - smtp
+    check: check_smtp
+    hostgroups: computers
+    excludehostgroups: postfix-hosts
+    depends: process - exim
+
 
  ###
   -
@@ -557,7 +574,7 @@ services:
     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"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:75 -c 1:150 -u www-data -C apache -a /usr/sbin/apache"
     hostgroups: apache1-hosts
     depends: process - apache - master
   -