Try a different gw-cst

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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index b8e2b22..a8ee1ba 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -141,7 +141,7 @@ servers:
     parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-cst:
-    address: 213.157.2.210
+    address: 213.157.2.23
     parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-isc:
@@ -271,10 +271,6 @@ servers:
     address: 82.195.75.107
     parents: unger
     hostgroups: computers, service, hasbootfs, apache2-hosts, single-cpu, rsyncd-hosts, kvmdomains, xinetd-hosts
-  byrd:
-    address: 82.195.75.101
-    parents: unger
-    hostgroups: computers, service, hasbootfs, hassrvfs, postgres84-hosts, heavy-exim, kvmdomains
   ball:
     address: 82.195.75.70
     parents: gw-man-da
@@ -310,7 +306,7 @@ servers:
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
-    hostgroups: computers, no-udev, service, apache2-hosts, bind9-hosts, rsyncd-hosts, dl385, heavy-exim, highload, hasbootfs, etch, xinetd-hosts
+    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts
   rietz2:
     address: 140.211.166.44
     parents: rietz
@@ -318,7 +314,7 @@ servers:
   busoni:
     address: 140.211.15.34
     parents: gw-osuosl
-    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim
+    hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres84-hosts
   zee:
     address: 140.211.166.16
     parents: gw-osuosl
@@ -377,7 +373,7 @@ servers:
   widor:
     address: 93.94.130.161
     parents: gw-dg-i.net
-    hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs, heavy-exim
+    hostgroups: computers, apache2-hosts, sw-raid, acpid-hosts, hasorgfs
     contacts: bzed
 
   pergolesi:
@@ -539,7 +535,7 @@ servers:
   cimarosa:
     address: 206.12.19.8
     parents: gw-ubc
-    hostgroups: computers, hasbootfs, aacraid, hassrvfs, nfs-client, heavy-exim, apache2-hosts
+    hostgroups: computers, hasbootfs, aacraid, hassrvfs, nfs-client, apache2-hosts
   paganini:
     address: 206.12.19.10
     parents: tchaikovsky
@@ -575,7 +571,11 @@ servers:
   corelli:
     address: 206.12.19.16
     parents: tchaikovsky
-    hostgroups: computers, single-cpu, buildd 
+    hostgroups: computers, single-cpu, buildd, ulogd-hosts
+  lucatelli:
+    address: 206.12.19.15
+    parents: tchaikovsky
+    hostgroups: computers, single-cpu, buildd, ulogd-hosts
 
   lebrun:
     address: 193.198.184.10
@@ -628,7 +628,7 @@ servers:
   pettersson:
     address: 130.239.18.123
     parents: gw-aca
-    hostgroups: computers, hasbootfs, aacraid
+    hostgroups: computers, hasbootfs, aacraid, nfs-client, acpid-hosts
 
   lafayette:
     address: 147.215.7.160
@@ -638,7 +638,7 @@ servers:
   grieg:
     address: 194.177.211.200
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, megaraid
+    hostgroups: computers, apache2-hosts, acpid-hosts, megaraid, heavy-exim, postgres84-hosts
   rautavaara:
     address: 194.177.211.199
     parents: gw-grnet
@@ -690,6 +690,20 @@ servers:
     address: 86.59.118.146
     parents: gw-sil
     hostgroups: computers, hasbootfs, aacraid, ulogd-hosts
+  merikanto:
+    address: 86.59.118.147
+    parents: gw-sil
+    hostgroups: computers, dl360, acpid-hosts, spamd, heavy-exim
+  englund:
+    address: 86.59.118.148
+    parents: gw-sil
+    hostgroups: computers, acpid-hosts
+    # which raid?
+  lindberg:
+    address: 86.59.118.149
+    parents: gw-sil
+    hostgroups: computers, acpid-hosts
+    # which raid?
 
 
 #############################
