riemann-dash 0.2.12 → 0.2.13

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c6101ce9bb7b5d9c11c24673be2a5b3c0399f2a3
+  data.tar.gz: e19a97d12f65736cb9137fef3f1dc6b4bcfb59e7
+SHA512:
+  metadata.gz: b762f4b990ec0375e49eab17659ad17ecc03e11c6f3a009aa5045390cff70aafdf60f0a26dca9ed0617b78ed254ad50728445e617060ab9e1964678e385f6c9c
+  data.tar.gz: 7ed47f5330e26204182463aafdadb2371c6d74bbeb51a2c9882259f6aa594f69a3a67d94ea3c572a9a4669a97a092d2a30978df9e01df783566d72eee2b253a0

data/Gemfile.lock

@@ -1,70 +1,35 @@
 PATH
   remote: .
   specs:
-    riemann-dash (0.2.8)
+    riemann-dash (0.2.13)
       erubis (>= 2.7.0)
-      fog
       multi_json (= 1.3.6)
-      riemann-client (>= 0.0.7)
       sass (>= 3.1.14)
-      sinatra (>= 1.3.2)
-      thin (>= 1.3.1)
+      sinatra (~> 1.4.5)
+      webrick (~> 1.3.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    beefcake (0.5.0)
-    builder (3.2.2)
     coderay (1.0.9)
-    daemons (1.1.9)
     erubis (2.7.0)
-    eventmachine (1.0.3)
-    excon (0.31.0)
-    fog (1.19.0)
-      builder
-      excon (~> 0.31.0)
-      formatador (~> 0.2.0)
-      mime-types
-      multi_json (~> 1.0)
-      net-scp (~> 1.1)
-      net-ssh (>= 2.1.3)
-      nokogiri (~> 1.5)
-      ruby-hmac
-    formatador (0.2.4)
     method_source (0.8.1)
-    mime-types (2.0)
-    mini_portile (0.5.2)
-    mtrc (0.0.4)
     multi_json (1.3.6)
-    net-scp (1.1.2)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.7.0)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
     pry (0.9.12)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    rack (1.5.2)
-    rack-protection (1.5.2)
+    rack (1.6.4)
+    rack-protection (1.5.3)
       rack
-    riemann-client (0.2.2)
-      beefcake (>= 0.3.5)
-      mtrc (>= 0.0.4)
-      trollop (>= 1.16.2)
-    ruby-hmac (0.4.0)
-    sass (3.3.2)
-    sinatra (1.4.4)
-      rack (~> 1.4)
+    sass (3.4.22)
+    sinatra (1.4.7)
+      rack (~> 1.5)
       rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
+      tilt (>= 1.3, < 3)
     slop (3.4.3)
-    thin (1.6.2)
-      daemons (>= 1.0.9)
-      eventmachine (>= 1.0.0)
-      rack (>= 1.0.0)
-    tilt (1.4.1)
-    trollop (2.0)
+    tilt (2.0.5)
+    webrick (1.3.1)
 
 PLATFORMS
   ruby
@@ -72,3 +37,6 @@ PLATFORMS
 DEPENDENCIES
   pry
   riemann-dash!
+
+BUNDLED WITH
+   1.10.6

data/README.markdown

@@ -56,7 +56,7 @@ example rackup app is found in "example/config.ru".
 Development
 ===========
 
-    $ git clone git://github.com/aphyr/riemann-dash.git
+    $ git clone git://github.com/riemann/riemann-dash.git
     $ cd riemann-dash
     $ bundle
 

data/lib/riemann/dash/public/toolbar.js

