From 877a32bbf06ce6cdb063f07cfee4da30fd4c5f9b Mon Sep 17 00:00:00 2001 From: Jeremy Dubois Date: Thu, 4 Jun 2020 10:43:17 +0200 Subject: [PATCH] nagios-nrpe / evolinux-base : new ntp server variable Online hosted servers must use ntp.online.net as ntp server, because others one are rate limited. Default ntp server is pool.ntp.org, and a custom one can be set with the nagios_nrpe_ntp_server variable. --- evolinux-base/tasks/provider_online.yml | 4 ++++ nagios-nrpe/defaults/main.yml | 3 +++ nagios-nrpe/templates/evolix.cfg.j2 | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/evolinux-base/tasks/provider_online.yml b/evolinux-base/tasks/provider_online.yml index 76f31e4f..8174d15c 100644 --- a/evolinux-base/tasks/provider_online.yml +++ b/evolinux-base/tasks/provider_online.yml @@ -1,4 +1,8 @@ - debug: msg: "Online DNS servers fails sometimes! Please change them in /etc/resolv.conf." +- name: custom NTP server for Online servers + set_fact: + nagios_nrpe_default_ntp_server: "ntp.online.net" + # - meta: flush_handlers diff --git a/nagios-nrpe/defaults/main.yml b/nagios-nrpe/defaults/main.yml index cb2f901e..ba519361 100644 --- a/nagios-nrpe/defaults/main.yml +++ b/nagios-nrpe/defaults/main.yml @@ -4,9 +4,12 @@ nagios_nrpe_additional_allowed_hosts: [] nagios_nrpe_allowed_hosts: "{{ nagios_nrpe_default_allowed_hosts | union(nagios_nrpe_additional_allowed_hosts) | unique }}" nagios_nrpe_pgsql_passwd: PGSQL_PASSWD nagios_nrpe_amavis_from: "foobar@{{ ansible_domain }}" +nagios_nrpe_default_ntp_server: "pool.ntp.org" +nagios_nrpe_ntp_server: Null nagios_nrpe_force_update_allowed_hosts: False nagios_nrpe_check_proxy_host: "www.example.com" nagios_plugins_directory: "/usr/local/lib/nagios/plugins" + diff --git a/nagios-nrpe/templates/evolix.cfg.j2 b/nagios-nrpe/templates/evolix.cfg.j2 index 89d7e7d9..433a0cd5 100644 --- a/nagios-nrpe/templates/evolix.cfg.j2 +++ b/nagios-nrpe/templates/evolix.cfg.j2 @@ -17,7 +17,7 @@ command[check_users]=/usr/lib/nagios/plugins/check_users -w 5 -c 10 # Generic services checks command[check_smtp]=/usr/lib/nagios/plugins/check_smtp -H localhost command[check_dns]=/usr/lib/nagios/plugins/check_dns -H evolix.net -command[check_ntp]=/usr/lib/nagios/plugins/check_ntp -H ntp2.evolix.net +command[check_ntp]=/usr/lib/nagios/plugins/check_ntp -H {{ nagios_nrpe_ntp_server or nagios_nrpe_default_ntp_server | mandatory }} command[check_ssh]=/usr/lib/nagios/plugins/check_ssh localhost command[check_mailq]=/usr/lib/nagios/plugins/check_mailq -M postfix -w 10 -c 20