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
e90c27a
..
d19d2e7
100644
(file)
--- a/
config/nagios-master.cfg
+++ b/
config/nagios-master.cfg
@@
-160,6
+160,10
@@
servers:
address: 147.215.2.249
parents: gw-HP-ftc
hostgroups: routing-infrastructure
address: 147.215.2.249
parents: gw-HP-ftc
hostgroups: routing-infrastructure
+ gw-ghent:
+ address: 193.191.17.50
+ parents: gw-HP-ftc
+ hostgroups: routing-infrastructure
global:
hostgroups: notacomputer
global:
hostgroups: notacomputer
@@
-220,7
+224,7
@@
servers:
morales:
address: 82.195.75.97
parents: gw-man-da
morales:
address: 82.195.75.97
parents: gw-man-da
- hostgroups: computers, porterbox, single-cpu, no-samhain, hasbootfs, hassrvfs
+ hostgroups: computers, porterbox, single-cpu, no-samhain, hasbootfs, hassrvfs
, lenny, puppet
contacts: bzed
sperger:
address: 82.195.75.98
contacts: bzed
sperger:
address: 82.195.75.98
@@
-420,16
+424,6
@@
servers:
parents: gw-xandros
hostgroups: deadslow
parents: gw-xandros
hostgroups: deadslow
- kullervo:
- address: 217.114.76.82
- parents: gw-nmmn
- hostgroups: deadslow
- contacts: luk
- crest:
- address: 217.114.76.83
- parents: gw-nmmn
- hostgroups: deadslow
- contacts: luk
pescetti:
address: 217.114.76.85
parents: gw-nmmn
pescetti:
address: 217.114.76.85
parents: gw-nmmn
@@
-454,9
+448,14
@@
servers:
allegri:
address: 157.193.39.233
allegri:
address: 157.193.39.233
- parents: gw-
HP-ftc
+ parents: gw-
ghent
hostgroups: computers, buildd, postfix-hosts, sw-raid, single-cpu, lenny, puppet, hassrvfs
contacts: luk
hostgroups: computers, buildd, postfix-hosts, sw-raid, single-cpu, lenny, puppet, hassrvfs
contacts: luk
+ ancina:
+ address: 157.193.39.13
+ parents: gw-ghent
+ hostgroups: computers, buildd, single-cpu, lenny, puppet, hassrvfs, hasbootfs, incomingmailrelayed2025
+ contacts: luk
agnesi:
address: 65.173.90.83
agnesi:
address: 65.173.90.83
@@
-497,7
+496,7
@@
servers:
tartini:
address: 82.94.249.158
parents: gw-telegraaf
tartini:
address: 82.94.249.158
parents: gw-telegraaf
- hostgroups: computers, sw-raid, apache2-hosts, mysql-hosts, hasbootfs, hassrvfs
+ hostgroups: computers, sw-raid, apache2-hosts, mysql-hosts, hasbootfs, hassrvfs
, ulogd-hosts
piatti:
address: 193.167.161.225
piatti:
address: 193.167.161.225
@@
-542,7
+541,7
@@
servers:
lafayette:
address: 147.215.7.160
parents: gw-esiee
lafayette:
address: 147.215.7.160
parents: gw-esiee
- hostgroups: computers, buildd, lenny, puppet, sw-raid, hassrvfs, hasbootfs
+ hostgroups: computers, buildd, lenny, puppet, sw-raid, hassrvfs, hasbootfs
, incomingmailrelayed
#############################
# host groups
#############################
# host groups
@@
-699,6
+698,14
@@
hostgroups:
alias: hosts with a /srv
private: 1
alias: hosts with a /srv
private: 1
+ incomingmailrelayed:
+ alias: incoming mail needs to go through a mail relay
+ # i.e. no port 25
+ private: 1
+ incomingmailrelayed2025:
+ alias: incoming mail needs to go through a mail relay
+ # i.e. no port 25
+ private: 1
#############################
# servicegroups
#############################
# servicegroups
@@
-971,15
+978,8
@@
services:
check: "dsa_check_ssh_port_version!22!OpenSSH_4.3p2 Debian-9etch3"
depends: network service - sshd
hostgroups: computers, deadslow
check: "dsa_check_ssh_port_version!22!OpenSSH_4.3p2 Debian-9etch3"
depends: network service - sshd
hostgroups: computers, deadslow
- excludehosts: crest, kullervo
excludehostgroups: lenny
normal_check_interval: 60
excludehostgroups: lenny
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: 60
-
name: "network service - sshd - version"
check: "dsa_check_ssh_port_version!22!OpenSSH_5.1p1 Debian-5"
-
name: "network service - sshd - version"
check: "dsa_check_ssh_port_version!22!OpenSSH_5.1p1 Debian-5"
@@
-1036,12
+1036,12
@@
services:
check: dsa_check_ntp
hostgroups: computers
depends: process - ntpd
check: dsa_check_ntp
hostgroups: computers
depends: process - ntpd
- excludehosts: allegri, zelenka
+ excludehosts: allegri, zelenka
, ancina
#
-
name: network service - time
check: dsa_check_time
#
-
name: network service - time
check: dsa_check_time
- hosts: allegri, zelenka
+ hosts: allegri, zelenka
, ancina
depends: process - xinetd
###
depends: process - xinetd
###
@@
-1309,8
+1309,7
@@
services:
name: network service - smtp
check: dsa_check_smtp
hostgroups: computers
name: network service - smtp
check: dsa_check_smtp
hostgroups: computers
- excludehostgroups: postfix-hosts
- excludehosts: lafayette
+ excludehostgroups: postfix-hosts, incomingmailrelayed, incomingmailrelayed2025
depends: process - exim
-
depends: process - exim
-
@@
-1322,7
+1321,12
@@
services:
-
name: network service - submission
check: dsa_check_smtp_port!587
-
name: network service - submission
check: dsa_check_smtp_port!587
- hosts: lafayette
+ hostgroups: incomingmailrelayed
+ depends: process - exim
+ -
+ name: network service - smtp 2025
+ check: dsa_check_smtp_port!2025
+ hostgroups: incomingmailrelayed2025
depends: process - exim
-
name: network service - smtp - port 2025
depends: process - exim
-
name: network service - smtp - port 2025
@@
-1420,6
+1424,12
@@
services:
nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-sw"
hostgroups: sw-raid
nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-sw"
hostgroups: sw-raid
+ ###
+ -
+ name: process - monit
+ nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C monit -a '/usr/sbin/monit -d 300 -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
+ hostgroups: lenny
+ excludehosts: agnesi
###
-
name: process - cpqarrayd
###
-
name: process - cpqarrayd
@@
-1502,13
+1512,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: samosa, allegri, gluck, zelenka
+ hosts: samosa, allegri, gluck, zelenka
, ancina
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: samosa, allegri, gluck, zelenka
+ excludehosts: samosa, allegri, gluck, zelenka
, ancina
excludehostgroups: rsyncd-hosts
###
-
excludehostgroups: rsyncd-hosts
###
-