projects
/
mirror
/
dsa-nagios.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix debconf staticsync check
[mirror/dsa-nagios.git]
/
config
/
nagios-master.cfg
diff --git
a/config/nagios-master.cfg
b/config/nagios-master.cfg
index
b5034f7
..
8f64bdf
100644
(file)
--- a/
config/nagios-master.cfg
+++ b/
config/nagios-master.cfg
@@
-61,7
+61,7
@@
servers:
parents: gw-ubcece
hostgroups: layer3-infrastructure
gw-dgi:
parents: gw-ubcece
hostgroups: layer3-infrastructure
gw-dgi:
- address: 93.94.13
1.13
+ address: 93.94.13
0.190
parents: gw-ubcece
hostgroups: layer3-infrastructure
gw-freenet:
parents: gw-ubcece
hostgroups: layer3-infrastructure
gw-freenet:
@@
-92,12
+92,8
@@
servers:
address: 64.28.108.36
parents: gw-ubcece
hostgroups: layer3-infrastructure
address: 64.28.108.36
parents: gw-ubcece
hostgroups: layer3-infrastructure
- gw-man-da:
- address: 82.195.75.126
- parents: gw-ubcece
- hostgroups: layer3-infrastructure
- gw-man-da2:
- address: 82.195.78.116
+ gw-manda:
+ address: 82.195.78.118
parents: gw-ubcece
hostgroups: layer3-infrastructure
gw-marist:
parents: gw-ubcece
hostgroups: layer3-infrastructure
gw-marist:
@@
-461,9
+457,10
@@
servers:
address: 5.153.231.36
parents: ganeti-bytemark
hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, systemd-timesyncd
address: 5.153.231.36
parents: ganeti-bytemark
hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, systemd-timesyncd
-
fede
:
+
bilbao
:
address: 5.153.231.37
address: 5.153.231.37
- hostgroups: computers, service, kvmdomains, jessie, hassrvfs, systemd-timesyncd
+ parents: ganeti-bytemark
+ hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, systemd-timesyncd, apache2-hosts
sor:
address: 5.153.231.38
parents: ganeti-bytemark
sor:
address: 5.153.231.38
parents: ganeti-bytemark
@@
-523,13
+520,13
@@
servers:
address: 217.196.149.228
parents: gw-conova
hostgroups: computers, jessie, service, sw-raid
address: 217.196.149.228
parents: gw-conova
hostgroups: computers, jessie, service, sw-raid
+
+ arm-conova-01:
+ address: 217.196.149.230
+ parents: aagaard
+ hostgroups: computers, hassrvfs, buildd, jessie
# }}}
# {{{ gw-csail
# }}}
# {{{ gw-csail
- steffani:
- address: 128.31.0.36
- parents: gw-csail
- hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
-
csail-node01:
address: 128.31.0.16
parents: gw-csail
csail-node01:
address: 128.31.0.16
parents: gw-csail
@@
-605,52
+602,44
@@
servers:
address: 194.177.211.196
parents: gw-grnet
hostgroups: computers, service, dl380, jessie, drbd-hosts
address: 194.177.211.196
parents: gw-grnet
hostgroups: computers, service, dl380, jessie, drbd-hosts
- rautavaara:
- address: 194.177.211.199
- parents: gw-grnet
- hostgroups: computers, megaraid, service, jessie
loghost-grnet-01:
address: 194.177.211.200
parents: gw-grnet
loghost-grnet-01:
address: 194.177.211.200
parents: gw-grnet
- hostgroups: computers, service, kvmdomains, jessie, hassrvfs
+ hostgroups: computers, service, kvmdomains, jessie, hassrvfs
, systemd-timesyncd
geo3:
address: 194.177.211.201
parents: gw-grnet
geo3:
address: 194.177.211.201
parents: gw-grnet
- hostgroups: computers, service, bind9-hosts, kvmdomains, jessie
+ hostgroups: computers, service, bind9-hosts, kvmdomains, jessie
, systemd-timesyncd
cgi-grnet-01:
address: 194.177.211.202
parents: gw-grnet
cgi-grnet-01:
address: 194.177.211.202
parents: gw-grnet
- hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https, xinetd-hosts
+ hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https, xinetd-hosts
, systemd-timesyncd
x86-grnet-01:
address: 194.177.211.203
parents: ganeti-grnet
x86-grnet-01:
address: 194.177.211.203
parents: ganeti-grnet
- hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
+ hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie
, systemd-timesyncd
gigault:
address: 194.177.211.204
parents: ganeti-grnet
gigault:
address: 194.177.211.204
parents: ganeti-grnet
- hostgroups: computers, service, hassrvfs, kvmdomains, jessie
+ hostgroups: computers, service, hassrvfs, kvmdomains, jessie
, systemd-timesyncd
vittoria:
address: 194.177.211.205
parents: ganeti-grnet
vittoria:
address: 194.177.211.205
parents: ganeti-grnet
- hostgroups: computers, service, hassrvfs, kvmdomains, jessie, postgres94-hosts, apache2-hosts, apache-https
+ hostgroups: computers, service, hassrvfs, kvmdomains, jessie, postgres94-hosts, apache2-hosts, apache-https
, systemd-timesyncd
boott:
address: 194.177.211.206
parents: ganeti-grnet
boott:
address: 194.177.211.206
parents: ganeti-grnet
- hostgroups: computers, service, hassrvfs, kvmdomains, jessie
+ hostgroups: computers, service, hassrvfs, kvmdomains, jessie
, systemd-timesyncd
porta:
address: 194.177.211.207
parents: ganeti-grnet
porta:
address: 194.177.211.207
parents: ganeti-grnet
- hostgroups: computers, service, hassrvfs, kvmdomains, jessie, rsyncd-hosts, xinetd-hosts
+ hostgroups: computers, service, hassrvfs, kvmdomains, jessie, rsyncd-hosts, xinetd-hosts
, systemd-timesyncd
melartin:
address: 194.177.211.208
parents: ganeti-grnet
melartin:
address: 194.177.211.208
parents: ganeti-grnet
- hostgroups: computers, service, kvmdomains, jessie
+ hostgroups: computers, service, kvmdomains, jessie
, systemd-timesyncd
# }}}
# {{{ gw-isc
# }}}
# {{{ gw-isc
- schein:
- address: 149.20.20.6
- parents: gw-isc
- hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hasorgfs, xinetd-hosts, jessie, security_mirror, no-bacula
mirror-isc:
address: 149.20.4.13
parents: gw-isc
mirror-isc:
address: 149.20.4.13
parents: gw-isc
@@
-715,14
+704,14
@@
servers:
hostgroups: computers, buildd, jessie
contacts: pkern
# }}}
hostgroups: computers, buildd, jessie
contacts: pkern
# }}}
- # {{{ gw-man
-
da
+ # {{{ gw-manda
czerny:
address: 82.195.75.109
czerny:
address: 82.195.75.109
- parents: gw-man
-
da
+ parents: gw-manda
hostgroups: computers, service, dl380, acpid-hosts, jessie, drbd-hosts
clementi:
address: 82.195.75.103
hostgroups: computers, service, dl380, acpid-hosts, jessie, drbd-hosts
clementi:
address: 82.195.75.103
- parents: gw-man
-
da
+ parents: gw-manda
hostgroups: computers, service, dl380, acpid-hosts, jessie, drbd-hosts
bendel:
address: 82.195.75.100
hostgroups: computers, service, dl380, acpid-hosts, jessie, drbd-hosts
bendel:
address: 82.195.75.100
@@
-772,7
+761,7
@@
servers:
hostgroups: computers, service, kvmdomains, jessie
ganeti3:
address: 82.195.75.111
hostgroups: computers, service, kvmdomains, jessie
ganeti3:
address: 82.195.75.111
- parents: gw-man
-
da
+ parents: gw-manda
hostgroups: notacomputer
wilder:
address: 82.195.75.112
hostgroups: notacomputer
wilder:
address: 82.195.75.112
@@
-796,19
+785,19
@@
servers:
hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, apache2-hosts, jessie, apache-https
mips-manda-01:
address: 82.195.75.66
hostgroups: computers, hasbootfs, hassrvfs, kvmdomains, service, xinetd-hosts, apache2-hosts, jessie, apache-https
mips-manda-01:
address: 82.195.75.66
- parents: gw-man
-
da
+ parents: gw-manda
hostgroups: computers, buildd, jessie, hassrvfs
mipsel-manda-01:
address: 82.195.75.72
hostgroups: computers, buildd, jessie, hassrvfs
mipsel-manda-01:
address: 82.195.75.72
- parents: gw-man
-
da
+ parents: gw-manda
hostgroups: computers, buildd, jessie, hassrvfs, sw-raid, hasbootfs
mipsel-manda-02:
address: 82.195.75.74
hostgroups: computers, buildd, jessie, hassrvfs, sw-raid, hasbootfs
mipsel-manda-02:
address: 82.195.75.74
- parents: gw-man
-
da
+ parents: gw-manda
hostgroups: computers, buildd, jessie, hassrvfs, sw-raid, hasbootfs
mipsel-manda-03:
address: 82.195.75.67
hostgroups: computers, buildd, jessie, hassrvfs, sw-raid, hasbootfs
mipsel-manda-03:
address: 82.195.75.67
- parents: gw-man
-
da
+ parents: gw-manda
hostgroups: computers, buildd, jessie, hassrvfs
seger:
address: 82.195.75.93
hostgroups: computers, buildd, jessie, hassrvfs
seger:
address: 82.195.75.93
@@
-1239,9
+1228,6
@@
hostgroups:
aacraid:
alias: Hosts with Adaptec AACraid
private: 1
aacraid:
alias: Hosts with Adaptec AACraid
private: 1
- megaraid:
- alias: Hosts with LSI Logic MegaRAID
- private: 1
wheezy:
alias: Hosts running wheezy
wheezy:
alias: Hosts running wheezy
@@
-1347,9
+1333,6
@@
hostgroups:
hassrvfs:
alias: hosts with a /srv filesystem
private: 1
hassrvfs:
alias: hosts with a /srv filesystem
private: 1
- hasorgfs:
- alias: hosts with a /org filesystem
- private: 1
hasvarlogfs:
alias: hosts with a /var/log filesystem
private: 1
hasvarlogfs:
alias: hosts with a /var/log filesystem
private: 1
@@
-1462,15
+1445,10
@@
services:
servicegroups: diskspace
nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /boot"
hostgroups: hasbootfs
servicegroups: diskspace
nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /boot"
hostgroups: hasbootfs
- -
- name: disk usage on /org
- servicegroups: diskspace
- nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
- hostgroups: hasorgfs
-
name: disk usage on /srv
servicegroups: diskspace
-
name: disk usage on /srv
servicegroups: diskspace
- nrpe: "/usr/lib/nagios/plugins/check_disk 9
5 98
/srv"
+ nrpe: "/usr/lib/nagios/plugins/check_disk 9
0 95
/srv"
hostgroups: hassrvfs
-
name: disk usage on /var/lib/postgresql
hostgroups: hassrvfs
-
name: disk usage on /var/lib/postgresql
@@
-1870,6
+1848,12
@@
services:
excludehostgroups: systemd-timesyncd
depends: process - ntpd
servicegroups: time
excludehostgroups: systemd-timesyncd
depends: process - ntpd
servicegroups: time
+ -
+ name: system time synced
+ nrpe: "/usr/lib/nagios/plugins/dsa-check-timedatectl -s"
+ hostgroups: computers
+ excludehostgroups: systemd-timesyncd, freebsd, wheezy
+ servicegroups: time
-
name: system time synced
nrpe: "/usr/lib/nagios/plugins/dsa-check-timedatectl"
-
name: system time synced
nrpe: "/usr/lib/nagios/plugins/dsa-check-timedatectl"
@@
-2082,7
+2066,7
@@
services:
nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
check_interval: 120
hostgroups: dl380, dl360, bl460, bl460g8, dl180
nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
check_interval: 120
hostgroups: dl380, dl360, bl460, bl460g8, dl180
- excludehosts:
schein,
busoni
+ excludehosts: busoni
excludehostgroups: hpnewraid
-
name: HW - hpacucli status
excludehostgroups: hpnewraid
-
name: HW - hpacucli status
@@
-2095,7
+2079,7
@@
services:
servicegroups: raid
nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-battery"
check_interval: 120
servicegroups: raid
nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-battery"
check_interval: 120
- hosts:
schein,
busoni
+ hosts: busoni
-
name: HW - hpacucli enclosure status
servicegroups: raid
-
name: HW - hpacucli enclosure status
servicegroups: raid
@@
-2114,13
+2098,13
@@
services:
# nrpe: "/usr/lib/nagios/plugins/dsa-check-edac"
# check_interval: 120
#hostgroups: computers
# nrpe: "/usr/lib/nagios/plugins/dsa-check-edac"
# check_interval: 120
#hostgroups: computers
- #excludehosts: villa, lobos
, schein
+ #excludehosts: villa, lobos
-
name: HW - hpasmcli status
nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"
check_interval: 120
hostgroups: dl380, dl360, bl460, bm-bl
-
name: HW - hpasmcli status
nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"
check_interval: 120
hostgroups: dl380, dl360, bl460, bm-bl
- excludehosts: villa, lobos, s
chein, s
torace, mirror-anu
+ excludehosts: villa, lobos, storace, mirror-anu
-
name: HW - hpasmcli status
nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --ps-no-redundant"
-
name: HW - hpasmcli status
nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --ps-no-redundant"
@@
-2131,11
+2115,6
@@
services:
nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --ps-no-redundant --ignore-failed='PS2'"
check_interval: 120
hosts: lobos
nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --ps-no-redundant --ignore-failed='PS2'"
check_interval: 120
hosts: lobos
- -
- name: HW - hpasmcli status
- nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-no-redundant"
- check_interval: 120
- hosts: schein
-
name: HW - hpasmcli status
nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-ignore-not-present"
-
name: HW - hpasmcli status
nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-ignore-not-present"
@@
-2153,12
+2132,6
@@
services:
nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-aacraid"
hostgroups: aacraid
###
nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-aacraid"
hostgroups: aacraid
###
- -
- name: RAID - megaraid
- servicegroups: raid
- nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-megaraid"
- hostgroups: megaraid
- ###
-
name: RAID - DRBD
servicegroups: raid
-
name: RAID - DRBD
servicegroups: raid
@@
-2780,8
+2753,8
@@
services:
hosts: global
servicegroups: mirror
-
hosts: global
servicegroups: mirror
-
- name: mirror static sync - debconf1
- check: "dsa_check_staticsync!debconf1.debconf.org"
+ name: mirror static sync - debconf1
6
+ check: "dsa_check_staticsync!debconf1
6
.debconf.org"
hosts: global
servicegroups: mirror
-
hosts: global
servicegroups: mirror
-