projects
/
mirror
/
dsa-nagios.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add missing changelog entry
[mirror/dsa-nagios.git]
/
config
/
nagios-master.cfg
diff --git
a/config/nagios-master.cfg
b/config/nagios-master.cfg
index
af2a92b
..
dd87c03
100644
(file)
--- a/
config/nagios-master.cfg
+++ b/
config/nagios-master.cfg
@@
-580,7
+580,7
@@
servers:
x86-csail-01:
address: 128.31.0.50
parents: ganeti-csail
x86-csail-01:
address: 128.31.0.50
parents: ganeti-csail
- hostgroups: computers, buildd, hassrvfs, kvmdomains,
stretch
, systemd-timesyncd
+ hostgroups: computers, buildd, hassrvfs, kvmdomains,
buster
, systemd-timesyncd
x86-csail-02:
address: 128.31.0.68
parents: ganeti-csail
x86-csail-02:
address: 128.31.0.68
parents: ganeti-csail
@@
-1158,6
+1158,8
@@
hostgroups:
alias: Hosts running jessie
stretch:
alias: Hosts running stretch
alias: Hosts running jessie
stretch:
alias: Hosts running stretch
+ buster:
+ alias: Hosts running buster
kvmdomains:
alias: Hosts that are KVM domains
kvmdomains:
alias: Hosts that are KVM domains
@@
-1776,13
+1778,13
@@
services:
name: process - nrpe
nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1: -u nagios -C nrpe -a '/usr/sbin/nrpe -c /etc/nagios/nrpe.cfg -d'"
hostgroups: computers
name: process - nrpe
nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1: -u nagios -C nrpe -a '/usr/sbin/nrpe -c /etc/nagios/nrpe.cfg -d'"
hostgroups: computers
- excludehostgroups: stretch
+ excludehostgroups: stretch
, buster
max_check_attempts: -1
depends: network service - nrpe
-
name: process - nrpe
nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1: -u nagios -C nrpe -a '/usr/sbin/nrpe -c /etc/nagios/nrpe.cfg -f'"
max_check_attempts: -1
depends: network service - nrpe
-
name: process - nrpe
nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1: -u nagios -C nrpe -a '/usr/sbin/nrpe -c /etc/nagios/nrpe.cfg -f'"
- hostgroups: stretch
+ hostgroups: stretch
, buster
max_check_attempts: -1
depends: network service - nrpe
###
max_check_attempts: -1
depends: network service - nrpe
###
@@
-1933,7
+1935,7
@@
services:
-
name: unwanted process - rpc.statd
nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C rpc.statd"
-
name: unwanted process - rpc.statd
nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C rpc.statd"
- hostgroups: stretch
+ hostgroups: stretch
, buster
excludehosts: storace
-
name: unwanted process - inetd
excludehosts: storace
-
name: unwanted process - inetd
@@
-1958,6
+1960,10
@@
services:
name: "host SSL cert - debian client"
nrpe: "if [ -e /etc/ssl/debian/certs/thishost.crt ]; then /usr/lib/nagios/plugins/dsa-check-cert-expire /etc/ssl/debian/certs/thishost.crt; else echo 'No thishost.crt on this host.'; fi"
hostgroups: computers
name: "host SSL cert - debian client"
nrpe: "if [ -e /etc/ssl/debian/certs/thishost.crt ]; then /usr/lib/nagios/plugins/dsa-check-cert-expire /etc/ssl/debian/certs/thishost.crt; else echo 'No thishost.crt on this host.'; fi"
hostgroups: computers
+ -
+ name: "host SSL cert - CA"
+ nrpe: "sudo -u puppet /usr/lib/nagios/plugins/dsa-check-cert-expire /srv/puppet.debian.org/ca/ca.crt"
+ hosts: handel
-
name: "sso CRL"
nrpe: "if [ -e /var/lib/dsa/sso/ca.crl ]; then /usr/lib/nagios/plugins/dsa-check-crl-expire -w 129600 -c 86400 /var/lib/dsa/sso/ca.crl; else echo 'No sso/ca.crl on this host.'; fi"
-
name: "sso CRL"
nrpe: "if [ -e /var/lib/dsa/sso/ca.crl ]; then /usr/lib/nagios/plugins/dsa-check-crl-expire -w 129600 -c 86400 /var/lib/dsa/sso/ca.crl; else echo 'No sso/ca.crl on this host.'; fi"
@@
-2455,7
+2461,7
@@
services:
name: process - statd
nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u statd -C rpc.statd -a '/sbin/rpc.statd'"
hostgroups: nfs-client, nfs-server
name: process - statd
nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u statd -C rpc.statd -a '/sbin/rpc.statd'"
hostgroups: nfs-client, nfs-server
- excludehostgroups: stretch
+ excludehostgroups: stretch
, buster
-
name: process - nfsd
nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u root -C nfsd -a '[nfsd]'"
-
name: process - nfsd
nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:10 -c 1: -u root -C nfsd -a '[nfsd]'"
@@
-2907,14
+2913,6
@@
services:
check_interval: 60
hosts: vogler
####
check_interval: 60
hosts: vogler
####
- -
- name: Debian SMTP CA
- nrpe: "sudo -u puppet /usr/lib/nagios/plugins/dsa-check-cert-expire /srv/puppet.debian.org/ca/ca.crt"
- hosts: handel
- check_interval: 60
- max_check_attempts: 2
- retry_interval: 5
- ####
-
name: puppetmaster cert
nrpe: "sudo -u puppet /usr/lib/nagios/plugins/dsa-check-cert-expire /var/lib/puppet/ssl/certs/ca.pem"
-
name: puppetmaster cert
nrpe: "sudo -u puppet /usr/lib/nagios/plugins/dsa-check-cert-expire /var/lib/puppet/ssl/certs/ca.pem"