From 7877a98bd9c00db5e81dd2f8c734cba2bab20be7 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 12 Aug 2022 09:26:17 +0200
Subject: Merging upstream version 1.36.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 health/notifications/alarm-notify.sh.in | 8 ++++++++
 health/notifications/msteams/README.md  | 2 --
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'health/notifications')

diff --git a/health/notifications/alarm-notify.sh.in b/health/notifications/alarm-notify.sh.in
index 38a69a0f3..0dfecade5 100755
--- a/health/notifications/alarm-notify.sh.in
+++ b/health/notifications/alarm-notify.sh.in
@@ -2898,6 +2898,10 @@ if [ -n "$total_crit_alarms" ]; then
    done <<<"$total_crit_alarms,"
 fi
 
+if (( total_warnings + total_critical > 15 )); then
+    EXTRA_ALARMS_LIST_TEXT="(Showing latest 15 alerts)"
+fi
+
 if [ -n "$edit_command_line" ]; then
     IFS='=' read -r edit_command line s_host <<<"$edit_command_line"
 fi
@@ -3423,6 +3427,10 @@ Content-Transfer-Encoding: 8bit
                             <span style="font-weight:600">${total_critical} critical</span>
                             additional active alert(s)</div>
                         </td>
+                        </tr>
+                        <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                          <div style="font-family:Open Sans, sans-serif;font-size:12px;line-height:1;text-align:center;color:#35414A;">${EXTRA_ALARMS_LIST_TEXT}</div>
+                        </td>
                       </tr>
                       </tbody>
                     </table>
diff --git a/health/notifications/msteams/README.md b/health/notifications/msteams/README.md
index 14dbe7511..c9a13bac9 100644
--- a/health/notifications/msteams/README.md
+++ b/health/notifications/msteams/README.md
@@ -1,8 +1,6 @@
 <!--
----
 title: "Microsoft Teams"
 custom_edit_url: https://github.com/netdata/netdata/edit/master/health/notifications/msteams/README.md
----
 -->
 
 # Microsoft Teams
-- 
cgit v1.2.3