From d8fef204d9e3099a9b04e77fb430c6b88f4c2e1c Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 9 Dec 2016 11:25:00 +0100 Subject: [PATCH] systemd-timesyncd check --- config/nagios-master.cfg | 89 +++++++++++++++++++++------------------- 1 file changed, 47 insertions(+), 42 deletions(-) diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index 6cda58f..84e9094 100644 --- a/config/nagios-master.cfg +++ b/config/nagios-master.cfg @@ -339,7 +339,7 @@ servers: milanollo: address: 5.153.231.2 parents: gw-bytemark - hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, nfs-server, xinetd-hosts, no-ntp + hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, nfs-server, xinetd-hosts, systemd-timesyncd milanollo2: address: 5.153.231.9 parents: milanollo @@ -347,73 +347,73 @@ servers: picconi: address: 5.153.231.3 parents: gw-bytemark - hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, nfs-client, autofs, heavy-exim, spamd, apache-https, no-ntp + hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, nfs-client, autofs, heavy-exim, spamd, apache-https, systemd-timesyncd senfter: address: 5.153.231.4 parents: gw-bytemark - hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https, nfs-server, no-ntp + hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, no-bacula, apache-https, nfs-server, systemd-timesyncd adayevskaya: address: 5.153.231.5 parents: gw-bytemark - hostgroups: computers, service, kvmdomains, jessie, no-ntp + hostgroups: computers, service, kvmdomains, jessie, systemd-timesyncd pejacevic: address: 5.153.231.6 parents: gw-bytemark - hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, nfs-client, autofs, apache-https, no-ntp + hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, nfs-client, autofs, apache-https, systemd-timesyncd contacts: holger piu-slave-bm-a: address: 5.153.231.7 parents: gw-bytemark - hostgroups: computers, service, kvmdomains, jessie, nfs-client, autofs, no-ntp + hostgroups: computers, service, kvmdomains, jessie, nfs-client, autofs, systemd-timesyncd contacts: holger binet: address: 5.153.231.8 parents: gw-bytemark - hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie, no-ntp + hostgroups: computers, buildd, hassrvfs, kvmdomains, jessie, systemd-timesyncd bmdb1: address: 5.153.231.10 parents: gw-bytemark - hostgroups: computers, hassrvfs, kvmdomains, jessie, postgres94-hosts, no-ntp + hostgroups: computers, hassrvfs, kvmdomains, jessie, postgres94-hosts, systemd-timesyncd ganeti-bytemark: address: 82.195.75.111 parents: gw-bytemark - hostgroups: notacomputer, no-ntp + hostgroups: notacomputer coccia: address: 5.153.231.11 parents: ganeti-bytemark - hostgroups: computers, hassrvfs, kvmdomains, jessie, autofs, nfs-client, uploadqueue, xinetd-hosts, apache-https, apache2-hosts, no-ntp + hostgroups: computers, hassrvfs, kvmdomains, jessie, autofs, nfs-client, uploadqueue, xinetd-hosts, apache-https, apache2-hosts, systemd-timesyncd backuphost: address: 5.153.231.12 parents: ganeti-bytemark - hostgroups: computers, hassrvfs, kvmdomains, jessie, no-ntp + hostgroups: computers, hassrvfs, kvmdomains, jessie, systemd-timesyncd philp: address: 5.153.231.13 parents: ganeti-bytemark - hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts, apache-https, no-ntp + hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts, apache-https, systemd-timesyncd rainier: address: 5.153.231.16 parents: ganeti-bytemark - hostgroups: computers, kvmdomains, jessie, no-ntp + hostgroups: computers, kvmdomains, jessie, systemd-timesyncd rapoport: address: 5.153.231.15 parents: ganeti-bytemark - hostgroups: computers, kvmdomains, jessie, no-ntp + hostgroups: computers, kvmdomains, jessie, systemd-timesyncd delfin: address: 5.153.231.17 parents: ganeti-bytemark - hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts, apache-https, nfs-client, autofs, no-ntp + hostgroups: computers, hassrvfs, kvmdomains, jessie, apache2-hosts, apache-https, nfs-client, autofs, systemd-timesyncd wuiet: address: 5.153.231.18 parents: ganeti-bytemark - hostgroups: computers, general, kvmdomains, jessie, service, apache-https, apache2-hosts, heavy-exim, xinetd-hosts, no-ntp + hostgroups: computers, general, kvmdomains, jessie, service, apache-https, apache2-hosts, heavy-exim, xinetd-hosts, systemd-timesyncd dinis: address: 5.153.231.19 parents: ganeti-bytemark - hostgroups: computers, general, kvmdomains, jessie, hassrvfs, no-ntp + hostgroups: computers, general, kvmdomains, jessie, hassrvfs, systemd-timesyncd donizetti: address: 5.153.231.20 parents: ganeti-bytemark - hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs, no-ntp + hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs, systemd-timesyncd moszumanska: address: 5.153.231.21 parents: ganeti-bytemark @@ -423,82 +423,82 @@ servers: dillon: address: 5.153.231.22 parents: ganeti-bytemark - hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs, hassrvfs, no-ntp + hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs, hassrvfs, systemd-timesyncd ticharich: address: 5.153.231.23 parents: ganeti-bytemark - hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs, apache2-hosts, apache-https, service, broken_https_default_vhost, no-ntp + hostgroups: computers, general, kvmdomains, jessie, nfs-client, autofs, apache2-hosts, apache-https, service, broken_https_default_vhost, systemd-timesyncd petrova: address: 5.153.231.25 parents: ganeti-bytemark - hostgroups: computers, kvmdomains, jessie, apache2-hosts, apache-https, no-ntp + hostgroups: computers, kvmdomains, jessie, apache2-hosts, apache-https, systemd-timesyncd olin: address: 5.153.231.26 parents: ganeti-bytemark - hostgroups: computers, kvmdomains, jessie, no-ntp + hostgroups: computers, kvmdomains, jessie, systemd-timesyncd barriere: address: 5.153.231.27 parents: ganeti-bytemark - hostgroups: computers, service, kvmdomains, jessie, hassrvfs, porterbox, no-ntp + hostgroups: computers, service, kvmdomains, jessie, hassrvfs, porterbox, systemd-timesyncd quantz: address: 5.153.231.28 parents: ganeti-bytemark - hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, apache2-hosts, autofs, apache-https, no-ntp + hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, xinetd-hosts, heavy-exim, apache2-hosts, autofs, apache-https, systemd-timesyncd respighi: address: 5.153.231.29 parents: ganeti-bytemark - hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, autofs, no-ntp + hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, autofs, systemd-timesyncd paradis: address: 5.153.231.30 parents: ganeti-bytemark - hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https, no-ntp + hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd x86-bm-01: address: 5.153.231.32 parents: ganeti-bytemark - hostgroups: computers, kvmdomains, jessie, no-bacula, no-ntp + hostgroups: computers, kvmdomains, jessie, no-bacula, systemd-timesyncd tate: address: 5.153.231.33 parents: ganeti-bytemark - hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, apache2-hosts, apache-https, no-ntp + hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, apache2-hosts, apache-https, systemd-timesyncd gideon: address: 5.153.231.34 parents: ganeti-bytemark - hostgroups: computers, service, kvmdomains, jessie, hassrvfs, no-ntp + hostgroups: computers, service, kvmdomains, jessie, hassrvfs, systemd-timesyncd httpredir-bm-01: address: 5.153.231.35 parents: ganeti-bytemark - hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, hassrvfs, no-ntp + hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, hassrvfs, systemd-timesyncd lindsay: address: 5.153.231.36 parents: ganeti-bytemark - hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, no-ntp + hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, systemd-timesyncd fede: address: 5.153.231.37 - hostgroups: computers, service, kvmdomains, jessie, hassrvfs, no-ntp + hostgroups: computers, service, kvmdomains, jessie, hassrvfs, systemd-timesyncd sor: address: 5.153.231.38 parents: ganeti-bytemark - hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, autofs, nfs-client, no-ntp + hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, autofs, nfs-client, systemd-timesyncd jerea: address: 5.153.231.39 parents: ganeti-bytemark - hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https, no-ntp + hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, apache-https, systemd-timesyncd mekeel: address: 5.153.231.40 parents: ganeti-bytemark - hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, autofs, no-ntp + hostgroups: computers, service, kvmdomains, jessie, hassrvfs, nfs-client, autofs, systemd-timesyncd pinel: address: 5.153.231.42 parents: ganeti-bytemark - hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, nfs-client, autofs, heavy-exim, no-ntp + hostgroups: computers, service, kvmdomains, jessie, hassrvfs, apache2-hosts, nfs-client, autofs, heavy-exim, systemd-timesyncd rusca: address: 5.153.231.43 parents: ganeti-bytemark - hostgroups: computers, service, kvmdomains, jessie, hassrvfs, no-ntp + hostgroups: computers, service, kvmdomains, jessie, hassrvfs, systemd-timesyncd manziarly: address: 5.153.231.44 parents: ganeti-bytemark - hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, apache2-hosts, apache-https, no-ntp + hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, apache2-hosts, apache-https, systemd-timesyncd # }}} # {{{ gw-c3sl santoro: @@ -1333,8 +1333,8 @@ hostgroups: autofs: alias: hosts running the automounter private: 1 - no-ntp: - alias: hosts without ntp + systemd-timesyncd: + alias: Vms running systemd-timesyncd private: 1 highload: @@ -1855,15 +1855,20 @@ services: name: process - ntpd nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -p 1 -C ntpd -a '/usr/sbin/ntpd -p /var/run/ntpd.pid'" hostgroups: computers - excludehostgroups: no-ntp + excludehostgroups: systemd-timesyncd servicegroups: time - name: network service - ntp check: dsa_check_ntp hostgroups: computers - excludehostgroups: no-ntp + excludehostgroups: systemd-timesyncd depends: process - ntpd servicegroups: time + - + name: process - ntpd + nrpe: "/usr/lib/nagios/plugins/dsa-check-timedatectl" + hostgroups: systemd-timesyncd + servicegroups: time ### - name: process - atd -- 2.20.1