From 26ef19636be0ce3e0b7c1056c22759ef31b7c430 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Tue, 5 Mar 2024 10:19:33 +0100 Subject: [PATCH 1/3] Update nagios host IPv6 --- templates/nrpe.cfg.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/nrpe.cfg.j2 b/templates/nrpe.cfg.j2 index 5801044..c217e2b 100644 --- a/templates/nrpe.cfg.j2 +++ b/templates/nrpe.cfg.j2 @@ -98,7 +98,7 @@ server_port=5666 # # NOTE: This option is ignored if NRPE is running under either inetd or xinetd -allowed_hosts={{ nagios_host }},monitor.p0m.fr,2a01:e0a:518:830::a +allowed_hosts={{ nagios_host }},monitor.p0m.fr,2a01:e0a:518:830::10 From 54ec5901a56f4c87a2426381015c0615a224eef1 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Tue, 5 Mar 2024 10:20:43 +0100 Subject: [PATCH 2/3] Change NTP host --- templates/nrpe.cfg.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/nrpe.cfg.j2 b/templates/nrpe.cfg.j2 index c217e2b..18b0044 100644 --- a/templates/nrpe.cfg.j2 +++ b/templates/nrpe.cfg.j2 @@ -296,8 +296,8 @@ command[check_disks]=/usr/lib/nagios/plugins/check_disk -w 16% -c 9% -A{% for nr command[check_hda1]=/usr/lib/nagios/plugins/check_disk -w 20% -c 10% -p /dev/hda1 command[check_zombie_procs]=/usr/lib/nagios/plugins/check_procs -w 5 -c 10 -s Z -command[check_total_procs]=/usr/lib/nagios/plugins/check_procs -w {{ nrpe_check_total_procs * 0.9 | int }} -c {{ nrpe_check_total_procs }} -{% if inventory_hostname == 'hesat.ra.nemunai.re' %} +command[check_total_procs]=/usr/lib/nagios/plugins/check_procs -w {{ (nrpe_check_total_procs * 0.9) | int }} -c {{ nrpe_check_total_procs }} +{% if inventory_hostname == 'aton.ra.nemunai.re' %} command[check_ntp_time]=/usr/lib/nagios/plugins/check_ntp_time -H fr.pool.ntp.org -w 1 -c 2 {% else %} command[check_ntp_time]=/usr/lib/nagios/plugins/check_ntp_time -H {{ ntp_pool[0] }} -w 1 -c 2 From b3c2bc0c9e46888e21ae0da9f49090f8685812b3 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Tue, 5 Mar 2024 10:20:54 +0100 Subject: [PATCH 3/3] Add distribution in groups --- templates/server.cfg.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/server.cfg.j2 b/templates/server.cfg.j2 index 631817c..5ec0a78 100644 --- a/templates/server.cfg.j2 +++ b/templates/server.cfg.j2 @@ -2,7 +2,7 @@ define host { use linux-server host_name {{ inventory_hostname_short }} address {{ inventory_hostname }} - hostgroups linux-servers{% if group_names | length > 0 %},{{ group_names | join(",") }}{% endif %}{% if nagios_extra_groups | length > 0 %},{{ nagios_extra_groups | join(",") }}{% endif %} + hostgroups linux-servers,{{ ansible_distribution | lower }}-hosts{% if group_names | length > 0 %},{{ group_names | join(",") }}{% endif %}{% if nagios_extra_groups | length > 0 %},{{ nagios_extra_groups | join(",") }}{% endif %} {% if mydomain is defined and mydomain != "ra.nemunai.re" -%} {% set dn = mydomain.split('.') %}