From 6bb08e16d6e69925d7977d4d8cedebbfbd8077f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C4=93teris=20Caune?= <cuu508@gmail.com>
Date: Thu, 4 Feb 2016 09:21:58 +0200
Subject: [PATCH] Updated instructions and JSON payload for VictorOps
 integration.

---
 hc/api/transports.py                          |  3 ++-
 templates/integrations/add_victorops.html     | 24 ++++++++++---------
 .../integrations/victorops_description.html   |  4 +++-
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/hc/api/transports.py b/hc/api/transports.py
index 8d05c5dd..df8fc3e7 100644
--- a/hc/api/transports.py
+++ b/hc/api/transports.py
@@ -160,7 +160,8 @@ class VictorOps(HttpTransport):
         payload = {
             "entity_id": str(check.code),
             "message_type": "CRITICAL" if check.status == "down" else "RECOVERY",
-            "entity_display_name": description,
+            "entity_display_name": check.name_then_code(),
+            "state_message": description,
             "monitoring_tool": "healthchecks.io",
         }
 
diff --git a/templates/integrations/add_victorops.html b/templates/integrations/add_victorops.html
index 3dc5ce41..45db8bee 100644
--- a/templates/integrations/add_victorops.html
+++ b/templates/integrations/add_victorops.html
@@ -35,12 +35,10 @@
         <div class="col-sm-6">
             <span class="step-no">2</span>
             <p>
-                Make note of the routing key.  If this team schedule
-                does not already have a routing key,
-                click <strong>Setup Routing</strong>
-                or go to <strong>Integrations</strong>
-                and scroll to the bottom to create a routing rule and routing key
-                for this team.
+                Go to <strong>Settings &gt; Integrations</strong> and scroll
+                to the bottom of the page. Choose an existing
+                <strong>Routing Key</strong> or
+                add a new one, and make note of it.
             </p>
         </div>
         <div class="col-sm-6">
@@ -52,9 +50,10 @@
     <div class="row ai-step">
         <div class="col-sm-6">
             <span class="step-no">3</span>
-            Go to <strong>Settings > Integrations</strong>
-            and click on <strong>REST Endpoint</strong>.
-            Make note of the <strong>Post URL</strong>.
+            In the right hand side of
+            <strong>Settings &gt; Integrations</strong> page,
+            select <strong>REST Endpoint</strong>, and click on
+            <strong>Enable Integration</strong>.
         </div>
         <div class="col-sm-6">
             <img
@@ -66,7 +65,10 @@
     <div class="row ai-step">
         <div class="col-sm-6">
             <span class="step-no">4</span>
-            <p>Paste the <strong>Post URL</strong> from step 3 in the field below, being careful to replace <strong>$routing_key</strong> with your actual routing key from step 2. Save the integration, and it's done!</p>
+            <p>Paste the <strong>Post URL</strong> from step 3 in the field
+            below, being careful to replace <strong>$routing_key</strong>
+            with your actual Routing Key from step 2. Save the integration,
+            and it's done!</p>
         </div>
     </div>
 
@@ -76,7 +78,7 @@
         {% csrf_token %}
         <input type="hidden" name="kind" value="victorops" />
         <div class="form-group">
-            <label for="inputEmail3" class="col-sm-2 control-label">API Key</label>
+            <label for="inputEmail3" class="col-sm-2 control-label">Post URL</label>
             <div class="col-sm-3">
                 <input type="text" class="form-control" name="value" placeholder="">
             </div>
diff --git a/templates/integrations/victorops_description.html b/templates/integrations/victorops_description.html
index 7326efa7..1e54dd9a 100644
--- a/templates/integrations/victorops_description.html
+++ b/templates/integrations/victorops_description.html
@@ -1,5 +1,7 @@
+{% load humanize %}
 {% if check.status == "down" %}
-    {{ check.name_then_code }} is DOWN
+    {{ check.name_then_code }} is DOWN.
+    Last ping was {{ check.last_ping|naturaltime }}.
 {% else %}
     {{ check.name_then_code }} received a ping and is now UP
 {% endif %}
\ No newline at end of file