X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=nagios-master.cfg;h=53a2c20593a994ad0a2646b6f1f227fbaca25bc7;hb=363f9dbade0e4ef56c4f443b9887373ef3de7ab2;hp=1cd76836250f59ef3ba42140e550532229da6c71;hpb=1494edc65963ffbd510d901b652af1cc37d5ffc9;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 1cd7683..53a2c20 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -271,7 +271,7 @@ servers:
   mahler:
     address: 128.31.0.46
     parents: gw-mit-csail
-    hostgroups: computers, single-cpu, lenny, porterbox
+    hostgroups: computers, single-cpu, lenny, porterbox, rsyslog-hosts
 
   klecker:
     address: 194.109.137.218
@@ -306,7 +306,8 @@ servers:
   albeniz:
     address: 193.62.202.27
     parents: gw-sanger
-    hostgroups: computers, porterbox, sw-raid
+    # SMP kernel doesn't run stable
+    hostgroups: computers, porterbox, sw-raid, single-cpu
     contacts: tjrc1
   goetz:
     address: 193.62.202.26
@@ -460,6 +461,9 @@ hostgroups:
   syslog-ng-hosts:
     alias: hosts running syslog-ng instead of sysklogd
     private: 1
+  rsyslog-hosts:
+    alias: hosts running rsyslogd instead of sysklogd
+    private: 1
   postfix-hosts:
     alias: hosts running postfix instead of exim
     private: 1
@@ -833,17 +837,22 @@ services:
     name: process - syslog-ng
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
     hostgroups: syslog-ng-hosts
+ ###
+  -
+    name: process - rsyslogd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C rsyslogd  -a '/usr/sbin/rsyslogd -c3'"
+    hostgroups: rsyslog-hosts
  ###
   -
     name: process - syslogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslogd  -a '/sbin/syslogd'"
     hostgroups: computers
-    excludehostgroups: syslog-ng-hosts
+    excludehostgroups: syslog-ng-hosts, rsyslog-hosts
   -
     name: process - klogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C klogd  -a '/sbin/klogd -x'"
     hostgroups: computers
-    excludehostgroups: syslog-ng-hosts
+    excludehostgroups: syslog-ng-hosts, rsyslog-hosts
 
  ### MAIL STUFF
  ###