Merge branch '0.20' of github.com:Graylog2/graylog2-web-interface into 0.20

Author: dennisoelkers

app/controllers/AlertsController.java

@@ -22,15 +22,11 @@
 import com.google.inject.Inject;
 import lib.APIException;
 import lib.ApiClient;
-import models.User;
-import models.UserService;
+import models.*;
 import models.alerts.Alert;
 import models.alerts.AlertCondition;
 import models.alerts.AlertConditionService;
-import models.Stream;
-import models.StreamService;
 import models.api.requests.alerts.CreateAlertConditionRequest;
-import play.Logger;
 import play.mvc.Result;
 
 import java.io.IOException;
@@ -51,6 +47,9 @@ public class AlertsController extends AuthenticatedController {
     @Inject
     private AlertConditionService alertConditionService;
 
+    @Inject
+    private NodeService nodeService;
+
     public Result index(String streamId) {
         try {
             Stream stream = streamService.get(streamId);
@@ -78,7 +77,8 @@ public Result index(String streamId) {
                     alertConditions,
                     totalAlerts,
                     alerts,
-                    users.toString()
+                    users.toString(),
+                    nodeService.loadMasterNode()
             ));
         } catch (IOException e) {
             return status(504, views.html.errors.error.render(ApiClient.ERROR_MSG_IO, e, request()));

app/lib/DateTools.java

@@ -85,4 +85,22 @@ public static String inUserTimeZoneShortFormat(DateTime esDate) {
     public static DateTime nowInUTC() {
         return DateTime.now(DateTimeZone.UTC);
     }
+
+    public static int getUserTimeZoneOffset() {
+        DateTimeZone tz = globalTimezone;
+
+        final User currentUser = UserService.current();
+
+        if (currentUser != null && currentUser.getTimeZone() != null) {
+            tz = currentUser.getTimeZone();
+        }
+
+        int offsetMillis = tz.toTimeZone().getRawOffset() / 1000;
+
+        if (tz.toTimeZone().useDaylightTime()) {
+            offsetMillis += 3600;
+        }
+
+        return (offsetMillis / 60) * -1;
+    }
 }

app/lib/Version.java

@@ -48,8 +48,9 @@ public class Version {
     public static final Version v0_20_2_SNAPSHOT = new Version(0, 20, 2, "snapshot");
     public static final Version v0_20_2_RC_1 = new Version(0, 20, 2, "rc.1");
     public static final Version v0_20_2 = new Version(0, 20, 2);
+    public static final Version v0_20_3 = new Version(0, 20, 3);
 
-    public static final Version VERSION = v0_20_2;
+    public static final Version VERSION = v0_20_3;
 
     public final int major;
     public final int minor;

app/views/alerts/manage.scala.html

@@ -2,7 +2,8 @@
         alertConditions: List[models.alerts.AlertCondition],
         totalAlerts: Long,
         alerts: List[models.alerts.Alert],
-        users: String)
+        users: String,
+        node: Node)
 
 @import lib.security.RestPermissions._
 @import views.helpers.Permissions._
@@ -228,8 +229,9 @@ <h2><i class="icon icon-group"></i> Alert receivers</h2>
     <hr />
 
     <h2><i class="icon icon-bell"></i> Triggered alerts</h2>
-    Showing the most recent alerts. This stream triggered a total of @totalAlerts alerts.
-
+    Showing the most recent alerts. This stream triggered a total of <b>@totalAlerts alerts</b>.<br>
+    Alerts can be retrieved from the server's <a href="@node.getTransportAddress/api-browser#!/Alerts/checkConditions_get_1" target="_blank">API Browser <i class="icon icon-external-link" style="font-size: 11px;"></i></a>,
+        for example to hook them into an existing monitoring system. Learn more in the knowledgebase. @views.html.partials.support.bubble("graylog2-server/polling-for-stream-alerts")
     @if(stream.getAlerts.isEmpty) {
         <div style="margin-top: 10px;" class="alert alert-info">
             This stream has never triggered an alert.

app/views/partials/support/head_bubble.scala.html

@@ -1,8 +1,8 @@
-@(link: String)
+@(link: String, top: Int = 10, left: Int = 0)
 
 <a href="http://support.torch.sh/help/kb/@link"
     class="pull-right"
-    style="position: relative; top: 10px;"
+    style="position: relative; top: @{top}px; left: @{left}px;"
     target="_blank">
 
         <i class="icon icon-lightbulb"></i>

app/views/partials/top.scala.html

@@ -1,10 +1,12 @@
 @import lib.security.RestPermissions._
 @import views.helpers.Permissions._
 @import lib.Configuration
+@import lib.DateTools
 
 <script type="text/javascript">
 // needs to be global!
 gl2AppPathPrefix = "@Configuration.getApplicationContext";
+gl2UserTimeZoneOffset = @DateTools.getUserTimeZoneOffset;
 </script>
 
 <div id="top" class="navbar navbar-fixed-top">

app/views/search/results.scala.html

@@ -163,14 +163,15 @@ <h3>
             new Rickshaw.Graph.Axis.Time({
                 graph: resultGraph,
                 ticksTreatment: "glow",
-                timeFixture: new Rickshaw.Fixtures.Graylog2Time() // Cares about correct TZ handling.
+                timeFixture: new Rickshaw.Fixtures.Graylog2Time(gl2UserTimeZoneOffset) // Cares about correct TZ handling.
             });
         }
 
         new Rickshaw.Graph.HoverDetail({
             graph: resultGraph,
             formatter: function(series, x, y) {
-                var date = '<span class="date">' + new Date(x * 1000 ).toString() + '</span>';
+                var dateMoment = moment(new Date(x * 1000 )).zone(gl2UserTimeZoneOffset);
+                var date = '<span class="date">' + dateMoment.format('ddd MMM DD YYYY HH:mm:ss ZZ') + '</span>';
                 var swatch = '<span class="detail_swatch"></span>';
                 var content = parseInt(y) + ' messages<br>' + date;
                 return content;

app/views/system/nodes/index.scala.html

@@ -141,10 +141,13 @@ <h3>
                     <span class="label label-success node-state" data-toggle="tooltip" title="Marked as ALIVE for load balancers">
                         lb:ALIVE
                     </span>
+                    <span style="margin-left: 4px">@partials.support.bubble("graylog2-server/load-balancer-status")</span>
+
                 } else {
                     <span class="label label-important node-state" data-toggle="tooltip" title="Marked as DEAD for load balancers">
                         lb:DEAD
                     </span>
+                    <span style="margin-left: 4px">@partials.support.bubble("graylog2-server/load-balancer-status")</span>
                 }
             </h3>
 

app/views/system/nodes/show.scala.html

@@ -38,6 +38,7 @@ <h1><i class="icon icon-sitemap"></i> Node @node.getHostname / @node.getShortNod
         <div class="alert alert-info">
             <i class="icon icon-retweet"></i> &nbsp; Lifecycle state:
             <strong>@node.getLifecycle</strong>
+            <span class="pull-right">@partials.support.head_bubble("graylog2-server/load-balancer-status", 0, 19)</span>
         </div>
     </div>
 
@@ -46,12 +47,14 @@ <h1><i class="icon icon-sitemap"></i> Node @node.getHostname / @node.getShortNod
         <div class="row-fluid">
             <div class="alert alert-success">
                 <i class="icon icon-heart"></i> &nbsp; Marked as <strong>ALIVE</strong> for load balancers.
+                <span class="pull-right">@partials.support.head_bubble("graylog2-server/load-balancer-status", 0, 19)</span>
             </div>
         </div>
     } else {
         <div class="row-fluid">
             <div class="alert alert-error">
                 <i class="icon icon-heart"></i> &nbsp; Marked as <strong>DEAD</strong> for load balancers.
+                <span class="pull-right">@partials.support.head_bubble("graylog2-server/load-balancer-status", 0, 19)</span>
             </div>
         </div>
     }

project/Build.scala

@@ -5,7 +5,7 @@ import play.Project._
 object ApplicationBuild extends Build {
 
   val appName         = "graylog2-web-interface"
-  val appVersion      = "0.20.2"
+  val appVersion      = "0.20.3"
 
   val appDependencies = Seq(
     cache,