From 6f627523c64b3ba4a3b17204af14c84fb182ae92 Mon Sep 17 00:00:00 2001
From: Stephen Smoogen <smooge@redhat.com>
Date: Mon, 15 May 2017 23:32:57 +0000
Subject: [PATCH] lets break some stuff

---
 roles/nagios_server/files/nagios/services/ping.cfg | 11 +++++++++--
 .../templates/nagios/hostgroups/all.cfg.j2         | 14 +-------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/roles/nagios_server/files/nagios/services/ping.cfg b/roles/nagios_server/files/nagios/services/ping.cfg
index dae065e41d..368db101bf 100644
--- a/roles/nagios_server/files/nagios/services/ping.cfg
+++ b/roles/nagios_server/files/nagios/services/ping.cfg
@@ -1,14 +1,21 @@
 define service {
-  hostgroup_name		all
+  hostgroup_name		*, !buildvm-armv7, !buildvm-s390x, !buildvm-s390
   service_description		ICMP-Ping4
   check_command			check_ping4!350.0,20%!500.0,60%
   use				criticaltemplate
 }
 
+define service {
+  hostgroup_name		buildvm-armv7, buildvm-s390x, buildvm-s390
+  service_description		ICMP-Ping4-vm-builders
+  check_command			check_ping4!350.0,20%!1000.0,80%
+  use				criticaltemplate
+}
+
 # define service {
 #   hostgroup_name		all
 #   service_description		ICMP-Ping6
-#   check_command			check_ping6!350.0,20%!500.0,60%
+#   check_command		check_ping6!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 7414ca3210..65ccbce1e9 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
@@ -3,19 +3,8 @@
 ###############
 ## {{ env }}
 
-{% if env == "staging" %}
-
-define hostgroup{
-       hostgroup_name all
-       alias          all
-       members        {% for host in groups['all'] %}{% if (hostvars[host].env is defined) and (hostvars[host].env == 'staging') and ( hostvars[host].datacenter == 'phx2') %}{{host}}, {% endif %} {% endfor %} 
-
-}
-
-{% else %}
-
 {% for key, value in groups.iteritems() %}
-{% if groups[key] %}
+{% if groups[key] and key is not 'all' %}
 define hostgroup{
        hostgroup_name {{ key }}
        alias          {{ key }}
@@ -25,7 +14,6 @@ define hostgroup{
 {% endif %}
 {% endfor %}
 
-{% endif %}
 
 ##
 ## Management hardware