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

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 67a67be..53a2c20 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -268,10 +268,10 @@ servers:
     address: 128.31.0.36
     parents: gw-mit-csail
     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, sw-raid, bind9-hosts
-  casals:
-    address: 128.31.0.16
+  mahler:
+    address: 128.31.0.46
     parents: gw-mit-csail
-    hostgroups: deadslow
+    hostgroups: computers, single-cpu, lenny, porterbox, rsyslog-hosts
 
   klecker:
     address: 194.109.137.218
@@ -306,12 +306,14 @@ 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
     parents: gw-sanger
-    hostgroups: computers, buildd, sw-raid
+    # SMP kernel doesn't run stable
+    hostgroups: computers, buildd, sw-raid, single-cpu
     contacts: tjrc1
 
   verdi:
@@ -459,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
@@ -580,7 +585,7 @@ services:
     name: disk usage on /org
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
-    hosts: sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, puccini, spontini, ravel
+    hosts: sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, puccini, spontini, ravel, mahler
   -
     name: disk usage on /org
     servicegroups: diskspace
@@ -755,7 +760,7 @@ services:
     normal_check_interval:  360
   -
     name: "network service - sshd - version"
-    check: "dsa_check_ssh_port_version!22!OpenSSH_4.7p1 Debian-12"
+    check: "dsa_check_ssh_port_version!22!OpenSSH_5.1p1 Debian-2"
     depends: network service - sshd
     hostgroups: lenny
     normal_check_interval:  360
@@ -832,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
  ###
@@ -1400,19 +1410,19 @@ services:
     depends: process - mysql - master
 
  ####
-  -
-    name: process - xenconsoled
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xenconsoled -a 'xenconsoled'"
-    hosts: piatti
-  -
-    name: process - xenstored
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xenstored -a '/usr/lib/xen-3.0.3-1/bin/xenstored --pid-file /var/run/xenstore.pid'"
-    hosts: piatti
-  -
-    name: process - xend
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:2 -c 2: -u root -C python -a 'python /usr/lib/xen-3.0.3-1/bin/xend start'"
-    hosts: piatti
-
+  #-
+  #  name: process - xenconsoled
+  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xenconsoled -a 'xenconsoled'"
+  #  hosts: piatti
+  #-
+  #  name: process - xenstored
+  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xenstored -a '/usr/lib/xen-3.0.3-1/bin/xenstored --pid-file /var/run/xenstore.pid'"
+  #  hosts: piatti
+  #-
+  #  name: process - xend
+  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:2 -c 2: -u root -C python -a 'python /usr/lib/xen-3.0.3-1/bin/xend start'"
+  #  hosts: piatti
+#
  ####
   # XXX is this needed?
   -