From ca3d1d3a3b35745668748c74ea3dff3e17406925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C4=93teris=20Caune?= <cuu508@gmail.com>
Date: Mon, 28 Dec 2020 17:34:58 +0200
Subject: [PATCH] Add the "Last Ping Type" field in the email notification
 template

---
 CHANGELOG.md                          |  2 +-
 templates/emails/alert-body-html.html | 47 +++++++++++++++++++++------
 2 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f1eca84..65b6507f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ All notable changes to this project will be documented in this file.
 ## Improvements
 - Add tighter parameter checks in hc.front.views.serve_doc
 - Update OpsGenie instructions (#450)
-
+- Update the email notification template to include more check and last ping details
 
 ## v1.18.0 - 2020-12-09
 
diff --git a/templates/emails/alert-body-html.html b/templates/emails/alert-body-html.html
index 1dff5e12..c1b366e3 100644
--- a/templates/emails/alert-body-html.html
+++ b/templates/emails/alert-body-html.html
@@ -47,28 +47,55 @@
             <b>Schedule</b><br>
             <code>{{ check.schedule }}</code>
         </td>
-        {% if trttr %}Yo!{% endif %}
         {{ trtr|safe }} {% cycle trtr %}
         {% endif %}
 
-        {% if ping %}
+        <td style="padding-right: 32px; padding-bottom: 8px; vertical-align: top;">
+            <b>Total Pings</b><br>
+            {{ check.n_pings }}
+            {% if check.created %}(since {{ check.created|date:'M j, Y' }}){% endif %}
+        </td>
+    </tr>
+
+    {% if ping %}
+    <tr>
         <td style="padding-right: 32px; padding-bottom: 8px; vertical-align: top;">
             <b>Last Ping</b><br>
             {{ ping.created|naturaltime }}{% if ping.remote_addr %}, from {{ ping.remote_addr }}{% endif %}
         </td>
-        {% if trttr %}Yo!{% endif %}
-        {{ trtr|safe }} {% cycle trtr %}
-        {% endif %}
-
         <td style="padding-right: 32px; padding-bottom: 8px; vertical-align: top;">
-            <b>Total Pings</b><br>
-            {{ check.n_pings }}
-            {% if check.created %}(since {{ check.created|date:'M j, Y' }}){% endif %}
+            <b>Last Ping Type</b><br>
+            {% if ping.exitstatus > 0 %}
+            <span style="background-color: #f2dede; color: #333333; padding-left: 4px; padding-right: 4px; border-radius: 2px;">
+                Exit status {{ ping.exitstatus }}
+            </span>
+            {% elif ping.exitstatus == 0 %}
+            <span style="background-color: #dff0d8; color: #333333; padding-left: 4px; padding-right: 4px; border-radius: 2px;">
+                Exit status 0
+            </span>
+            {% elif ping.kind == "fail" %}
+            <span style="background-color: #f2dede; color: #333333; padding-left: 4px; padding-right: 4px; border-radius: 2px;">
+                Failure
+            </span>
+            {% elif ping.kind == "start" %}
+            <span style="background-color: #dff0d8; color: #333333; padding-left: 4px; padding-right: 4px; border-radius: 2px;">
+                Started
+            </span>
+            {% elif ping.kind == "ign" %}
+            <span style="background-color: #eeeeee; color: #333333; padding-left: 4px; padding-right: 4px; border-radius: 2px;">
+                Ignored
+            </span>
+            {% else %}
+            <span style="background-color: #dff0d8; color: #333333; padding-left: 4px; padding-right: 4px; border-radius: 2px;">
+                Success
+            </span>
+            {% endif %}
         </td>
     </tr>
+    {% endif %}
 </table>
 
-{% if ping.body %}
+{% if ping and ping.body %}
 <p><b>Last Ping Body</b></p>
 <pre>{{ ping.body|slice:":10000"|linebreaksbr }}{% if ping.body|length > 10000 %} [truncated]{% endif %}</pre>
 {% endif %}