projects
/
mirror
/
dsa-nagios.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://db.debian.org/org/db.debian.org/git/dsa-nagios
[mirror/dsa-nagios.git]
/
config
/
nagios-master.cfg
diff --git
a/config/nagios-master.cfg
b/config/nagios-master.cfg
index
f76d138
..
5ece35c
100644
(file)
--- a/
config/nagios-master.cfg
+++ b/
config/nagios-master.cfg
@@
-307,14
+307,10
@@
servers:
address: 140.211.166.58
parents: gw-osuosl
hostgroups: computers, buildd, hasbootfs, ulogd-hosts
address: 140.211.166.58
parents: gw-osuosl
hostgroups: computers, buildd, hasbootfs, ulogd-hosts
- malo:
- address: 140.211.166.27
- parents: gw-osuosl
- hostgroups: computers, buildd, smart
rietz:
address: 140.211.166.43
parents: gw-osuosl
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
rietz2:
address: 140.211.166.44
parents: rietz
@@
-322,7
+318,7
@@
servers:
busoni:
address: 140.211.15.34
parents: gw-osuosl
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
zee:
address: 140.211.166.16
parents: gw-osuosl
@@
-381,7
+377,7
@@
servers:
widor:
address: 93.94.130.161
parents: gw-dg-i.net
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:
contacts: bzed
pergolesi:
@@
-507,7
+503,7
@@
servers:
hostgroups: computers, bl460, acpid-hosts, ulogd-hosts
tchaikovsky:
address: 206.12.19.118
hostgroups: computers, bl460, acpid-hosts, ulogd-hosts
tchaikovsky:
address: 206.12.19.118
- hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, single-cpu
+ hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, single-cpu
, ulogd-hosts
wolkenstein:
address: 206.12.19.116
parents: dijkstra
wolkenstein:
address: 206.12.19.116
parents: dijkstra
@@
-543,11
+539,11
@@
servers:
cimarosa:
address: 206.12.19.8
parents: gw-ubc
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
paganini:
address: 206.12.19.10
parents: tchaikovsky
- hostgroups: computers, hasbootfs, aacraid, hassrvfs, xinetd-hosts
+ hostgroups: computers, hasbootfs, aacraid, hassrvfs, xinetd-hosts
, nfs-client
respighi:
address: 206.12.19.11
parents: gw-ubc
respighi:
address: 206.12.19.11
parents: gw-ubc
@@
-572,6
+568,14
@@
servers:
address: 206.12.19.111
parents: luchesi
hostgroups: computers, freebsd, squeeze
address: 206.12.19.111
parents: luchesi
hostgroups: computers, freebsd, squeeze
+ gabrielli:
+ address: 206.12.19.17
+ parents: tchaikovsky
+ hostgroups: computers, single-cpu
+ corelli:
+ address: 206.12.19.16
+ parents: tchaikovsky
+ hostgroups: computers, single-cpu, buildd, ulogd-hosts
lebrun:
address: 193.198.184.10
lebrun:
address: 193.198.184.10
@@
-580,7
+584,7
@@
servers:
schroeder:
address: 193.198.184.11
parents: gw-carnet
schroeder:
address: 193.198.184.11
parents: gw-carnet
- hostgroups: computers, buildd, sw-raid, has
bootfs, hasorg
fs
+ hostgroups: computers, buildd, sw-raid, has
srv
fs
tartini:
address: 82.94.249.158
tartini:
address: 82.94.249.158
@@
-607,10
+611,6
@@
servers:
parents: gw-HP-ftc
hostgroups: computers, buildd, hassrvfs, ulogd-hosts
parents: gw-HP-ftc
hostgroups: computers, buildd, hassrvfs, ulogd-hosts
- escher:
- address: 213.188.99.215
- parents: gw-cst
- hostgroups: computers, single-cpu, hasbootfs, hasvarfs, hashomefs
goedel:
address: 213.188.99.214
parents: gw-cst
goedel:
address: 213.188.99.214
parents: gw-cst
@@
-628,7
+628,7
@@
servers:
pettersson:
address: 130.239.18.123
parents: gw-aca
pettersson:
address: 130.239.18.123
parents: gw-aca
- hostgroups: computers, hasbootfs, aacraid
+ hostgroups: computers, hasbootfs, aacraid
, nfs-client
lafayette:
address: 147.215.7.160
lafayette:
address: 147.215.7.160
@@
-638,7
+638,7
@@
servers:
grieg:
address: 194.177.211.200
parents: gw-grnet
grieg:
address: 194.177.211.200
parents: gw-grnet
- hostgroups: computers, a
cpid-hosts, megaraid
+ hostgroups: computers, a
pache2-hosts, acpid-hosts, megaraid, heavy-exim, postgres84-hosts
rautavaara:
address: 194.177.211.199
parents: gw-grnet
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
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?
#############################
#############################
@@
-980,7
+994,7
@@
services:
name: disk usage on /tmp
servicegroups: diskspace
nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
name: disk usage on /tmp
servicegroups: diskspace
nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
- hosts: saens, puccini, merkel, tartini, powell, piatti
, escher
+ hosts: saens, puccini, merkel, tartini, powell, piatti
-
name: disk usage on /usr
servicegroups: diskspace
-
name: disk usage on /usr
servicegroups: diskspace
@@
-1118,11
+1132,6
@@
services:
name: load
nrpe: "/usr/lib/nagios/plugins/check_load -w 140,120,100 -c 240,220,200"
hostgroups: highload
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: processes - zombies
####
-
name: processes - zombies
@@
-1251,17
+1260,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
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, byrd
-
name: process - exim - total
nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1: -C exim4"
hostgroups: computers
excludehostgroups: postfix-hosts
-
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, byrd
-
name: process - exim
nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:300 -c 1:500 -C exim4 -a '/usr/sbin/exim4'"
-
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, byrd
###
-
name: process - clamav - clamd
###
-
name: process - clamav - clamd
@@
-1309,18
+1318,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 '"
-
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'"
-
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
#
-
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
+1539,7
@@
services:
name: unwanted process - inetd
nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C inetd"
hostgroups: computers
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"
-
name: unwanted process - snmpd
nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
@@
-1699,12
+1708,12
@@
services:
hosts: draghi
depends: process - xinetd
###
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
-
name: network service - rsync
check: check_tcp!873
@@
-1758,7
+1767,7
@@
services:
-
name: network service - https
check: check_https
-
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
-
depends: "process - apache2 - master"
normal_check_interval: 120
-
@@
-1772,7
+1781,7
@@
services:
# merkel2 nm.debian.org
# liszt lists.debian.org
# cimarosa buildd.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
+ hosts: ries, chopin, spohr, tchaikovsky, draghi, merkel2, liszt, widor,
grieg
depends: network service - https
normal_check_interval: 60
depends: network service - https
normal_check_interval: 60