From 56c3f11a48f2bcc98feeddee54ecc763f7045bc7 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Wed, 26 Apr 2023 09:18:06 +0200
Subject: [PATCH] nagios: fix empty groups members in all-external.cfg.j2

---
 .../templates/nagios/hostgroups/all-external.cfg.j2       | 8 +++++---
 .../nagios_server/templates/nagios/hostgroups/all.cfg.j2  | 7 +++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/roles/nagios_server/templates/nagios/hostgroups/all-external.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/all-external.cfg.j2
index ac1bf6126e..6c12ea2097 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/all-external.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/all-external.cfg.j2
@@ -35,11 +35,13 @@ define hostgroup {
 
 {% for key, value in groups.items()|sort %}
 {% if groups[key] != [] and key.startswith('copr')  %}
-define hostgroup{
+define hostgroup {
        hostgroup_name {{ key }}
        alias          {{ key }}
-       members        {% for host in groups[key]|sort %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, {% endif %}{% endfor %}
-
+{%- for host in groups[key]|sort if hostvars[host].nagios_Can_Connect == true %}
+{% if loop.first +%}
+       members        {{ host }}{% else %}, {{ host }}{% endif %}
+{% endfor +%}
 }
 {% endif %}
 {% endfor %}
diff --git a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
index efffe89d94..3dbbcf839e 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
@@ -7,11 +7,10 @@
 define hostgroup{
        hostgroup_name {{ key }}
        alias          {{ key }}
-{% for host in groups[key]|sort if hostvars[host].nagios_Can_Connect == true %}
-{% if loop.first %}
+{%- for host in groups[key]|sort if hostvars[host].nagios_Can_Connect == true %}
+{% if loop.first +%}
        members        {{ host }}{% else %}, {{ host }}{% endif %}
-{% endfor %}
-
+{% endfor +%}
 }
 {% endif %}
 {% endfor %}