From 9515c8639f6b99abce98849852237a052e6d574b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Dubois?= Date: Thu, 15 Dec 2022 16:24:12 +0100 Subject: [PATCH] nagios-nrpe: deleted unused variables and added a ntp check server variable --- CHANGELOG | 1 + roles/nagios-nrpe/defaults/main.yml | 6 +----- roles/nagios-nrpe/templates/evolix_bsd.cfg.j2 | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index bea7d26..d898c5b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -53,6 +53,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * base: reordering default variable file and deleting unused one * base: use a template for ntp configuration to ease the management of the different cases * logsentry: update config files, add "[logsentry]" in subject, and simplify task +* nagios-nrpe: deleted unused variables and added a ntp check server variable ### Fixed diff --git a/roles/nagios-nrpe/defaults/main.yml b/roles/nagios-nrpe/defaults/main.yml index fd490d5..cb9a238 100644 --- a/roles/nagios-nrpe/defaults/main.yml +++ b/roles/nagios-nrpe/defaults/main.yml @@ -4,9 +4,5 @@ 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_check_proxy_host: "www.example.com" - -nagios_plugins_directory: "/usr/local/lib/nagios/plugins" +nagios_nrpe_default_ntp_server: "pool.ntp.org" diff --git a/roles/nagios-nrpe/templates/evolix_bsd.cfg.j2 b/roles/nagios-nrpe/templates/evolix_bsd.cfg.j2 index 16bd300..8de8aa0 100644 --- a/roles/nagios-nrpe/templates/evolix_bsd.cfg.j2 +++ b/roles/nagios-nrpe/templates/evolix_bsd.cfg.j2 @@ -9,7 +9,7 @@ command[check_swap]=/usr/local/libexec/nagios/check_swap --no-swap=ok -a -w 30% # Generic services checks command[check_smtp]=/usr/local/libexec/nagios/check_smtp -H localhost -f {{ general_alert_email }} command[check_dns]=/usr/local/libexec/nagios/check_dns -H evolix.net -command[check_ntp]=/usr/local/libexec/nagios/check_ntp -H ntp-check.evolix.net +command[check_ntp]=/usr/local/libexec/nagios/check_ntp -H {{ nagios_nrpe_default_ntp_server}} command[check_ssh]=/usr/local/libexec/nagios/check_ssh -p 22 localhost command[check_mailq]=doas /usr/local/libexec/nagios/plugins/check_mailq.pl -M opensmtpd -w 5 -c 10