@@ -1005,7 +1019,13 @@ services:
     name: disk usage on /var/lib/postgresql
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/lib/postgresql"
-    hosts: samosa, stabile, sibelius
+    hosts: samosa, stabile, sibelius, busoni
+
+  -
+    name: disk usage on /var/log
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var/log"
+    hosts: busoni
 
   -
     name: disk usage on /srv/morgue.debian.org
@@ -1118,11 +1138,11 @@ services:
     name: load
     nrpe: "/usr/lib/nagios/plugins/check_load -w 140,120,100 -c 240,220,200"
     hostgroups: highload
-    excludehosts: rietz
+ ####
   -
-    name: load
-    nrpe: "/usr/lib/nagios/plugins/check_load -w 200,200,200 -c 350,350,350"
-    hosts: rietz
+    name: uptime check
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-uptime"
+    hostgroups: computers
  ####
   -
     name: processes - zombies
@@ -1251,17 +1271,17 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u Debian-exim -C exim4 -a '/usr/sbin/exim4 -bd -q'"
     hostgroups: computers
     excludehostgroups: postfix-hosts
-    excludehosts: master, rietz, merkel, byrd
+    excludehosts: master, busoni, merkel
   -
     name: process - exim - total
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1: -C exim4"
     hostgroups: computers
     excludehostgroups: postfix-hosts
-    excludehosts: master, rietz, merkel, byrd
+    excludehosts: master, busoni, merkel
   -
     name: process - exim
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:300 -c 1:500 -C exim4 -a '/usr/sbin/exim4'"
-    hosts: master, rietz, merkel, byrd
+    hosts: master, busoni, merkel
  ###
   -
     name: process - clamav - clamd
@@ -1309,18 +1329,18 @@ services:
   -
     name: process - spamd - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u debbugs -C spamd -a '/usr/sbin/spamd -d '"
-    hosts: rietz
+    hosts: busoni
   -
     name: process - spamd - child
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:6 -c 1: -u debbugs -C spamd -a 'spamd child'"
-    hosts: rietz
+    hosts: busoni
   #
   -
     name: unwanted process - spamd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C spamd"
     hostgroups: computers
     excludehostgroups: spamd
-    excludehosts: liszt, rietz
+    excludehosts: liszt, busoni
 
  ###
   #-
@@ -1530,7 +1550,7 @@ services:
     name: unwanted process - inetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
     hostgroups: computers
-    excludehosts: rietz, grieg
+    excludehosts: grieg
   -
     name: unwanted process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
@@ -1699,12 +1719,12 @@ services:
     hosts: draghi
     depends: process - xinetd
  ###
-  -
-    name: network service - rsync
-    check: check_tcp!873
-    hostgroups: rsyncd-hosts
-    depends: process - xinetd
-
+#  -
+#    name: network service - rsync
+#    check: check_tcp!873
+#    hostgroups: rsyncd-hosts
+#    depends: process - xinetd
+#
   -
     name: network service - rsync
     check: check_tcp!873
@@ -1758,7 +1778,7 @@ services:
   -
     name: network service - https
     check: check_https
-    hosts: ries, chopin, draghi, liszt, spohr, widor, rietz, tchaikovsky, cimarosa
+    hosts: ries, chopin, draghi, liszt, spohr, widor, tchaikovsky, grieg
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
@@ -1771,8 +1791,8 @@ services:
     # draghi           db.debian.org
     # merkel2          nm.debian.org
     # liszt            lists.debian.org
-    # cimarosa         buildd.debian.org
-    hosts: ries, chopin, spohr, tchaikovsky, draghi, merkel2, liszt, widor, rietz, cimarosa
+    # grieg            buildd.debian.org
+    hosts: ries, chopin, spohr, tchaikovsky, draghi, merkel2, liszt, widor, grieg
     depends: network service - https
     normal_check_interval: 60
 
@@ -1923,7 +1943,7 @@ services:
   -
     name: process - buildd
     servicegroups: buildd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -u buildd -C buildd -a '/usr/bin/buildd'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:5 -u buildd -C buildd -a '/usr/bin/buildd'"
     hostgroups: buildd
     contacts: luk, pkern, HE