Adding stream link to stream alert mails if web if uri is configured.

The generated link shows the messages for the time range the alert is based on. Fixes Graylog2#455
pombredanne · Mar 24, 2014 · 4db4b15 · 4db4b15
1 parent 06dbe8c
commit 4db4b15
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/graylog2-server/src/main/java/org/graylog2/Configuration.java b/graylog2-server/src/main/java/org/graylog2/Configuration.java
@@ -251,6 +251,9 @@ public class Configuration {
     @Parameter(value = "transport_email_from_email", required = false)
     private String emailTransportFromEmail;
 
+    @Parameter(value = "transport_email_web_interface_url", required = false)
+    private URI emailTransportWebInterfaceUrl;
+
     @Parameter(value = "rest_enable_cors", required = false)
     private boolean restEnableCors = false;
 
@@ -567,6 +570,10 @@ public String getEmailTransportFromEmail() {
         return emailTransportFromEmail;
     }
 
+    public URI getEmailTransportWebInterfaceUrl() {
+        return emailTransportWebInterfaceUrl;
+    }
+
     public boolean isRestEnableCors() {
         return restEnableCors;
     }

diff --git a/graylog2-server/src/main/java/org/graylog2/alerts/AlertSender.java b/graylog2-server/src/main/java/org/graylog2/alerts/AlertSender.java
@@ -30,9 +30,11 @@
 import org.graylog2.plugin.alarms.transports.TransportConfigurationException;
 import org.graylog2.streams.StreamImpl;
 import org.graylog2.users.User;
+import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.net.URI;
 import java.util.List;
 
 
@@ -110,6 +112,10 @@ private String buildBody(StreamImpl stream, AlertCondition.CheckResult checkResu
         sb.append("Date: ").append(Tools.iso8601().toString()).append("\n");
         sb.append("Stream ID: ").append(stream.getId()).append("\n");
         sb.append("Stream title: ").append(stream.getTitle()).append("\n");
+        if (core.getConfiguration().getEmailTransportWebInterfaceUrl() != null)
+            sb.append("Stream URL: ").append(
+                    buildStreamDetailsURL(core.getConfiguration().getEmailTransportWebInterfaceUrl(),
+                            checkResult, stream));
         sb.append("Stream rules: ").append(stream.getStreamRules()).append("\n");
         sb.append("Alert triggered at: ").append(checkResult.getTriggeredAt()).append("\n");
         sb.append("Triggered condition: ").append(checkResult.getTriggeredCondition()).append("\n");
@@ -118,6 +124,25 @@ private String buildBody(StreamImpl stream, AlertCondition.CheckResult checkResu
         return sb.toString();
     }
 
+    private String buildStreamDetailsURL(URI baseUri, AlertCondition.CheckResult checkResult, StreamImpl stream) {
+        StringBuilder sb = new StringBuilder();
+
+        int time = 5;
+        if (checkResult.getTriggeredCondition().getParameters().get("time") != null)
+            time = (int)checkResult.getTriggeredCondition().getParameters().get("time");
+
+        DateTime dateAlertEnd = checkResult.getTriggeredAt();
+        DateTime dateAlertStart = dateAlertEnd.minusMinutes(time);
+        String alertStart = Tools.getISO8601String(dateAlertStart);
+        String alertEnd = Tools.getISO8601String(dateAlertEnd);
+
+        sb.append(baseUri).append("/streams/").append(stream.getId()).append("/messages");
+        sb.append("?rangetype=absolute&from=").append(alertStart)
+                .append("&to=").append(alertEnd).append("&q=*\n");
+
+        return sb.toString();
+    }
+
     private String buildBacklogSummary(List<Message> backlog) {
         if (backlog == null || backlog.isEmpty())
             return "";