@@ -3,6 +3,14 @@ var toolbar = (function() {
   var toolbar = $('#toolbar');
   var form = $('<form/>');
   toolbar.append(form);
+
+  // Method to adjust the position of the view div
+  var sizeAdjust = function() {
+    $('#view').css('top', toolbar.height() + "px");
+  };
+  $( window ).resize(function() {
+    sizeAdjust();
+  });
  
   var pager = $('<div class="pager">');
   var load = $('<div class="load"><div class="bar load1" /><div class="bar load5" /><span title="1- and 5-second subscription manager load averages">Load</span></div>');
@@ -134,6 +142,7 @@ var toolbar = (function() {
     });
 
     pager.append(add);
+    sizeAdjust();
   };
 
   // Returns a tile for a workspace.

data/lib/riemann/dash/public/vendor/PriorityQueue.js

@@ -7,8 +7,9 @@
  * @author	Augusto Pascutti
  */
 var QueueItem = function(v, p) {
-	this.value    = v;
-	this.priority = p;
+	this.value      = v;
+	this.priority   = p;
+	this.value_JSON = JSON.stringify(v);
 };
 
 /**
@@ -64,8 +65,9 @@ PriorityQueue.prototype = {
 		known = false;
 		idx = 0;
 
+		var value_JSON = JSON.stringify(value);
 		this._queue.forEach(function() {
-			if (JSON.stringify(this._queue[idx].value) === JSON.stringify(value)) {
+			if (this._queue[idx].value_JSON === value_JSON) {
 				this._queue[idx].priority = priority;
 				known = true;
 				return;

data/lib/riemann/dash/public/vendor/flot/jquery.flot.tooltip.js

@@ -0,0 +1,601 @@
+/*
+ * jquery.flot.tooltip
+ * 
+ * description: easy-to-use tooltips for Flot charts
+ * version: 0.8.6
+ * authors: Krzysztof Urbas @krzysu [myviews.pl],Evan Steinkerchner @Roundaround
+ * website: https://github.com/krzysu/flot.tooltip
+ * 
+ * build on 2016-02-25
+ * released under MIT License, 2012
+*/ 
+(function ($) {
+    // plugin options, default values
+    var defaultOptions = {
+        tooltip: {
+            show: false,
+            cssClass: "flotTip",
+            content: "%s | X: %x | Y: %y",
+            // allowed templates are:
+            // %s -> series label,
+            // %c -> series color,
+            // %lx -> x axis label (requires flot-axislabels plugin https://github.com/markrcote/flot-axislabels),
+            // %ly -> y axis label (requires flot-axislabels plugin https://github.com/markrcote/flot-axislabels),
+            // %x -> X value,
+            // %y -> Y value,
+            // %x.2 -> precision of X value,
+            // %p -> percent
+	    // %n -> value (not percent) of pie chart
+            xDateFormat: null,
+            yDateFormat: null,
+            monthNames: null,
+            dayNames: null,
+            shifts: {
+                x: 10,
+                y: 20
+            },
+            defaultTheme: true,
+            snap: true,
+            lines: false,
+            clickTips: false,
+
+            // callbacks
+            onHover: function (flotItem, $tooltipEl) {},
+
+            $compat: false
+        }
+    };
+
+    // dummy default options object for legacy code (<0.8.5) - is deleted later
+    defaultOptions.tooltipOpts = defaultOptions.tooltip;
+
+    // object
+    var FlotTooltip = function (plot) {
+        // variables
+        this.tipPosition = {x: 0, y: 0};
+
+        this.init(plot);
+    };
+
+    // main plugin function
+    FlotTooltip.prototype.init = function (plot) {
+        var that = this;
+
+        // detect other flot plugins
+        var plotPluginsLength = $.plot.plugins.length;
+        this.plotPlugins = [];
+
+        if (plotPluginsLength) {
+            for (var p = 0; p < plotPluginsLength; p++) {
+                this.plotPlugins.push($.plot.plugins[p].name);
+            }
+        }
+
+        plot.hooks.bindEvents.push(function (plot, eventHolder) {
+
+            // get plot options
+            that.plotOptions = plot.getOptions();
+
+            // for legacy (<0.8.5) implementations
+            if (typeof(that.plotOptions.tooltip) === 'boolean') {
+                that.plotOptions.tooltipOpts.show = that.plotOptions.tooltip;
+                that.plotOptions.tooltip = that.plotOptions.tooltipOpts;
+                delete that.plotOptions.tooltipOpts;
+            }
+
+            // if not enabled return
+            if (that.plotOptions.tooltip.show === false || typeof that.plotOptions.tooltip.show === 'undefined') return;
+
+            // shortcut to access tooltip options
+            that.tooltipOptions = that.plotOptions.tooltip;
+
+            if (that.tooltipOptions.$compat) {
+                that.wfunc = 'width';
+                that.hfunc = 'height';
+            } else {
+                that.wfunc = 'innerWidth';
+                that.hfunc = 'innerHeight';
+            }
+
+            // create tooltip DOM element
+            var $tip = that.getDomElement();
+
+            // bind event
+            $( plot.getPlaceholder() ).bind("plothover", plothover);
+            if (that.tooltipOptions.clickTips) {
+                $( plot.getPlaceholder() ).bind("plotclick", plotclick);
+            }
+            that.clickmode = false;
+
+            $(eventHolder).bind('mousemove', mouseMove);
+        });
+
+        plot.hooks.shutdown.push(function (plot, eventHolder){
+            $(plot.getPlaceholder()).unbind("plothover", plothover);
+            $(plot.getPlaceholder()).unbind("plotclick", plotclick);
+            plot.removeTooltip();
+            $(eventHolder).unbind("mousemove", mouseMove);
+        });
+
+        function mouseMove(e){
+            var pos = {};
+            pos.x = e.pageX;
+            pos.y = e.pageY;
+            plot.setTooltipPosition(pos);
+        }
+
+        /**
+         *  open the tooltip (if not already open) and freeze it on the current position till the next click
+         */
+        function plotclick(event, pos, item) {
+            if (! that.clickmode) {
+                // it is the click activating the clicktip
+                plothover(event, pos, item);
+                if (that.getDomElement().is(":visible")) {
+                    $(plot.getPlaceholder()).unbind("plothover", plothover);
+                    that.clickmode = true;
+                }
+            } else {
+                // it is the click deactivating the clicktip
+                $( plot.getPlaceholder() ).bind("plothover", plothover);
+                plot.hideTooltip();
+                that.clickmode = false;
+            }
+        }
+
+        function plothover(event, pos, item) {
+            // Simple distance formula.
+            var lineDistance = function (p1x, p1y, p2x, p2y) {
+                return Math.sqrt((p2x - p1x) * (p2x - p1x) + (p2y - p1y) * (p2y - p1y));
+            };
+
+            // Here is some voodoo magic for determining the distance to a line form a given point {x, y}.
+            var dotLineLength = function (x, y, x0, y0, x1, y1, o) {
+                if (o && !(o =
+                    function (x, y, x0, y0, x1, y1) {
+                        if (typeof x0 !== 'undefined') return { x: x0, y: y };
+                        else if (typeof y0 !== 'undefined') return { x: x, y: y0 };
+
+                        var left,
+                            tg = -1 / ((y1 - y0) / (x1 - x0));
+
+                        return {
+                            x: left = (x1 * (x * tg - y + y0) + x0 * (x * -tg + y - y1)) / (tg * (x1 - x0) + y0 - y1),
+                            y: tg * left - tg * x + y
+                        };
+                    } (x, y, x0, y0, x1, y1),
+                    o.x >= Math.min(x0, x1) && o.x <= Math.max(x0, x1) && o.y >= Math.min(y0, y1) && o.y <= Math.max(y0, y1))
+                ) {
+                    var l1 = lineDistance(x, y, x0, y0), l2 = lineDistance(x, y, x1, y1);
+                    return l1 > l2 ? l2 : l1;
+                } else {
+                    var a = y0 - y1, b = x1 - x0, c = x0 * y1 - y0 * x1;
+                    return Math.abs(a * x + b * y + c) / Math.sqrt(a * a + b * b);
+                }
+            };
+
+            if (item) {
+                plot.showTooltip(item, that.tooltipOptions.snap ? item : pos);
+            } else if (that.plotOptions.series.lines.show && that.tooltipOptions.lines === true) {
+                var maxDistance = that.plotOptions.grid.mouseActiveRadius;
+
+                var closestTrace = {
+                    distance: maxDistance + 1
+                };
+
+                var ttPos = pos;
+
+                $.each(plot.getData(), function (i, series) {
+                    var xBeforeIndex = 0,
+                        xAfterIndex = -1;
+
+                    // Our search here assumes our data is sorted via the x-axis.
+                    // TODO: Improve efficiency somehow - search smaller sets of data.
+                    for (var j = 1; j < series.data.length; j++) {
+                        if (series.data[j - 1][0] <= pos.x && series.data[j][0] >= pos.x) {
+                            xBeforeIndex = j - 1;
+                            xAfterIndex = j;
+                        }
+                    }
+
+                    if (xAfterIndex === -1) {
+                        plot.hideTooltip();
+                        return;
+                    }
+
+                    var pointPrev = { x: series.data[xBeforeIndex][0], y: series.data[xBeforeIndex][1] },
+                        pointNext = { x: series.data[xAfterIndex][0], y: series.data[xAfterIndex][1] };
+
+                    var distToLine = dotLineLength(series.xaxis.p2c(pos.x), series.yaxis.p2c(pos.y), series.xaxis.p2c(pointPrev.x),
+                        series.yaxis.p2c(pointPrev.y), series.xaxis.p2c(pointNext.x), series.yaxis.p2c(pointNext.y), false);
+
+                    if (distToLine < closestTrace.distance) {
+
+                        var closestIndex = lineDistance(pointPrev.x, pointPrev.y, pos.x, pos.y) <
+                            lineDistance(pos.x, pos.y, pointNext.x, pointNext.y) ? xBeforeIndex : xAfterIndex;
+
+                        var pointSize = series.datapoints.pointsize;
+
+                        // Calculate the point on the line vertically closest to our cursor.
+                        var pointOnLine = [
+                            pos.x,
+                            pointPrev.y + ((pointNext.y - pointPrev.y) * ((pos.x - pointPrev.x) / (pointNext.x - pointPrev.x)))
+                        ];
+
+                        var item = {
+                            datapoint: pointOnLine,
+                            dataIndex: closestIndex,
+                            series: series,
+                            seriesIndex: i
+                        };
+
+                        closestTrace = {
+                            distance: distToLine,
+                            item: item
+                        };
+
+                        if (that.tooltipOptions.snap) {
+                            ttPos = {
+                                pageX: series.xaxis.p2c(pointOnLine[0]),
+                                pageY: series.yaxis.p2c(pointOnLine[1])
+                            };
+                        }
+                    }
+                });
+
+                if (closestTrace.distance < maxDistance + 1)
+                    plot.showTooltip(closestTrace.item, ttPos);
+                else
+                    plot.hideTooltip();
+            } else {
+                plot.hideTooltip();
+            }
+        }
+
+        // Quick little function for setting the tooltip position.
+        plot.setTooltipPosition = function (pos) {
+            var $tip = that.getDomElement();
+
+            var totalTipWidth = $tip.outerWidth() + that.tooltipOptions.shifts.x;
+            var totalTipHeight = $tip.outerHeight() + that.tooltipOptions.shifts.y;
+            if ((pos.x - $(window).scrollLeft()) > ($(window)[that.wfunc]() - totalTipWidth)) {
+                pos.x -= totalTipWidth;
+            }
+            if ((pos.y - $(window).scrollTop()) > ($(window)[that.hfunc]() - totalTipHeight)) {
+                pos.y -= totalTipHeight;
+            }
+
+	    /* 
+	       The section applies the new positioning ONLY if pos.x and pos.y
+	       are numbers. If they are undefined or not a number, use the last
+	       known numerical position. This hack fixes a bug that kept pie 
+	       charts from keeping their tooltip positioning.
+	     */
+	    
+            if (isNaN(pos.x)) {
+		that.tipPosition.x = that.tipPosition.xPrev;
+	    }
+	    else {
+		that.tipPosition.x = pos.x;
+		that.tipPosition.xPrev = pos.x;
+	    }
+	    if (isNaN(pos.y)) {
+		that.tipPosition.y = that.tipPosition.yPrev;
+	    }
+	    else {
+		that.tipPosition.y = pos.y;
+		that.tipPosition.yPrev = pos.y;
+	    }
+	    
+        };
+
+        // Quick little function for showing the tooltip.
+        plot.showTooltip = function (target, position, targetPosition) {
+            var $tip = that.getDomElement();
+
+            // convert tooltip content template to real tipText
+            var tipText = that.stringFormat(that.tooltipOptions.content, target);
+            if (tipText === '')
+                return;
+
+            $tip.html(tipText);
+            plot.setTooltipPosition({ x: position.pageX, y: position.pageY });
+            $tip.css({
+                left: that.tipPosition.x + that.tooltipOptions.shifts.x,
+                top: that.tipPosition.y + that.tooltipOptions.shifts.y
+            }).show();
+
+            // run callback
+            if (typeof that.tooltipOptions.onHover === 'function') {
+                that.tooltipOptions.onHover(target, $tip);
+            }
+        };
+
+        // Quick little function for hiding the tooltip.
+        plot.hideTooltip = function () {
+            that.getDomElement().hide().html('');
+        };
+
+        plot.removeTooltip = function() {
+            that.getDomElement().remove();
+        };
+    };
+
+    /**
+     * get or create tooltip DOM element
+     * @return jQuery object
+     */
+    FlotTooltip.prototype.getDomElement = function () {
+        var $tip = $('.' + this.tooltipOptions.cssClass);
+
+        if( $tip.length === 0 ){
+            $tip = $('<div />').addClass(this.tooltipOptions.cssClass);
+            $tip.appendTo('body').hide().css({position: 'absolute'});
+
+            if(this.tooltipOptions.defaultTheme) {
+                $tip.css({
+                    'background': '#fff',
+                    'z-index': '1040',
+                    'padding': '0.4em 0.6em',
+                    'border-radius': '0.5em',
+                    'font-size': '0.8em',
+                    'border': '1px solid #111',
+                    'display': 'none',
+                    'white-space': 'nowrap'
+                });
+            }
+        }
+
+        return $tip;
+    };
+
+    /**
+     * core function, create tooltip content
+     * @param  {string} content - template with tooltip content
+     * @param  {object} item - Flot item
+     * @return {string} real tooltip content for current item
+     */
+    FlotTooltip.prototype.stringFormat = function (content, item) {
+        var percentPattern = /%p\.{0,1}(\d{0,})/;
+        var seriesPattern = /%s/;
+        var colorPattern = /%c/;
+        var xLabelPattern = /%lx/; // requires flot-axislabels plugin https://github.com/markrcote/flot-axislabels, will be ignored if plugin isn't loaded
+        var yLabelPattern = /%ly/; // requires flot-axislabels plugin https://github.com/markrcote/flot-axislabels, will be ignored if plugin isn't loaded
+        var xPattern = /%x\.{0,1}(\d{0,})/;
+        var yPattern = /%y\.{0,1}(\d{0,})/;
+        var xPatternWithoutPrecision = "%x";
+        var yPatternWithoutPrecision = "%y";
+        var customTextPattern = "%ct";
+	var nPiePattern = "%n";
+	
+        var x, y, customText, p, n;
+
+        // for threshold plugin we need to read data from different place
+        if (typeof item.series.threshold !== "undefined") {
+            x = item.datapoint[0];
+            y = item.datapoint[1];
+            customText = item.datapoint[2];
+	}
+
+	// for CurvedLines plugin we need to read data from different place
+	    else if (typeof item.series.curvedLines !== "undefined") {
+		x = item.datapoint[0];
+		y = item.datapoint[1];
+	    }
+	    
+        else if (typeof item.series.lines !== "undefined" && item.series.lines.steps) {
+            x = item.series.datapoints.points[item.dataIndex * 2];
+            y = item.series.datapoints.points[item.dataIndex * 2 + 1];
+            // TODO: where to find custom text in this variant?
+            customText = "";
+        } else {
+            x = item.series.data[item.dataIndex][0];
+            y = item.series.data[item.dataIndex][1];
+            customText = item.series.data[item.dataIndex][2];
+        }
+
+        // I think this is only in case of threshold plugin
+        if (item.series.label === null && item.series.originSeries) {
+            item.series.label = item.series.originSeries.label;
+        }
+
+        // if it is a function callback get the content string
+        if (typeof(content) === 'function') {
+            content = content(item.series.label, x, y, item);
+        }
+
+        // the case where the passed content is equal to false
+        if (typeof(content) === 'boolean' && !content) {
+            return '';
+        }
+
+	/* replacement of %ct and other multi-character templates must
+	   precede the replacement of single-character templates 
+	   to avoid conflict between '%c' and '%ct'  and similar substrings
+	*/
+	if (customText)
+            content = content.replace(customTextPattern, customText);
+
+        // percent match for pie charts and stacked percent
+        if (typeof (item.series.percent) !== 'undefined') {
+            p = item.series.percent;
+        } else if (typeof (item.series.percents) !== 'undefined') {
+            p = item.series.percents[item.dataIndex];
+        }        
+        if (typeof p === 'number') {
+            content = this.adjustValPrecision(percentPattern, content, p);
+        }
+
+	// replace %n with number of items represented by slice in pie charts
+	if (item.series.hasOwnProperty('pie')) {
+	    if (typeof (item.series.data[0][1] !== 'undefined')) {
+		n = item.series.data[0][1];
+	    }
+	}
+	if (typeof n === 'number') {
+            content = content.replace(nPiePattern, n);
+	}
+	
+        // series match
+        if (typeof(item.series.label) !== 'undefined') {
+            content = content.replace(seriesPattern, item.series.label);
+        } else {
+            //remove %s if label is undefined
+            content = content.replace(seriesPattern, "");
+        }
+        
+        // color match
+        if (typeof(item.series.color) !== 'undefined') {
+            content = content.replace(colorPattern, item.series.color);
+        } else {
+            //remove %s if color is undefined
+            content = content.replace(colorPattern, "");
+        }
+
+        // x axis label match
+        if (this.hasAxisLabel('xaxis', item)) {
+            content = content.replace(xLabelPattern, item.series.xaxis.options.axisLabel);
+        } else {
+            //remove %lx if axis label is undefined or axislabels plugin not present
+            content = content.replace(xLabelPattern, "");
+        }
+
+        // y axis label match
+        if (this.hasAxisLabel('yaxis', item)) {
+            content = content.replace(yLabelPattern, item.series.yaxis.options.axisLabel);
+        } else {
+            //remove %ly if axis label is undefined or axislabels plugin not present
+            content = content.replace(yLabelPattern, "");
+        }
+
+        // time mode axes with custom dateFormat
+        if (this.isTimeMode('xaxis', item) && this.isXDateFormat(item)) {
+            content = content.replace(xPattern, this.timestampToDate(x, this.tooltipOptions.xDateFormat, item.series.xaxis.options));
+        }
+        if (this.isTimeMode('yaxis', item) && this.isYDateFormat(item)) {
+            content = content.replace(yPattern, this.timestampToDate(y, this.tooltipOptions.yDateFormat, item.series.yaxis.options));
+        }
+
+        // set precision if defined
+        if (typeof x === 'number') {
+            content = this.adjustValPrecision(xPattern, content, x);
+        }
+        if (typeof y === 'number') {
+            content = this.adjustValPrecision(yPattern, content, y);
+        }
+
+        // change x from number to given label, if given
+        if (typeof item.series.xaxis.ticks !== 'undefined') {
+
+            var ticks;
+            if (this.hasRotatedXAxisTicks(item)) {
+                // xaxis.ticks will be an empty array if tickRotor is being used, but the values are available in rotatedTicks
+                ticks = 'rotatedTicks';
+            } else {
+                ticks = 'ticks';
+            }
+
+            // see https://github.com/krzysu/flot.tooltip/issues/65
+            var tickIndex = item.dataIndex + item.seriesIndex;
+
+            for (var xIndex in item.series.xaxis[ticks]) {
+                if (item.series.xaxis[ticks].hasOwnProperty(tickIndex) && !this.isTimeMode('xaxis', item)) {
+                    var valueX = (this.isCategoriesMode('xaxis', item)) ? item.series.xaxis[ticks][tickIndex].label : item.series.xaxis[ticks][tickIndex].v;
+                    if (valueX === x) {
+                        content = content.replace(xPattern, item.series.xaxis[ticks][tickIndex].label.replace(/\$/g, '$$$$'));
+                    }
+                }
+            }
+        }
+
+        // change y from number to given label, if given
+        if (typeof item.series.yaxis.ticks !== 'undefined') {
+            for (var yIndex in item.series.yaxis.ticks) {
+                if (item.series.yaxis.ticks.hasOwnProperty(yIndex)) {
+                    var valueY = (this.isCategoriesMode('yaxis', item)) ? item.series.yaxis.ticks[yIndex].label : item.series.yaxis.ticks[yIndex].v;
+                    if (valueY === y) {
+                        content = content.replace(yPattern, item.series.yaxis.ticks[yIndex].label.replace(/\$/g, '$$$$'));
+                    }
+                }
+            }
+        }
+
+        // if no value customization, use tickFormatter by default
+        if (typeof item.series.xaxis.tickFormatter !== 'undefined') {
+            //escape dollar
+            content = content.replace(xPatternWithoutPrecision, item.series.xaxis.tickFormatter(x, item.series.xaxis).replace(/\$/g, '$$'));
+        }
+        if (typeof item.series.yaxis.tickFormatter !== 'undefined') {
+            //escape dollar
+            content = content.replace(yPatternWithoutPrecision, item.series.yaxis.tickFormatter(y, item.series.yaxis).replace(/\$/g, '$$'));
+        }
+
+        return content;
+    };
+
+    // helpers just for readability
+    FlotTooltip.prototype.isTimeMode = function (axisName, item) {
+        return (typeof item.series[axisName].options.mode !== 'undefined' && item.series[axisName].options.mode === 'time');
+    };
+
+    FlotTooltip.prototype.isXDateFormat = function (item) {
+        return (typeof this.tooltipOptions.xDateFormat !== 'undefined' && this.tooltipOptions.xDateFormat !== null);
+    };
+
+    FlotTooltip.prototype.isYDateFormat = function (item) {
+        return (typeof this.tooltipOptions.yDateFormat !== 'undefined' && this.tooltipOptions.yDateFormat !== null);
+    };
+
+    FlotTooltip.prototype.isCategoriesMode = function (axisName, item) {
+        return (typeof item.series[axisName].options.mode !== 'undefined' && item.series[axisName].options.mode === 'categories');
+    };
+
+    //
+    FlotTooltip.prototype.timestampToDate = function (tmst, dateFormat, options) {
+        var theDate = $.plot.dateGenerator(tmst, options);
+        return $.plot.formatDate(theDate, dateFormat, this.tooltipOptions.monthNames, this.tooltipOptions.dayNames);
+    };
+
+    //
+    FlotTooltip.prototype.adjustValPrecision = function (pattern, content, value) {
+
+        var precision;
+        var matchResult = content.match(pattern);
+        if( matchResult !== null ) {
+            if(RegExp.$1 !== '') {
+                precision = RegExp.$1;
+                value = value.toFixed(precision);
+
+                // only replace content if precision exists, in other case use thickformater
+                content = content.replace(pattern, value);
+            }
+        }
+        return content;
+    };
+
+    // other plugins detection below
+
+    // check if flot-axislabels plugin (https://github.com/markrcote/flot-axislabels) is used and that an axis label is given
+    FlotTooltip.prototype.hasAxisLabel = function (axisName, item) {
+        return ($.inArray('axisLabels', this.plotPlugins) !== -1 && typeof item.series[axisName].options.axisLabel !== 'undefined' && item.series[axisName].options.axisLabel.length > 0);
+    };
+
+    // check whether flot-tickRotor, a plugin which allows rotation of X-axis ticks, is being used
+    FlotTooltip.prototype.hasRotatedXAxisTicks = function (item) {
+        return ($.inArray('tickRotor',this.plotPlugins) !== -1 && typeof item.series.xaxis.rotatedTicks !== 'undefined');
+    };
+
+    //
+    var init = function (plot) {
+      new FlotTooltip(plot);
+    };
+
+    // define Flot plugin
+    $.plot.plugins.push({
+        init: init,
+        options: defaultOptions,
+        name: 'tooltip',
+        version: '0.8.5'
+    });
+
+})(jQuery);

data/lib/riemann/dash/public/vendor/flot/jquery.flot.tooltip.min.js

@@ -0,0 +1,12 @@
+/*
+ * jquery.flot.tooltip
+ * 
+ * description: easy-to-use tooltips for Flot charts
+ * version: 0.8.6
+ * authors: Krzysztof Urbas @krzysu [myviews.pl],Evan Steinkerchner @Roundaround
+ * website: https://github.com/krzysu/flot.tooltip
+ * 
+ * build on 2016-02-25
+ * released under MIT License, 2012
+*/ 
+!function(a){var b={tooltip:{show:!1,cssClass:"flotTip",content:"%s | X: %x | Y: %y",xDateFormat:null,yDateFormat:null,monthNames:null,dayNames:null,shifts:{x:10,y:20},defaultTheme:!0,snap:!0,lines:!1,clickTips:!1,onHover:function(a,b){},$compat:!1}};b.tooltipOpts=b.tooltip;var c=function(a){this.tipPosition={x:0,y:0},this.init(a)};c.prototype.init=function(b){function c(a){var c={};c.x=a.pageX,c.y=a.pageY,b.setTooltipPosition(c)}function d(c,d,g){f.clickmode?(a(b.getPlaceholder()).bind("plothover",e),b.hideTooltip(),f.clickmode=!1):(e(c,d,g),f.getDomElement().is(":visible")&&(a(b.getPlaceholder()).unbind("plothover",e),f.clickmode=!0))}function e(c,d,e){var g=function(a,b,c,d){return Math.sqrt((c-a)*(c-a)+(d-b)*(d-b))},h=function(a,b,c,d,e,f,h){if(!h||(h=function(a,b,c,d,e,f){if("undefined"!=typeof c)return{x:c,y:b};if("undefined"!=typeof d)return{x:a,y:d};var g,h=-1/((f-d)/(e-c));return{x:g=(e*(a*h-b+d)+c*(a*-h+b-f))/(h*(e-c)+d-f),y:h*g-h*a+b}}(a,b,c,d,e,f),h.x>=Math.min(c,e)&&h.x<=Math.max(c,e)&&h.y>=Math.min(d,f)&&h.y<=Math.max(d,f))){var i=d-f,j=e-c,k=c*f-d*e;return Math.abs(i*a+j*b+k)/Math.sqrt(i*i+j*j)}var l=g(a,b,c,d),m=g(a,b,e,f);return l>m?m:l};if(e)b.showTooltip(e,f.tooltipOptions.snap?e:d);else if(f.plotOptions.series.lines.show&&f.tooltipOptions.lines===!0){var i=f.plotOptions.grid.mouseActiveRadius,j={distance:i+1},k=d;a.each(b.getData(),function(a,c){for(var e=0,i=-1,l=1;l<c.data.length;l++)c.data[l-1][0]<=d.x&&c.data[l][0]>=d.x&&(e=l-1,i=l);if(-1===i)return void b.hideTooltip();var m={x:c.data[e][0],y:c.data[e][1]},n={x:c.data[i][0],y:c.data[i][1]},o=h(c.xaxis.p2c(d.x),c.yaxis.p2c(d.y),c.xaxis.p2c(m.x),c.yaxis.p2c(m.y),c.xaxis.p2c(n.x),c.yaxis.p2c(n.y),!1);if(o<j.distance){var p=g(m.x,m.y,d.x,d.y)<g(d.x,d.y,n.x,n.y)?e:i,q=(c.datapoints.pointsize,[d.x,m.y+(n.y-m.y)*((d.x-m.x)/(n.x-m.x))]),r={datapoint:q,dataIndex:p,series:c,seriesIndex:a};j={distance:o,item:r},f.tooltipOptions.snap&&(k={pageX:c.xaxis.p2c(q[0]),pageY:c.yaxis.p2c(q[1])})}}),j.distance<i+1?b.showTooltip(j.item,k):b.hideTooltip()}else b.hideTooltip()}var f=this,g=a.plot.plugins.length;if(this.plotPlugins=[],g)for(var h=0;g>h;h++)this.plotPlugins.push(a.plot.plugins[h].name);b.hooks.bindEvents.push(function(b,g){if(f.plotOptions=b.getOptions(),"boolean"==typeof f.plotOptions.tooltip&&(f.plotOptions.tooltipOpts.show=f.plotOptions.tooltip,f.plotOptions.tooltip=f.plotOptions.tooltipOpts,delete f.plotOptions.tooltipOpts),f.plotOptions.tooltip.show!==!1&&"undefined"!=typeof f.plotOptions.tooltip.show){f.tooltipOptions=f.plotOptions.tooltip,f.tooltipOptions.$compat?(f.wfunc="width",f.hfunc="height"):(f.wfunc="innerWidth",f.hfunc="innerHeight");f.getDomElement();a(b.getPlaceholder()).bind("plothover",e),f.tooltipOptions.clickTips&&a(b.getPlaceholder()).bind("plotclick",d),f.clickmode=!1,a(g).bind("mousemove",c)}}),b.hooks.shutdown.push(function(b,f){a(b.getPlaceholder()).unbind("plothover",e),a(b.getPlaceholder()).unbind("plotclick",d),b.removeTooltip(),a(f).unbind("mousemove",c)}),b.setTooltipPosition=function(b){var c=f.getDomElement(),d=c.outerWidth()+f.tooltipOptions.shifts.x,e=c.outerHeight()+f.tooltipOptions.shifts.y;b.x-a(window).scrollLeft()>a(window)[f.wfunc]()-d&&(b.x-=d),b.y-a(window).scrollTop()>a(window)[f.hfunc]()-e&&(b.y-=e),isNaN(b.x)?f.tipPosition.x=f.tipPosition.xPrev:(f.tipPosition.x=b.x,f.tipPosition.xPrev=b.x),isNaN(b.y)?f.tipPosition.y=f.tipPosition.yPrev:(f.tipPosition.y=b.y,f.tipPosition.yPrev=b.y)},b.showTooltip=function(a,c,d){var e=f.getDomElement(),g=f.stringFormat(f.tooltipOptions.content,a);""!==g&&(e.html(g),b.setTooltipPosition({x:c.pageX,y:c.pageY}),e.css({left:f.tipPosition.x+f.tooltipOptions.shifts.x,top:f.tipPosition.y+f.tooltipOptions.shifts.y}).show(),"function"==typeof f.tooltipOptions.onHover&&f.tooltipOptions.onHover(a,e))},b.hideTooltip=function(){f.getDomElement().hide().html("")},b.removeTooltip=function(){f.getDomElement().remove()}},c.prototype.getDomElement=function(){var b=a("."+this.tooltipOptions.cssClass);return 0===b.length&&(b=a("<div />").addClass(this.tooltipOptions.cssClass),b.appendTo("body").hide().css({position:"absolute"}),this.tooltipOptions.defaultTheme&&b.css({background:"#fff","z-index":"1040",padding:"0.4em 0.6em","border-radius":"0.5em","font-size":"0.8em",border:"1px solid #111",display:"none","white-space":"nowrap"})),b},c.prototype.stringFormat=function(a,b){var c,d,e,f,g,h=/%p\.{0,1}(\d{0,})/,i=/%s/,j=/%c/,k=/%lx/,l=/%ly/,m=/%x\.{0,1}(\d{0,})/,n=/%y\.{0,1}(\d{0,})/,o="%x",p="%y",q="%ct",r="%n";if("undefined"!=typeof b.series.threshold?(c=b.datapoint[0],d=b.datapoint[1],e=b.datapoint[2]):"undefined"!=typeof b.series.curvedLines?(c=b.datapoint[0],d=b.datapoint[1]):"undefined"!=typeof b.series.lines&&b.series.lines.steps?(c=b.series.datapoints.points[2*b.dataIndex],d=b.series.datapoints.points[2*b.dataIndex+1],e=""):(c=b.series.data[b.dataIndex][0],d=b.series.data[b.dataIndex][1],e=b.series.data[b.dataIndex][2]),null===b.series.label&&b.series.originSeries&&(b.series.label=b.series.originSeries.label),"function"==typeof a&&(a=a(b.series.label,c,d,b)),"boolean"==typeof a&&!a)return"";if(e&&(a=a.replace(q,e)),"undefined"!=typeof b.series.percent?f=b.series.percent:"undefined"!=typeof b.series.percents&&(f=b.series.percents[b.dataIndex]),"number"==typeof f&&(a=this.adjustValPrecision(h,a,f)),b.series.hasOwnProperty("pie")&&(g=b.series.data[0][1]),"number"==typeof g&&(a=a.replace(r,g)),a="undefined"!=typeof b.series.label?a.replace(i,b.series.label):a.replace(i,""),a="undefined"!=typeof b.series.color?a.replace(j,b.series.color):a.replace(j,""),a=this.hasAxisLabel("xaxis",b)?a.replace(k,b.series.xaxis.options.axisLabel):a.replace(k,""),a=this.hasAxisLabel("yaxis",b)?a.replace(l,b.series.yaxis.options.axisLabel):a.replace(l,""),this.isTimeMode("xaxis",b)&&this.isXDateFormat(b)&&(a=a.replace(m,this.timestampToDate(c,this.tooltipOptions.xDateFormat,b.series.xaxis.options))),this.isTimeMode("yaxis",b)&&this.isYDateFormat(b)&&(a=a.replace(n,this.timestampToDate(d,this.tooltipOptions.yDateFormat,b.series.yaxis.options))),"number"==typeof c&&(a=this.adjustValPrecision(m,a,c)),"number"==typeof d&&(a=this.adjustValPrecision(n,a,d)),"undefined"!=typeof b.series.xaxis.ticks){var s;s=this.hasRotatedXAxisTicks(b)?"rotatedTicks":"ticks";var t=b.dataIndex+b.seriesIndex;for(var u in b.series.xaxis[s])if(b.series.xaxis[s].hasOwnProperty(t)&&!this.isTimeMode("xaxis",b)){var v=this.isCategoriesMode("xaxis",b)?b.series.xaxis[s][t].label:b.series.xaxis[s][t].v;v===c&&(a=a.replace(m,b.series.xaxis[s][t].label.replace(/\$/g,"$$$$")))}}if("undefined"!=typeof b.series.yaxis.ticks)for(var w in b.series.yaxis.ticks)if(b.series.yaxis.ticks.hasOwnProperty(w)){var x=this.isCategoriesMode("yaxis",b)?b.series.yaxis.ticks[w].label:b.series.yaxis.ticks[w].v;x===d&&(a=a.replace(n,b.series.yaxis.ticks[w].label.replace(/\$/g,"$$$$")))}return"undefined"!=typeof b.series.xaxis.tickFormatter&&(a=a.replace(o,b.series.xaxis.tickFormatter(c,b.series.xaxis).replace(/\$/g,"$$"))),"undefined"!=typeof b.series.yaxis.tickFormatter&&(a=a.replace(p,b.series.yaxis.tickFormatter(d,b.series.yaxis).replace(/\$/g,"$$"))),a},c.prototype.isTimeMode=function(a,b){return"undefined"!=typeof b.series[a].options.mode&&"time"===b.series[a].options.mode},c.prototype.isXDateFormat=function(a){return"undefined"!=typeof this.tooltipOptions.xDateFormat&&null!==this.tooltipOptions.xDateFormat},c.prototype.isYDateFormat=function(a){return"undefined"!=typeof this.tooltipOptions.yDateFormat&&null!==this.tooltipOptions.yDateFormat},c.prototype.isCategoriesMode=function(a,b){return"undefined"!=typeof b.series[a].options.mode&&"categories"===b.series[a].options.mode},c.prototype.timestampToDate=function(b,c,d){var e=a.plot.dateGenerator(b,d);return a.plot.formatDate(e,c,this.tooltipOptions.monthNames,this.tooltipOptions.dayNames)},c.prototype.adjustValPrecision=function(a,b,c){var d,e=b.match(a);return null!==e&&""!==RegExp.$1&&(d=RegExp.$1,c=c.toFixed(d),b=b.replace(a,c)),b},c.prototype.hasAxisLabel=function(b,c){return-1!==a.inArray("axisLabels",this.plotPlugins)&&"undefined"!=typeof c.series[b].options.axisLabel&&c.series[b].options.axisLabel.length>0},c.prototype.hasRotatedXAxisTicks=function(b){return-1!==a.inArray("tickRotor",this.plotPlugins)&&"undefined"!=typeof b.series.xaxis.rotatedTicks};var d=function(a){new c(a)};a.plot.plugins.push({init:d,options:b,name:"tooltip",version:"0.8.5"})}(jQuery);

data/lib/riemann/dash/public/views/flot.js

@@ -10,6 +10,7 @@
       this.graphType = json.graphType || 'line';
       this.stackMode = json.stackMode || 'false';
       this.lineWidth = json.lineWidth || 1;
+      this.tooltips = json.tooltips || 'metric';
       this.timeRange = (json.timeRange * 1000) || 300000;
       
       this.font = {
@@ -82,7 +83,7 @@
 
       // Initialize Flot
       this.container.empty();
-      this.graph = $.plot(this.container, this.data, {
+      var plotOptions = {
         legend: {
           position: "nw",
           backgroundOpacity: 0.7,
@@ -91,7 +92,7 @@
           borderWidth: 1,
           borderColor: "#aaa",
           color: "#444",
-          backgroundColor: '#fff'
+          backgroundColor: '#fff',
         },
         yaxis: {
           font: this.font,
@@ -104,7 +105,36 @@
           min: t - this.timeRange,
           max: t
         }
-      });
+      };
+
+      var tooltipCommon = {
+        grid: {
+          hoverable: true,
+          autoHighlight: true,
+        }
+      };
+
+      var tooltipOption = {
+        metric: {
+          tooltip: {
+            show: true,
+            content: "<b>%s</b><br />%x<br />%y",
+          }
+        },
+        simple: {
+          tooltip: {
+            show: true,
+            content: "<b>%s</b>",
+          }
+        }
+      };
+
+      if (this.tooltips != 'false') {
+        _.merge(plotOptions, tooltipCommon);
+        _.merge(plotOptions, tooltipOption[this.tooltips]);
+      }
+
+      this.graph = $.plot(this.container, this.data, plotOptions);
     };
 
     // Called as the clock advances to new times.
@@ -246,7 +276,8 @@
         max: this.max,
         timeRange: this.timeRange / 1000,
         graphType: this.graphType,
-        stackMode: this.stackMode
+        stackMode: this.stackMode,
+        tooltips: this.tooltips,
       });
     };
 
