From ba587e6aa9808adf71819ac32f9cee86f3252ec0 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Thu, 17 May 2018 22:09:20 +0000
Subject: [PATCH] brute force for now

---
 inventory/inventory                                        | 5 -----
 roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/inventory/inventory b/inventory/inventory
index 3d828a6eb1..4a341f36b8 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -1075,11 +1075,6 @@ fed-cloud15.cloud.fedoraproject.org
 #fed-cloud-ppc01.cloud.fedoraproject.org
 fed-cloud-ppc02.cloud.fedoraproject.org
 
-# Group for hosts we don't want to monitor with nagios.
-[nomonitor:children]
-newcloud-control
-newcloud-compute
-
 [newcloud:children]
 newcloud-control
 newcloud-compute
diff --git a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
index cc77de0eb0..bdaff56427 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
@@ -3,7 +3,7 @@
 ###############
 ## {{ env }}
 {% for key, value in groups.iteritems() %}
-{% if groups[key] != [] and groups[key] != 'nomonitor' %}
+{% if groups[key] != [] and groups[key] != 'newcloud-compute' and groups[key] != 'newcloud-control' and groups[key] != 'newcloud' %}
 define hostgroup{
        hostgroup_name {{ key }}
        alias          {{ key }}