From 42a4bad0f0ee5690ae42b85b5db7a9759a59b51a Mon Sep 17 00:00:00 2001
From: Gilles De Mey <gilles.de.mey@gmail.com>
Date: Wed, 30 Aug 2023 13:02:23 +0200
Subject: [PATCH] Alerting: Do not show grouping when grouplabels are empty in
 email template (#74090)

---
 emails/templates/partials/alerting/grouping_labels.mjml | 4 ++--
 public/emails/ng_alert_notification.html                | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/emails/templates/partials/alerting/grouping_labels.mjml b/emails/templates/partials/alerting/grouping_labels.mjml
index 629351abbb0..51a78147d9c 100644
--- a/emails/templates/partials/alerting/grouping_labels.mjml
+++ b/emails/templates/partials/alerting/grouping_labels.mjml
@@ -8,9 +8,9 @@
       <h2>📁 {{ .GroupLabels.grafana_folder }} &rsaquo; {{ .GroupLabels.alertname }}</h2>
     </mj-text>
     <mj-raw>
-      {{ else }}
+      {{ else if gt (len .GroupLabels.SortedPairs) 0 }}
     </mj-raw>
-    <!-- non-default grouping labels are just printed verbatim -->
+    <!-- non-default grouping labels are just printed verbatim, if we are grouping at all -->
     <mj-text padding="0" align="left">
       <h2>
         📁 Grouped by&nbsp;
diff --git a/public/emails/ng_alert_notification.html b/public/emails/ng_alert_notification.html
index 6945666e5eb..43fabdb6787 100644
--- a/public/emails/ng_alert_notification.html
+++ b/public/emails/ng_alert_notification.html
@@ -193,7 +193,7 @@
                         </div>
                       </td>
                     </tr>
-                    {{ else }}
+                    {{ else if gt (len .GroupLabels.SortedPairs) 0 }}
                     <tr>
                       <td align="left" class="txt" style="font-size:0px;padding:0;word-break:break-word;">
                         <div style="font-family: Inter, Helvetica, Arial; font-size: 13px; line-height: 150%; text-align: left; color: #000000;">