@@ -263,7 +294,15 @@
       '<select name="stackMode">' +
         '<option value="true" {% if(stackMode == \'true\') print(\'selected\') %}>Stacked</option>' +
         '<option value="false" {% if(stackMode == \'false\') print(\'selected\') %}>Normal</option>' +
-      '</select><br />' +
+      '</select>' +
+      '<br />' +
+      '<label for="tooltips">Tooltips</label>' +
+      '<select name="tooltips">' +
+        '<option value="metric" {% if(tooltips == \'metric\') print(\'selected\') %}>With metric</option>' +
+        '<option value="simple" {% if(tooltips == \'simple\') print(\'selected\') %}>Simple</option>' +
+        '<option value="false" {% if(tooltips == \'false\') print(\'selected\') %}>Disabled</option>' +
+      '</select>' +
+      '<br />' +
       '<label for="query">query</label>' +
       '<textarea type="text" class="query" name="query">{{ query }}</textarea><br />' +
       '<label for="timeRange">Time range (s)</label>' +

data/lib/riemann/dash/public/views/geiger.js

@@ -0,0 +1,151 @@
+var GlobalAudioContext = new (window.AudioContext || window.webkitAudioContext)();
+
+(function() {
+  var Geiger = function(json) {
+    // Init
+    view.View.call(this, json);
+
+    this.clickFocusable = true;
+    this.selfid = Math.floor(Math.random() * 255);
+
+    var self = this;
+
+    // Config
+    this.title = json.title;
+    this.query = json.query;
+    this.muted = json.muted || false;
+    this.volume = parseFloat(json.volume || 0.2);
+    this.sound = json.sound || 'sounds/geiger.wav';
+    this.muted = json.muted || false;
+
+    // State
+    this.currentEvent = null;
+    this.shouldPlay = false;
+    this.soundBuffer = null;
+
+    // HTML
+    this.el.append(
+        '<div class="box">' +
+        '<h2 class="quickfit"></h2>' +
+        '<button class="sound-mute" type="button">Mute</button><br />' +
+        '</div>'
+        );
+
+    this.box = this.el.find('.box');
+    this.el.find('h2').text(this.title);
+
+    this.mute_button = this.el.find('.sound-mute');
+    this.mute_button.text(this.muted ? 'Unmute' : 'Mute');
+    this.mute_button.click(function () {
+      self.muted = !self.muted;
+      self.mute_button.text(self.muted ? 'Unmute' : 'Mute');
+    });
+
+    if (!json.virtual) {
+      // Virtual instance of the geiger counter should not produce any sounds.
+      // Moreover, to save resources, I will not create audio nodes and will
+      // not load data.
+      this.gainer = GlobalAudioContext.createGain();
+
+      this.gainer.gain.value = Math.pow(this.volume, 2);
+      this.gainer.connect(GlobalAudioContext.destination);
+
+      this.compressor = GlobalAudioContext.createDynamicsCompressor();
+      this.compressor.threshold.value = 0;
+      this.compressor.knee.value = 0;
+      this.compressor.ratio.value = 20;
+      this.compressor.attack.value = 0;
+      this.compressor.release.value = 2;
+      this.compressor.connect(this.gainer);
+
+      this.request = new XMLHttpRequest();
+      this.request.open('GET', this.sound, true);
+      this.request.responseType = 'arraybuffer';
+
+      this.request.onload = function () {
+        if (this.status != 200) {
+          toastr.warning ("Could not load sound " + self.sound + ", HTTP status " + this.status);
+        }
+
+        GlobalAudioContext.decodeAudioData(this.response, function (buffer) {
+          self.soundBuffer = buffer;
+          self.shouldPlay = true;
+        });
+      };
+
+      this.request.onerror = function () {
+        toastr.warning ("Could not load sound " + self.sound + ", general error");
+      }
+
+      this.request.send();
+
+      if (this.query) {
+        var me = this;
+        this.sub = subs.subscribe(this.query, function(e) {
+          self.playSound();
+          self.currentEvent = e;
+        });
+      }
+    }
+  }
+
+  view.inherit(view.View, Geiger);
+  view.Geiger = Geiger;
+  view.types.Geiger = Geiger;
+
+  Geiger.prototype.json = function() {
+    return $.extend(view.View.prototype.json.call(this), {
+      type: 'Geiger',
+           title: this.title,
+           query: this.query,
+           volume: this.volume,
+           sound: this.sound,
+           muted: this.muted
+    });
+  }
+
+  Geiger.prototype.playSound = function() {
+    if (!this.shouldPlay || this.muted) {
+      return;
+    }
+
+    source = GlobalAudioContext.createBufferSource();
+    source.buffer = this.soundBuffer;
+    source.connect(this.compressor);
+    source.start();
+  }
+
+
+  var editTemplate = _.template(
+      "<label for='title'>Title</label>" +
+      "<input type='text' name='title' value='{{title}}' /><br />" +
+      "<label for='query'>Query</label>" +
+      '<textarea type="text" name="query" class="query">{{query}}</textarea>' +
+      "<label for='sound'>Sound</label>" +
+      "<input type='text' name='sound' value='{{sound}}' /><br />" +
+      "<label for='volume'>Volume</label>" +
+      "<input type='range' name='volume' min='0' max='1' step='0.05' value='{{volume}}' />" );
+
+  Geiger.prototype.editForm = function() {
+    return editTemplate(this);
+  }
+
+  Geiger.prototype.shutdownSound = function() {
+    this.shouldPlay = false;
+    this.gainer.disconnect();
+    this.compressor.disconnect();
+    this.gainer = null;
+    this.compressor = null;
+
+    this.soundBuffer = null;
+  }
+
+  Geiger.prototype.delete = function() {
+    if (this.sub) {
+      subs.unsubscribe(this.sub);
+    }
+
+    this.shutdownSound();
+    return view.View.prototype.delete.call(this);
+  }
+})();

