From 83f0c19f070875ce79a675fb3ec4dccda26ffe53 Mon Sep 17 00:00:00 2001
From: Stephen Smoogen <smooge@redhat.com>
Date: Wed, 26 Feb 2020 20:03:01 +0000
Subject: [PATCH] and we try yet another cargo cult dance to make the nagios
 gods happy

---
 inventory/group_vars/nagios                     | 17 +++--------------
 .../templates/nagios/hostgroups/all.cfg.j2      |  8 ++++++++
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/inventory/group_vars/nagios b/inventory/group_vars/nagios
index 301a66963e..256c5e2b85 100644
--- a/inventory/group_vars/nagios
+++ b/inventory/group_vars/nagios
@@ -155,6 +155,8 @@ phx2_external:
 # Exclude these ansible host groups in hostgroups/all.cfg
 exclude_hostgroups:
   - nixnagios
+  - aarch64_test
+  - cloud_aws
   - copr_aws
   - copr_back_aws
   - copr_back_dev_aws
@@ -167,21 +169,8 @@ exclude_hostgroups:
   - copr_keygen_dev_aws
   - dbgserver_stg
   - ipsilon_dev
+  - maintainer_test
   - retrace_stg
   - retrace_stg_aws
   - virt_guest
   - virt_host
-
-# Try a way to have a group where we want to define them but we expect them not to ping
-no_ping:
-  - copr_aws
-  - copr_back_aws
-  - copr_back_dev_aws
-  - copr_dev_aws
-  - copr_dist_git_aws
-  - copr_dist_git_dev_aws
-  - copr_front_aws
-  - copr_front_dev_aws
-  - copr_keygen_aws
-  - copr_keygen_dev_aws
-  - ipsilon_dev
diff --git a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
index 6e0264ce24..1199c1dd40 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
@@ -14,6 +14,14 @@ define hostgroup{
 {% endfor %}
 
 ## Services with minimal monitoring
+
+define hostgroup{
+       hostgroup_name cloud_aws_group
+       alias          cloud_aws_group
+       members        {% for host in groups['cloud_aws']|sort %}{{host}}, {% endfor %} 
+}
+
+
 define hostgroup{
        hostgroup_name mincheckgrp
        alias          mincheckgrp