X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=eb56474fda579107777b4e454a5266ada540ae9f;hb=f8a07ee22a749cd23a0ae76447400d10f3d6c36f;hp=eb003808440cd1e83727dc28f922ab5858a0ab24;hpb=152895300807903d1efb138b7d4d5ee769915633;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index eb00380..eb56474 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -153,7 +153,11 @@ servers:
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
   gw-isc:
-    address: 149.20.20.1 
+    address: 149.20.20.1
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
+  gw-aca:
+    address: 130.239.18.97
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
 
@@ -164,7 +168,7 @@ servers:
 
   samosa:
     address: 192.25.206.57
-    hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, heavy-exim, lenny
+    hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, heavy-exim, lenny, puppet
   raff:
     address: 192.25.206.59
     parents: samosa
@@ -255,7 +259,7 @@ servers:
   murphy:
     address: 70.103.162.31
     parents: gw-brainfood
-    hostgroups: computers, general, postfix-hosts, dl380, acpid-hosts, lenny
+    hostgroups: computers, general, postfix-hosts, dl380, acpid-hosts, lenny, puppet
 
   ries:
     address: 128.148.34.103
@@ -273,7 +277,7 @@ servers:
   malo:
     address: 140.211.166.27
     parents: gw-osuosl
-    hostgroups: computers, buildd, lenny, puppet
+    hostgroups: computers, buildd, lenny, puppet, smart
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
@@ -304,7 +308,7 @@ servers:
   klecker:
     address: 194.109.137.218
     parents: gw-xs4all
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, bind9-hosts, dl385, postgres83-hosts, heavy-exim
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, bind9-hosts, dl385, postgres83-hosts, heavy-exim, lenny, puppet
 
   saens:
     address: 128.101.240.212
@@ -326,7 +330,7 @@ servers:
   pergolesi:
     address: 62.104.23.252
     parents: gw-freenet
-    hostgroups: computers, no-udev, porterbox, sw-raid, lenny, puppet
+    hostgroups: computers, porterbox, sw-raid, lenny, puppet
   bruckner:
     address: 62.104.23.253
     parents: gw-freenet
@@ -335,7 +339,7 @@ servers:
   raptor:
     address: 195.243.109.162
     parents: gw-topalis
-    hostgroups: computers, porterbox, postfix-hosts
+    hostgroups: computers, porterbox, postfix-hosts, lenny
 
   albeniz:
     address: 193.62.202.27
@@ -380,7 +384,7 @@ servers:
   schumann:
     address: 212.227.126.54
     parents: gw-1und1-karlsruhe
-    hostgroups: computers, acpid-hosts, ulogd-hosts, lenny
+    hostgroups: computers, acpid-hosts, ulogd-hosts, lenny, puppet
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-karlsruhe
@@ -418,7 +422,7 @@ servers:
   kassia:
     address: 130.89.149.224
     parents: gw-utwente
-    hostgroups: computers, service, postfix-hosts, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360, acpid-hosts, ulogd-hosts, lenny
+    hostgroups: computers, service, postfix-hosts, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl360, acpid-hosts, ulogd-hosts, lenny, puppet
   kassia-sec:
     address: 130.89.149.225
     parents: kassia
@@ -435,7 +439,7 @@ servers:
   allegri:
     address: 157.193.39.233
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, postfix-hosts, sw-raid, single-cpu, lenny
+    hostgroups: computers, buildd, postfix-hosts, sw-raid, single-cpu, lenny, puppet
     contacts: luk
 
   agnesi:
@@ -502,6 +506,11 @@ servers:
     parents: gw-isc
     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, lenny, rsyslog-hosts, puppet, dl360
 
+  praetorius:
+    address: 130.239.18.121
+    parents: gw-aca
+    hostgroups: computers, buildd, rsyslog-hosts, lenny, puppet
+
 #############################
 # host groups
 #
@@ -709,12 +718,12 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /"
     hostgroups: computers
-    excludehosts: ries
+    excludehosts: ries, klecker
   -
     name: disk usage on /
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /"
-    hosts: ries
+    hosts: ries, klecker
   -
     name: disk usage on /boot
     servicegroups: diskspace
@@ -844,7 +853,7 @@ services:
     hostgroups: computers
     excludehostgroups: no-samhain
     depends: process - samhain
-    normal_check_interval: 240
+    normal_check_interval: 60
     retry_check_interval: 5
 
  ####
@@ -930,32 +939,32 @@ services:
     hostgroups: computers, deadslow
     excludehosts: agnesi, crest, kullervo
     excludehostgroups: lenny
-    normal_check_interval:  360
+    normal_check_interval:  60
   -
     name: "network service - sshd - version"
     check: "dsa_check_ssh_port_version!22!OpenSSH_4.3p2 Debian-9etch2+m68k1"
     depends: network service - sshd
     hosts: crest, kullervo
-    normal_check_interval:  360
+    normal_check_interval:  60
   -
     name: "network service - sshd - version"
     check: "dsa_check_ssh_port_version!22!OpenSSH_5.1p1 Debian-5"
     depends: network service - sshd
     hostgroups: lenny
-    normal_check_interval:  360
+    normal_check_interval:  60
   -
     name: "network service - sshd - version - 2260"
     check: "dsa_check_ssh_port_version!2260!OpenSSH_4.3p2 Debian-9etch3"
     depends: network service - sshd - 2260
     hosts: agnesi
-    normal_check_interval:  360
+    normal_check_interval:  60
  #
   -
     name: ssh - weak keys
     servicegroups: weaksshkeys
     nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/weak-ssh-keys"
     hostgroups: computers
-    normal_check_interval:  360
+    normal_check_interval:  60
  ####
   -
     name: network service - nrpe
@@ -1554,7 +1563,7 @@ services:
     check: dsa_check_cert!443
     hosts: samosa, ries
     depends: network service - https
-    normal_check_interval: 240
+    normal_check_interval: 60
  ####
   -
     name: process - named