From a2ba26c5f497b81f5a2fcc5a1a55a2405b704f06 Mon Sep 17 00:00:00 2001
From: Stephen Smoogen <smooge@redhat.com>
Date: Wed, 26 Feb 2020 23:28:11 +0000
Subject: [PATCH] this is ugly but its been a 12 hour day

---
 inventory/host_vars/relay-stg.ci.centos.org                    | 2 ++
 inventory/host_vars/relay.ci.centos.org                        | 2 ++
 roles/nagios_server/tasks/main.yml                             | 3 ++-
 .../ping.cfg => templates/nagios/services/ping.cfg.j2}         | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)
 rename roles/nagios_server/{files/nagios/services/ping.cfg => templates/nagios/services/ping.cfg.j2} (67%)

diff --git a/inventory/host_vars/relay-stg.ci.centos.org b/inventory/host_vars/relay-stg.ci.centos.org
index 50248bcf68..ea4935d576 100644
--- a/inventory/host_vars/relay-stg.ci.centos.org
+++ b/inventory/host_vars/relay-stg.ci.centos.org
@@ -61,6 +61,8 @@ fedmsg_certs:
 fedmsg_prefix: org.centos
 fedmsg_env: stg
 
+nagios_Can_Connect: false
+
 nagios_Check_Services:
   mail: false
   nrpe: false
diff --git a/inventory/host_vars/relay.ci.centos.org b/inventory/host_vars/relay.ci.centos.org
index 2648a8d162..7cf82a6f73 100644
--- a/inventory/host_vars/relay.ci.centos.org
+++ b/inventory/host_vars/relay.ci.centos.org
@@ -61,6 +61,8 @@ fedmsg_certs:
 fedmsg_prefix: org.centos
 fedmsg_env: prod
 
+nagios_Can_Connect: false
+
 nagios_Check_Services:
   mail: false
   nrpe: false
diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml
index 6e011eb99d..a293dfc3a9 100644
--- a/roles/nagios_server/tasks/main.yml
+++ b/roles/nagios_server/tasks/main.yml
@@ -205,7 +205,6 @@
     - osbs.cfg
     - pagure_redis.cfg
     - pgsql.cfg
-    - ping.cfg
     - procs.cfg
     - rabbitmq.cfg
     - raid.cfg
@@ -337,10 +336,12 @@
   template: src=nagios/services/{{item}}.j2 dest=/etc/nagios/services/{{item}} mode=0644 owner=root group=root
   with_items:
     - websites.cfg
+    - ping.cfg
   when: env == "production"
   tags:
   - nagios_server
   - nagios_config
+  - nagios_hostgroups
   - websites
   notify: restart nagios
 
diff --git a/roles/nagios_server/files/nagios/services/ping.cfg b/roles/nagios_server/templates/nagios/services/ping.cfg.j2
similarity index 67%
rename from roles/nagios_server/files/nagios/services/ping.cfg
rename to roles/nagios_server/templates/nagios/services/ping.cfg.j2
index 995647da92..bf190587a3 100644
--- a/roles/nagios_server/files/nagios/services/ping.cfg
+++ b/roles/nagios_server/templates/nagios/services/ping.cfg.j2
@@ -1,5 +1,5 @@
 define service {
-  hostgroup_name		*, !buildvm_armv7, !buildvm_s390x, !buildvm_s390x_stg
+  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
   service_description		ICMP-Ping4
   check_command			check_ping4!350.0,20%!500.0,60%
   use				criticaltemplate