fix zee gateway

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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 2e38c01..5707487 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -177,7 +177,7 @@ servers:
   samosa:
     address: 192.25.206.57
     parents: spohr
-    hostgroups: computers, service, dl380, lenny, hassrvfs, hasbootfs, acpid-hosts, ulogd-hosts
+    hostgroups: computers, service, dl380, lenny, hassrvfs, hasbootfs, acpid-hosts, ulogd-hosts, nfs-client
   raff:
     address: 192.25.206.59
     parents: spohr
@@ -289,6 +289,7 @@ servers:
     parents: gw-brainfood
     hostgroups: computers, general, dl380, acpid-hosts, lenny, buildd, hasbootfs, hassrvfs
 
+
   ries:
     address: 128.148.34.103
     parents: gw-brown.edu
@@ -314,6 +315,10 @@ servers:
     address: 140.211.166.44
     parents: rietz
     hostgroups: secondary-IPs
+  zee:
+    address: 140.211.166.16
+    parents: gw-osuosl
+    hostgroups: computers, porterbox, lenny, hassrvfs, hasbootfs
 
   villa:
     address: 212.211.132.32
@@ -479,6 +484,10 @@ servers:
     address: 137.82.84.70
     parents: gw-ubc
     hostgroups: computers, bl460, acpid-hosts, lenny
+  wolkenstein:
+    address: 137.82.84.89
+    parents: dijkstra
+    hostgroups: computers, lenny, hasbootfs, hassrvfs
   brahms:
     address: 137.82.84.74
     parents: dijkstra
@@ -499,6 +508,10 @@ servers:
     address: 137.82.84.79
     parents: gw-ubc
     hostgroups: computers, lenny, hasbootfs, nfs-client, hassrvfs, aacraid
+  morricone:
+    address: 137.82.84.81
+    parents: gw-ubc
+    hostgroups: computers, lenny, hasbootfs, hassrvfs, aacraid, postgres83-hosts, ftpd-hosts, rsyncd-hosts
   stabile:
     address: 137.82.84.72
     parents: gw-ubc
@@ -924,7 +937,7 @@ services:
  ####
   -
     name: puppet
-    nrpe: "/usr/lib/nagios/plugins/dsa-check-file_age -i 300 -f /var/lib/puppet/state/state.yaml"
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-file_age -i 540 -f /var/lib/puppet/state/state.yaml"
     hostgroups: lenny
     excludehosts: agnesi
 
@@ -1313,19 +1326,6 @@ services:
     hostgroups: postfix-hosts
     depends: process - postfix - master
 
-  -
-    name: process - postfix - smtpd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:40 -c 0:90 -u postfix -C smtpd -a 'smtpd -n smtp -t inet -u -c'"
-    hostgroups: postfix-hosts
-    excludehosts: liszt
-    depends: process - postfix - master
-  -
-    name: process - postfix - smtp
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:10 -c 0:15 -u postfix -C smtp -a 'smtp -t unix -u -c'"
-    hostgroups: postfix-hosts
-    excludehosts: liszt
-    depends: process - postfix - master
-
   -
     name: process - postfix - smtpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:150 -c 0:200 -u postfix -C smtpd -a 'smtpd -n smtp -t inet -u -c'"
@@ -1421,6 +1421,7 @@ services:
     name: unwanted process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
     hostgroups: computers
+    excludehosts: rietz
   -
     name: unwanted process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
@@ -1850,15 +1851,7 @@ services:
     hosts: global
   -
     name: mirror sync - security
-    check: "dsa_check_mirrorsync!security.debian.org!project/trace/security-master.debian.org"
-    hosts: global
-  -
-    name: mirror sync - security.eu
-    check: "dsa_check_mirrorsync!security.eu.debian.org!project/trace/security-master.debian.org"
-    hosts: global
-  -
-    name: mirror sync - security.us
-    check: "dsa_check_mirrorsync!security.us.debian.org!project/trace/security-master.debian.org"
+    check: "dsa_check_mirrorsync!security-nagios.debian.org!project/trace/security-master.debian.org"
     hosts: global
   -
     name: mirror sync - packages