From ba1b6c933d6fd429b234644b33c097f92fdaf071 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Wed, 26 Feb 2020 23:46:07 +0000 Subject: [PATCH] ok ping doesnt need to be a template. all.cfg needs a group which says you cant ping it --- .../services/ping.cfg.j2 => files/nagios/services/ping.cfg} | 2 +- roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) rename roles/nagios_server/{templates/nagios/services/ping.cfg.j2 => files/nagios/services/ping.cfg} (67%) diff --git a/roles/nagios_server/templates/nagios/services/ping.cfg.j2 b/roles/nagios_server/files/nagios/services/ping.cfg similarity index 67% rename from roles/nagios_server/templates/nagios/services/ping.cfg.j2 rename to roles/nagios_server/files/nagios/services/ping.cfg index 5f6fcb29bb..65ac8f672d 100644 --- a/roles/nagios_server/templates/nagios/services/ping.cfg.j2 +++ b/roles/nagios_server/files/nagios/services/ping.cfg @@ -1,5 +1,5 @@ define service { - hostgroup_name {% for host in groups['all']|sort %}{% if hostvars[host].nagios_Can_Connect == true or hostvars[host].nagios_Check_Services['ping'] == true %}{{host}}, {% endif %}{% endfor %}, !buildvm_armv7, !buildvm_s390x, !buildvm_s390x_stg + hostgroup_name all,!no_ping, !buildvm_armv7, !buildvm_s390x, !buildvm_s390x_stg service_description ICMP-Ping4 check_command check_ping4!350.0,20%!500.0,60% use criticaltemplate diff --git a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 index 0523236779..30007fc506 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 @@ -13,6 +13,12 @@ define hostgroup{ {% endif %} {% endfor %} +define hostgroup{ + hostgroup_name no_ping + alias no_ping + members {% for host in groups['all']|sort %}{% if hostvars[host].nagios_Check_Services['ping'] == true or hostvars[host].nagios_Can_Connect == true %}{{host}}, {% endif %}{% endfor %} +} + ## Services with minimal monitoring define hostgroup{