projects
/
mirror
/
dsa-nagios.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
since zappa is gone, we do not do submission anymore
[mirror/dsa-nagios.git]
/
config
/
nagios-master.cfg
diff --git
a/config/nagios-master.cfg
b/config/nagios-master.cfg
index
d2ef46a
..
52d5917
100644
(file)
--- a/
config/nagios-master.cfg
+++ b/
config/nagios-master.cfg
@@
-85,7
+85,7
@@
servers:
parents: gw-ubcece
hostgroups: layer3-infrastructure
gw-marist:
parents: gw-ubcece
hostgroups: layer3-infrastructure
gw-marist:
- address: 148.100.
96
.1
+ address: 148.100.
88
.1
parents: gw-ubcece
hostgroups: layer3-infrastructure
gw-osuosl:
parents: gw-ubcece
hostgroups: layer3-infrastructure
gw-osuosl:
@@
-507,7
+507,7
@@
servers:
vento:
address: 82.195.75.98
parents: ganeti3
vento:
address: 82.195.75.98
parents: ganeti3
- hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts, heavy-exim
+ hostgroups: computers, service, kvmdomains, wheezy, hassrvfs, apache2-hosts,
apache-https,
heavy-exim
lully:
address: 82.195.75.99
parents: ganeti3
lully:
address: 82.195.75.99
parents: ganeti3
@@
-562,10
+562,10
@@
servers:
hostgroups: computers, service, kvmdomains, wheezy, bind9-hosts
# }}}
# {{{ gw-marist
hostgroups: computers, service, kvmdomains, wheezy, bind9-hosts
# }}}
# {{{ gw-marist
- za
ppa
:
- address: 148.100.
96.103
+ za
ni
:
+ address: 148.100.
88.22
parents: gw-marist
parents: gw-marist
- hostgroups: computers, buildd, hassrvfs,
squeeze, incomingmailrelayed
+ hostgroups: computers, buildd, hassrvfs,
wheezy
# }}}
# {{{ gw-osuosl
busoni:
# }}}
# {{{ gw-osuosl
busoni:
@@
-858,7
+858,7
@@
servers:
ullmann:
address: 206.12.19.141
parents: ganeti2
ullmann:
address: 206.12.19.141
parents: ganeti2
- hostgroups: computers, service, kvmdomains, wheezy, postgres91-hosts, nfs-client, apache2-hosts, autofs
+ hostgroups: computers, service, kvmdomains, wheezy, postgres91-hosts, nfs-client, apache2-hosts, autofs
, apache-https
sonntag:
address: 206.12.19.142
parents: ganeti2
sonntag:
address: 206.12.19.142
parents: ganeti2
@@
-1182,8
+1182,6
@@
servicegroups:
alias: backup checks
kernel:
alias: kernel checks
alias: backup checks
kernel:
alias: kernel checks
- weaksshkeys:
- alias: weak ssh keys
apt:
alias: apt upgrade status
samhain:
apt:
alias: apt upgrade status
samhain:
@@
-1192,7
+1190,7
@@
servicegroups:
alias: time stuff
security:
alias: security
alias: time stuff
security:
alias: security
- servicegroup_members: apt,
weaksshkeys,
kernel, samhain
+ servicegroup_members: apt, kernel, samhain
#############################
# services
#############################
# services
@@
-1554,13
+1552,6
@@
services:
depends: process - sshd
normal_check_interval: 60
notification_interval: 1440
depends: process - sshd
normal_check_interval: 60
notification_interval: 1440
-
- -
- name: ssh - weak keys
- servicegroups: weaksshkeys
- nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/weak-ssh-keys"
- hostgroups: computers
- normal_check_interval: 60
####
-
name: network service - nrpe
####
-
name: network service - nrpe
@@
-1869,11
+1860,11
@@
services:
check: dsa_check_smtp
hostgroups: postfix-hosts
depends: process - postfix - master
check: dsa_check_smtp
hostgroups: postfix-hosts
depends: process - postfix - master
- -
- name: network service - submission
- check: dsa_check_smtp_port!587
- hostgroups: incomingmailrelayed
- depends: process - exim
+
#
-
+
#
name: network service - submission
+
#
check: dsa_check_smtp_port!587
+
#
hostgroups: incomingmailrelayed
+
#
depends: process - exim
-
name: network service - smtp 2025
check: dsa_check_smtp_port!2025
-
name: network service - smtp 2025
check: dsa_check_smtp_port!2025
@@
-2492,23
+2483,23
@@
services:
retry_check_interval: 5
-
name: DNS SOA sync - debian.org
retry_check_interval: 5
-
name: DNS SOA sync - debian.org
- check: "dsa_check_soas_add!d
raghi
.debian.org!debian.org"
+ check: "dsa_check_soas_add!d
enis
.debian.org!debian.org"
hosts: global
-
name: DNS SOA sync - debian.net
hosts: global
-
name: DNS SOA sync - debian.net
- check: "dsa_check_soas_add!d
raghi
.debian.org!debian.net"
+ check: "dsa_check_soas_add!d
enis
.debian.org!debian.net"
hosts: global
-
name: DNS SOA sync - debian.com
hosts: global
-
name: DNS SOA sync - debian.com
- check: "dsa_check_soas_add!d
raghi
.debian.org!debian.com"
+ check: "dsa_check_soas_add!d
enis
.debian.org!debian.com"
hosts: global
-
name: DNS SOA sync - mirror.debian.net
hosts: global
-
name: DNS SOA sync - mirror.debian.net
- check: "dsa_check_soas_add!d
raghi
.debian.org!mirror.debian.net"
+ check: "dsa_check_soas_add!d
enis
.debian.org!mirror.debian.net"
hosts: global
-
name: DNS SOA sync - 144-28.118.59.86.in-addr.arpa
hosts: global
-
name: DNS SOA sync - 144-28.118.59.86.in-addr.arpa
- check: "dsa_check_soas_add!d
raghi
.debian.org!144-28.118.59.86.in-addr.arpa"
+ check: "dsa_check_soas_add!d
enis
.debian.org!144-28.118.59.86.in-addr.arpa"
hosts: global
-
name: DNS SOA sync - alioth.debian.org
hosts: global
-
name: DNS SOA sync - alioth.debian.org