Get slack notification in sync with image-factory / orchestrator

totem · Jul 20, 2016 · 9003231 · 9003231
1 parent 8a08b3b
commit 9003231
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 16 deletions.
diff --git a/deployer/tasks/notification.py b/deployer/tasks/notification.py
@@ -2,6 +2,8 @@
 Tasks for notification
 """
 import json
+
+import time
 from future.builtins import (  # noqa
     bytes, dict, int, list, object, range, str,
     ascii, chr, hex, input, next, oct, open,
@@ -68,6 +70,7 @@ def notify_slack(obj, ctx, level, config, security_profile):
     url = config.get('url')
     notification = util.as_dict(obj)
     notification['channel'] = config.get('channel')
+    notification['date'] = int(time.time())
     msg = templatefactory.render_template(
         'slack.json.jinja', notification=notification, ctx=ctx,
         level=level)

diff --git a/deployer/templates/slack.json.jinja b/deployer/templates/slack.json.jinja
@@ -2,26 +2,28 @@
 {
   "username": "Deployer ({{ctx.cluster}}-{{ctx.operation}})",
   "channel": "{{ notification.channel or '#totem' }}",
-  "text":
-  {% if git.type == 'github' %}
-    "<https://github.com/{{git.owner}}|{{git.owner or 'NA'}}> / <https://github.com/{{git.owner}}/{{git.repo}}|{{git.repo or 'NA'}}> / <https://github.com/{{git.owner}}/{{git.repo}}/{{git.ref}}|{{git.ref or 'NA'}}> / <https://github.com/{{ctx.owner}}/{{ctx.repo}}/commits/{{ctx.commit or ctx.ref}}|{{ctx.commit or ctx.ref or 'NA'}}>"
-  {% else %}
-    "{{git.owner or 'NA'}} / {{git.repo or 'NA'}} / {{git.ref or 'NA'}} / {{git.commit or 'NA'}}"
-  {% endif %},
+  "text": " ",
 
   "attachments": [
       {
-          "text": "{{ notification.code}}: {{ notification.message | truncate(1000) }}",
+          "text": "{% if notification.code %}{{ notification.code}}: {% endif %}{{ notification.message | truncate(1000) }}",
           "color":
-          {% if level == 1 %}
-            "danger"
-          {% elif level == 2 %}
-            "warning"
-          {% elif level == 3 %}
-            "good"
-          {% else %}
-            "#439FE0"
-          {% endif %}
+              {% if level == 1 %}
+                "danger"
+              {% elif level == 2 %}
+                "warning"
+              {% elif level == 3 %}
+                "good"
+              {% else %}
+                "#439FE0"
+              {% endif %},
+          "footer":
+              {% if ctx.github %}
+                "<https://github.com/{{git.owner}}|{{git.owner or 'NA'}}> / <https://github.com/{{git.owner}}/{{git.repo}}|{{git.repo or 'NA'}}> / <https://github.com/{{git.owner}}/{{git.repo}}/tree/{{git.ref}}|{{git.ref or 'NA'}}> / <https://github.com/{{git.owner}}/{{git.repo}}/commits/{{git.commit or git.ref}}|{{(git.commit or git.ref or 'NA')[0:7]}}>\n"
+              {% else %}
+                "{{git.owner or 'NA'}}/{{git.repo or 'NA'}}/{{git.ref or 'NA'}}/{{(git.commit or 'NA')[0:7]}}"
+              {% endif %},
+          "ts": "{{ notification.date }}"
       }
   ]