data/lib/riemann/dash/public/views/help.js

@@ -5,8 +5,9 @@
       this.el.addClass("help");
       this.el.append('<div class="box">' +
         "<p>Welcome to Riemann-Dash.</p>" +
-        "<p>Need a refresher on the query language? See the <a href=\"https://github.com/aphyr/riemann/blob/master/test/riemann/query_test.clj\">query tests</a> for examples, or read the <a href=\"https://github.com/aphyr/riemann/blob/master/src/riemann/Query.g\">spec</a>.</p>" +
-        "<p>Press <b>Control/Meta+click</b>  to select a view. Escape unfocuses. Use the arrow keys to move a view. Use Control+arrow to <i>split</i> a view in the given direction.</p>" +
+        "<p>Need a refresher on the query language? See the <a href=\"https://github.com/riemann/riemann/blob/master/test/riemann/query_test.clj\">query tests</a> for examples, or read the <a href=\"https://github.com/riemann/riemann/blob/master/resources/query.g4\">spec</a>.</p>" +
+        "<p>Double-click a workspace to rename it.</p>" +
+        "<p>Press <b>Control/Meta+click</b> to select a view (<b>Option+Command+click</b> on a Mac). Escape unfocuses. Use the arrow keys to move a view. Use Control+arrow to <i>split</i> a view in the given direction.</p>" +
         "<p>To edit a view, hit e. Use enter, or click 'apply', to apply your changes. Escape cancels.</p>" +
         "<p>To save your changes to the server, press s. To display the configuration, press c.</p>" +
         "<p>You can refresh the page, or press r to reload.</p>" +

data/lib/riemann/dash/public/views/log.js

@@ -24,7 +24,7 @@
       this.log = this.el.find('tbody');
 
       // Line template
-      this.lineTemplate = _.template("<tr><td>{{host}}</td><td>{{service}}</td><td>{{state}}</td><td>{{metric}}</td><td>{{description}}</td></tr>");
+      this.lineTemplate = _.template("<tr><td>{{-host}}</td><td>{{-service}}</td><td>{{-state}}</td><td>{{-metric}}</td><td>{{-description}}</td></tr>");
 
       // When scrolling occurs, toggle tracking state.
       this.scroll.scroll(function(e) {

data/lib/riemann/dash/version.rb

@@ -1,4 +1,4 @@
 module Riemann; end
 module Riemann::Dash
-  VERSION = '0.2.12'
+  VERSION = '0.2.13'
 end

data/lib/riemann/dash/views/css.scss

@@ -45,7 +45,7 @@ html,table {
 }
 
 #toolbar {
-  height: 28px;
+  height: auto;
   overflow: hidden;
   position: absolute;
   top: 3px;

data/lib/riemann/dash/views/index.erubis

@@ -5,6 +5,8 @@
   <title>riemann</title>
   <link rel="stylesheet" type="text/css" href="vendor/toastr/toastr.css" />
   <link rel="stylesheet" type="text/css" href="css" />
+  <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
+  <link rel="icon" href="/favicon.ico" type="image/x-icon">
 </head>
 <body>
   <div id="toolbar"></div>
@@ -25,6 +27,7 @@
   <script src="vendor/flot/jquery.flot.canvas.min.js"></script>
   <script src="vendor/flot/jquery.flot.time.min.js"></script>
   <script src="vendor/flot/jquery.flot.stack.min.js"></script>
+  <script src="vendor/flot/jquery.flot.tooltip.min.js"></script>
   <script src="vendor/PriorityQueue.js"></script>
   <script src="vendor/gauge.min.js"></script>
   <script src="vendor/jquery.gauge.js"></script>
@@ -55,6 +58,7 @@
   <script src="views/list.js"></script>
   <script src="views/help.js"></script>
   <script src="views/gauge.js"></script>
+  <script src="views/geiger.js"></script>
   <script src="views/dial.js"></script>
   <script src="views/grid.js"></script>
   <script src="views/iframe.js"></script>

data/riemann-dash.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.email         = ['aphyr@aphyr.com']
   gem.description   = %q{HTTP dashboard for the distributed event system Riemann.}
   gem.summary       = gem.description
-  gem.homepage      = 'https://github.com/aphyr/riemann-dash'
+  gem.homepage      = 'https://github.com/riemann/riemann-dash'
   gem.platform      = Gem::Platform::RUBY
 
   gem.add_dependency 'erubis', '>= 2.7.0'

metadata

@@ -1,84 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: riemann-dash
 version: !ruby/object:Gem::Version
-  version: 0.2.12
-  prerelease: 
+  version: 0.2.13
 platform: ruby
 authors:
 - Kyle Kingsbury
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-17 00:00:00.000000000 Z
+date: 2016-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.5
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.14
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -99,7 +88,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -119,10 +108,13 @@ files:
 - lib/riemann/dash/public/clock.js
 - lib/riemann/dash/public/dash.js
 - lib/riemann/dash/public/eventPane.js
+- lib/riemann/dash/public/favicon.ico
 - lib/riemann/dash/public/format.js
 - lib/riemann/dash/public/keys.js
 - lib/riemann/dash/public/persistence.js
 - lib/riemann/dash/public/profile.js
+- lib/riemann/dash/public/sounds/beep.wav
+- lib/riemann/dash/public/sounds/geiger.wav
 - lib/riemann/dash/public/strings.js
 - lib/riemann/dash/public/subs.js
 - lib/riemann/dash/public/toolbar.js
@@ -161,6 +153,8 @@ files:
 - lib/riemann/dash/public/vendor/flot/jquery.flot.threshold.min.js
 - lib/riemann/dash/public/vendor/flot/jquery.flot.time.js
 - lib/riemann/dash/public/vendor/flot/jquery.flot.time.min.js
+- lib/riemann/dash/public/vendor/flot/jquery.flot.tooltip.js
+- lib/riemann/dash/public/vendor/flot/jquery.flot.tooltip.min.js
 - lib/riemann/dash/public/vendor/gauge.min.js
 - lib/riemann/dash/public/vendor/jquery.gauge.js
 - lib/riemann/dash/public/vendor/jquery/jquery-1.9.1.min.js
@@ -176,6 +170,7 @@ files:
 - lib/riemann/dash/public/views/dial.js
 - lib/riemann/dash/public/views/flot.js
 - lib/riemann/dash/public/views/gauge.js
+- lib/riemann/dash/public/views/geiger.js
 - lib/riemann/dash/public/views/grid.js
 - lib/riemann/dash/public/views/help.js
 - lib/riemann/dash/public/views/iframe.js
@@ -200,29 +195,28 @@ files:
 - test/fixtures/ws_config/dummy_config.json
 - test/fixtures/ws_config/pretty_printed_config.json
 - test/test_helper.rb
-homepage: https://github.com/aphyr/riemann-dash
+homepage: https://github.com/riemann/riemann-dash
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: riemann-dash
-rubygems_version: 1.8.25
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: HTTP dashboard for the distributed event system Riemann.
 test_files:
 - test/browser_config_test.rb