[project @ peter@palfrader.org-20081029110240-eyv9pxoj08lyhxpp]

[mirror/dsa-nagios.git] / nagios-master.cfg

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 4925cd1..96dba68 100644 (file)
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -140,6 +140,10 @@ servers:
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
     contacts: holger
+  gw-telefonica:
+    address: 195.71.99.193
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
 
   samosa:
     address: 192.25.206.57
@@ -155,7 +159,7 @@ servers:
   merkel:
     address: 192.25.206.16
     parents: samosa
-    hostgroups: computers, general, apache1-hosts, bind9-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim
+    hostgroups: computers, general, apache1-hosts, bind9-hosts, rsyncd-hosts, sw-raid, postgres81-hosts, heavy-exim, nfs-client, ulogd-hosts
   spohr:
     address: 192.25.206.33
     parents: samosa
@@ -314,6 +318,11 @@ servers:
     # SMP kernel doesn't run stable
     hostgroups: computers, buildd, sw-raid, single-cpu
     contacts: tjrc1
+  smetana:
+    address: 193.62.202.29
+    parents: gw-sanger
+    hostgroups: computers, porterbox, sw-raid
+    contacts: tjrc1
 
   verdi:
     address: 192.54.42.193
@@ -408,6 +417,11 @@ servers:
     hostgroups: computers, postfix-hosts, dl385, ulogd-hosts, acpid-hosts
     contacts: holger
 
+  rem:
+    address: 195.71.99.217
+    parents: gw-helsinki
+    hostgroups: computers, buildd
+
 #############################
 # host groups
 #
@@ -480,7 +494,7 @@ hostgroups:
     alias: hosts running postfix instead of exim
     private: 1
   heavy-exim:
-    alias: "hosts running the full mail stuff, including clamav, SA, and greylistd"
+    alias: "hosts running the full mail stuff, including clamav, SA, and postgrey"
     private: 1
   heavy-postfix:
     alias: "postfix hosts running the full mail stuff, including clamav, SA, postgrey, policyd-weight"
@@ -605,7 +619,7 @@ services:
     name: disk usage on /boot
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /boot"
-    hosts: sperger, rietz, steffani, penalosa, peri, albeniz, goetz, mayer, mayr, paer, spontini, tartini, morales, ravel, schroeder, piatti
+    hosts: sperger, rietz, steffani, penalosa, peri, albeniz, goetz, mayer, mayr, paer, spontini, tartini, morales, ravel, schroeder, piatti, rem
   -
     name: disk usage on /var
     servicegroups: diskspace
@@ -645,7 +659,7 @@ services:
     name: disk usage on /home
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
-    hosts: raptor, voltaire, lebrun
+    hosts: raptor, voltaire, lebrun, rem
   -
     name: disk usage on /home
     servicegroups: diskspace
@@ -813,7 +827,7 @@ services:
     normal_check_interval:  360
   -
     name: "network service - sshd - version"
-    check: "dsa_check_ssh_port_version!22!OpenSSH_5.1p1 Debian-2"
+    check: "dsa_check_ssh_port_version!22!OpenSSH_5.1p1 Debian-3"
     depends: network service - sshd
     hostgroups: lenny
     normal_check_interval:  360
@@ -998,18 +1012,21 @@ services:
     hosts: merkel, raff
 
  ###
-  -
-    name: process - greylistd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u greylist -C greylistd -a '/usr/bin/python /usr/sbin/greylistd'"
-    hostgroups: heavy-exim
+  #-
+  #  name: process - greylistd
+  #  nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u greylist -C greylistd -a '/usr/bin/python /usr/sbin/greylistd'"
+  #  hostgroups: heavy-exim
   #
   -
     name: unwanted process - greylistd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C greylistd"
     hostgroups: computers
-    excludehostgroups: heavy-exim
 
  ###
+  -
+    name: process - postgrey
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -C postgrey -a '/usr/sbin/postgrey --pidfile=/var/run/postgrey.pid --daemonize --unix=/var/run/postgrey/socket --retry-window=4 --auto-whitelist-clients=10 --exim'"
+    hostgroups: heavy-exim
   -
     name: process - postgrey
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgrey -C postgrey -a '/usr/sbin/postgrey --pidfile=/var/run/postgrey.pid --daemonize --inet=127.0.0.1:60000'"
@@ -1019,7 +1036,7 @@ services:
     name: unwanted process - postgrey
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C postgrey"
     hostgroups: computers
-    excludehostgroups: heavy-postfix
+    excludehostgroups: heavy-postfix, heavy-exim
  ###
   -
     name: process - amavis - master
@@ -1337,13 +1354,13 @@ services:
   -
     name: process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xinetd -a '/usr/sbin/xinetd -pidfile /var/run/xinetd.pid -stayalive'"
-    hosts: samosa, raptor, allegri
+    hosts: samosa, raptor, allegri, gluck
     hostgroups: rsyncd-hosts
   -
     name: unwanted process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C xinetd"
     hostgroups: computers
-    excludehosts: samosa, raptor, allegri
+    excludehosts: samosa, raptor, allegri, gluck
     excludehostgroups: rsyncd-hosts
  ###
   -