projects
/
mirror
/
dsa-nagios.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
morales on lenny and has puppet
[mirror/dsa-nagios.git]
/
config
/
nagios-master.cfg
diff --git
a/config/nagios-master.cfg
b/config/nagios-master.cfg
index
05c021d
..
c3638fd
100644
(file)
--- a/
config/nagios-master.cfg
+++ b/
config/nagios-master.cfg
@@
-224,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
@@
-454,7
+454,7
@@
servers:
ancina:
address: 157.193.39.13
parents: gw-ghent
ancina:
address: 157.193.39.13
parents: gw-ghent
- hostgroups: computers, buildd, single-cpu, lenny, puppet, hassrvfs, hasbootfs
+ hostgroups: computers, buildd, single-cpu, lenny, puppet, hassrvfs, hasbootfs
, incomingmailrelayed2025
contacts: luk
agnesi:
contacts: luk
agnesi:
@@
-541,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
@@
-698,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
@@
-1028,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
###
@@
-1301,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
-
@@
-1314,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
@@
-1500,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
###
-