From 41ec5b737b182f610caec53c42af5ff79e65cdbf Mon Sep 17 00:00:00 2001 From: William Hirigoyen Date: Tue, 7 Nov 2023 17:46:29 +0100 Subject: [PATCH] nagios: rename var into and check systemd-timesyncd instead of ntpd in Debian 12 --- CHANGELOG.md | 1 + nagios-nrpe/defaults/main.yml | 7 ++++++- nagios-nrpe/tasks/main.yml | 7 +++++++ nagios-nrpe/templates/evolix.cfg.j2 | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e0914eb..3f3561e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ The **patch** part changes is incremented if multiple releases happen the same m * evolinux-base: use separate default config file for rsyslog * evocheck: upstream release 23.10 * add-vm.sh: allow VM name max length > 20 +* nagios: rename var `nagios_nrpe_process_processes` into `nagios_nrpe_processes` and check systemd-timesyncd instead of ntpd in Debian 12 ### Fixed diff --git a/nagios-nrpe/defaults/main.yml b/nagios-nrpe/defaults/main.yml index 28b85d99..8ac9c3f4 100644 --- a/nagios-nrpe/defaults/main.yml +++ b/nagios-nrpe/defaults/main.yml @@ -6,7 +6,12 @@ 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_process_processes: [ cron rsyslogd ntpd munin-node ] + +# Use nagios_nrpe_processes to override +nagios_nrpe_processes_default_before_debian_12: [ cron rsyslogd ntpd munin-node ] +nagios_nrpe_processes_default: [ cron rsyslogd systemd-timesyn munin-node ] +# Built dynamically : +nagios_nrpe_processes: Null nagios_nrpe_force_update_allowed_hosts: False diff --git a/nagios-nrpe/tasks/main.yml b/nagios-nrpe/tasks/main.yml index 5d4c01aa..bf63a44a 100644 --- a/nagios-nrpe/tasks/main.yml +++ b/nagios-nrpe/tasks/main.yml @@ -1,4 +1,11 @@ --- + +- name: + ansible.builtin.set_fact: + nagios_nrpe_processes: "{{ nagios_nrpe_processes_default_before_debian_12 if ansible_distribution_major_version is version('12', '<') else nagios_nrpe_processes_default }}" + when: + nagios_nrpe_processes == None or nagios_nrpe_processes|length <= 0 + - name: base nrpe & plugins packages are installed ansible.builtin.apt: name: diff --git a/nagios-nrpe/templates/evolix.cfg.j2 b/nagios-nrpe/templates/evolix.cfg.j2 index 2d1837e1..de495868 100644 --- a/nagios-nrpe/templates/evolix.cfg.j2 +++ b/nagios-nrpe/templates/evolix.cfg.j2 @@ -66,7 +66,7 @@ command[check_amavis]={{ nagios_plugins_directory }}/check_amavis --server 127.0 command[check_spamd]={{ nagios_plugins_directory }}/check_spamd -H 127.0.0.1 command[check_nfsclient]=sudo -u www-data {{ nagios_plugins_directory }}/check_nfsclient command[check_evobackup]={{ nagios_plugins_directory }}/check_evobackup -command[check_process]={{ nagios_plugins_directory }}/check_process {{ nagios_nrpe_process_processes | join(' ') }} +command[check_process]={{ nagios_plugins_directory }}/check_process {{ nagios_nrpe_processes | join(' ') }} command[check_drbd]={{ nagios_plugins_directory }}/check_drbd -d All -c StandAlone command[check_mongodb_connect]={{ nagios_plugins_directory }}/check_mongodb -H localhost -P27017 -A connect command[check_glusterfs]={{ nagios_plugins_directory }}/check_glusterfs -v all -n 0