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/git/dsa-nagios
[mirror/dsa-nagios.git]
/
config
/
nagios-master.cfg
diff --git
a/config/nagios-master.cfg
b/config/nagios-master.cfg
index
55859c1
..
353fbf2
100644
(file)
--- a/
config/nagios-master.cfg
+++ b/
config/nagios-master.cfg
@@
-27,6
+27,11
@@
servers:
parents: gw-HP-ftc
hostgroups: routing-infrastructure
contacts: joerg, bzed
parents: gw-HP-ftc
hostgroups: routing-infrastructure
contacts: joerg, bzed
+ gw-man-da2:
+ address: 82.195.75.46
+ parents: gw-man-da
+ hostgroups: routing-infrastructure
+ contacts: joerg, bzed
gw-HP-ftc:
address: 192.25.206.1
parents: spohr
gw-HP-ftc:
address: 192.25.206.1
parents: spohr
@@
-177,7
+182,7
@@
servers:
gluck:
address: 192.25.206.10
parents: spohr
gluck:
address: 192.25.206.10
parents: spohr
- hostgroups: computers, no-udev, general, dl380,
ulogd-hosts, lenny, hassrvfs
+ hostgroups: computers, no-udev, general, dl380,
lenny, hassrvfs, rsyncd-hosts, acpid-hosts, apache2-hosts, ftpd-hosts
merkel:
address: 192.25.206.16
parents: spohr
merkel:
address: 192.25.206.16
parents: spohr
@@
-227,8
+232,8
@@
servers:
# hostgroups: computers, porterbox, single-cpu, no-samhain, hasbootfs, hassrvfs, lenny, hasvarfs, hasusrfs
# contacts: bzed
sperger:
# hostgroups: computers, porterbox, single-cpu, no-samhain, hasbootfs, hassrvfs, lenny, hasvarfs, hasusrfs
# contacts: bzed
sperger:
- address: 82.195.75.
98
- parents: gw-man-da
+ address: 82.195.75.
34
+ parents: gw-man-da
2
hostgroups: computers, porterbox, sw-raid, hasbootfs, lenny
contacts: bzed
agricola:
hostgroups: computers, porterbox, sw-raid, hasbootfs, lenny
contacts: bzed
agricola:
@@
-385,7
+390,7
@@
servers:
verdi:
address: 192.54.42.193
parents: gw-lrz
verdi:
address: 192.54.42.193
parents: gw-lrz
- hostgroups: computers, service, apache2-hosts, ftpd-hosts,
rsyncd-hosts,
postgres81-hosts, postfix-hosts
+ hostgroups: computers, service, apache2-hosts, ftpd-hosts, postgres81-hosts, postfix-hosts
voltaire:
address: 72.66.115.54
voltaire:
address: 72.66.115.54
@@
-487,7
+492,7
@@
servers:
valente:
address: 137.82.84.76
parents: dijkstra
valente:
address: 137.82.84.76
parents: dijkstra
- hostgroups: computers, lenny, hasbootfs, single-cpu
+ hostgroups: computers, lenny, hasbootfs, single-cpu
, hassrvfs, postgres83-hosts, ftpd-hosts, rsyncd-hosts
bellini:
address: 137.82.84.79
parents: gw-ubc
bellini:
address: 137.82.84.79
parents: gw-ubc
@@
-833,7
+838,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: raff,
gluck,
saens, puccini, merkel, tartini, powell, piatti, escher
+ hosts: raff, saens, puccini, merkel, tartini, powell, piatti, escher
-
name: disk usage on /usr
servicegroups: diskspace
-
name: disk usage on /usr
servicegroups: diskspace
@@
-844,11
+849,6
@@
services:
servicegroups: diskspace
nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
hostgroups: hashomefs
servicegroups: diskspace
nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
hostgroups: hashomefs
- -
- name: disk usage on /home
- servicegroups: diskspace
- nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /home"
- hosts: gluck
-
name: disk usage on /mnt/hdc
servicegroups: diskspace
-
name: disk usage on /mnt/hdc
servicegroups: diskspace
@@
-1017,11
+1017,6
@@
services:
check: dsa_check_ssh_port!2260
hosts: agnesi
normal_check_interval: 180
check: dsa_check_ssh_port!2260
hosts: agnesi
normal_check_interval: 180
- -
- name: "network service - sshd - 443"
- check: dsa_check_ssh_port!443
- hosts: gluck
- normal_check_interval: 180
-
name: "network service - sshd - version"
-
name: "network service - sshd - version"
@@
-1133,17
+1128,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
, gluck
+ excludehosts: master, rietz, merkel
-
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
, gluck
+ excludehosts: master, rietz, merkel
-
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
, gluck
+ hosts: master, rietz, merkel
###
-
name: process - clamav - clamd
###
-
name: process - clamav - clamd
@@
-1555,13
+1550,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'"
-
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:
gluck,
zelenka, ancina, draghi
+ hosts: zelenka, ancina, draghi
hostgroups: rsyncd-hosts
-
name: unwanted process - xinetd
nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C xinetd"
hostgroups: computers
hostgroups: rsyncd-hosts
-
name: unwanted process - xinetd
nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C xinetd"
hostgroups: computers
- excludehosts:
gluck,
zelenka, ancina, draghi
+ excludehosts: zelenka, ancina, draghi
excludehostgroups: rsyncd-hosts
###
-
excludehostgroups: rsyncd-hosts
###
-
@@
-1854,10
+1849,6
@@
services:
hostgroups: nfs-server
# see if the nfs stuff works and doesn't hang.
# the df check all script will also hang, but we don't appear to pay attention to that
hostgroups: nfs-server
# see if the nfs stuff works and doesn't hang.
# the df check all script will also hang, but we don't appear to pay attention to that
- -
- name: nfs mount ftp archive
- nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /home/org/ftp.root/debian"
- hosts: gluck
-
name: nfs mount ftp archive
nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /org/mirrors/ftp.debian.org/ftp"
-
name: nfs mount ftp archive
nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /org/mirrors/ftp.debian.org/ftp"
@@
-1885,6
+1876,13
@@
services:
name: mirror sync - security.us
check: "dsa_check_mirrorsync!security.us.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"
hosts: global
+ -
+ name: mirror sync - packages
+ check: "dsa_check_mirrorsync!packages.debian.org!Pics/.trace"
+ hosts: global
+ normal_check_interval: 15
+ max_check_attempts: 5
+ retry_check_interval: 5
-
name: DNS SOA sync - security.geo.debian.org
check: "dsa_check_soas!security.geo.debian.org"
-
name: DNS SOA sync - security.geo.debian.org
check: "dsa_check_soas!security.geo.debian.org"