riemann-dash 0.2.8 → 0.2.9

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

@@ -1,6 +1,6 @@
 var keys = (function() {
   var active = true;
-  
+
   var bindings = {};
 
   // Disable bindings.

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

@@ -39,10 +39,22 @@ var strings = (function() {
       return match[1];
     }
     return '';
-  } 
+  }
+
+  // Shortens a list of strings by removing common prefixes.
+  var shorten = function(prefixFn, strings) {
+    var prefix = prefixFn(strings);
+    return _.map(strings, function(s) {
+      if (s && s.length !== prefix.length) {
+        return s.substring(prefix.length);
+      }
+      return s;
+    });
+  };
 
   return {
     commonPrefix: commonPrefix,
-    longestCommonPrefix: longestCommonPrefix
+    longestCommonPrefix: longestCommonPrefix,
+    shorten: shorten
   }
 })();

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

@@ -49,20 +49,22 @@ var subs = (function() {
     return sub.open();
   }
 
-  // Emit an expired event if oldest item from prioqueue is in the past.
+  // Emit expired events from the prioqueue.
   var expire = function(sub, now) {
     prioqueue = subs[sub.id].prioqueue;
-    if (prioqueue) {
-      bottom = prioqueue.bottomPriority();
-      if (bottom) {
-        expiry = new Date(bottom);
-        if (expiry < now) {
-          expired = prioqueue.shift();
-          expired.time = expiry;
-          expired.state = 'expired';
-          sub.f(expired);
-        }
+    if (! prioqueue) {
+      return;
+    }
+
+    while (bottom = prioqueue.bottomPriority()) {
+      expiry = new Date(bottom);
+      if (now < expiry) {
+        return;
       }
+      expired = prioqueue.shift();
+      expired.time = expiry;
+      expired.state = 'expired';
+      sub.f(expired);
     }
   }
 

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

@@ -11,13 +11,51 @@ var util = (function() {
     // A string key uniquely identifying an event by host and service.
     eventKey: function(e) {
       return nullableKey(e.host) + "\ufffe" + nullableKey(e.service);
-    }, 
-    
+    },
+
+    // Takes a string and returns a function that extracts a value from an
+    // event.
+    extract_fn: function(str) {
+      // When null/undefined, stay null/undefined.
+      if (! str) {
+        return str;
+      }
+
+      // Probably the worst hack ever. I'm not documenting this because it's so
+      // evil--though tremendously useful.
+      if (str.match(/^fn /)) {
+        // Grab the rest of the string, turn it into an anonymous fn taking a
+        // single arg `e`.
+        return Function.apply(null, ['e', str.substring(3)]);
+      }
+
+      // Property access
+      return function(e) {
+        return e[str];
+      };
+    },
+
+    // Takes a string and returns either:
+    // - a function which extracts a maximum value from an event.
+    // - a number to be used as the constant maximum.
+    max_fn: function(str) {
+      if ((!str) || str === "all") {
+        // Always the same value: global maxima
+        return function(e) { return "all"; };
+      }
+      if (isNaN(parseFloat(str))) {
+        // Not a number. Extract a field.
+        return function(e) { return e[str]; };
+      }
+      // Return a constant number.
+      return parseFloat(str);
+    },
+
     // Merge two maps nondestructively.
     merge: function(m1, m2) {
       return _.extend({}, m1, m2)
     },
-    
+
     // Wraps a function in another, which calls f at most once every period
     // milliseconds. Tries to minimize latency.
     slur: function(period, f) {

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

@@ -3,7 +3,7 @@ var view = (function() {
   var focused = null;
   var focusOverlay = $('<div class="focusOverlay"></div>');
   $('body').append(focusOverlay);
- 
+
   // Unfocus all views.
   var unfocus = function() {
     if (focused) {
@@ -19,8 +19,8 @@ var view = (function() {
   }
 
   function inherit(sup, sub) {
-    var newSubPrototype = createObject(sup.prototype); 
-    newSubPrototype.constructor = sub; 
+    var newSubPrototype = createObject(sup.prototype);
+    newSubPrototype.constructor = sub;
     sub.prototype = newSubPrototype;
   }
 
@@ -29,12 +29,12 @@ var view = (function() {
     var t = types[json.type];
     return(new t(json));
   }
- 
+
   // Initialize keybindings
   function setKeyBindings() {
     var focusedBindings = {
       // left
-      37: function(ev) { 
+      37: function(ev) {
         if (ev.ctrlKey === true) {
           focused.split('HStack', -1);
         } else {
@@ -49,8 +49,8 @@ var view = (function() {
         } else {
           focused.moveVertical(-1);
         }
-      }, 
-      
+      },
+
       // right
       39: function(ev) {
        if (ev.ctrlKey === true) {
@@ -58,17 +58,17 @@ var view = (function() {
        } else {
          focused.moveHorizontal(1);
        }
-      }, 
-      
+      },
+
       // down
-      40: function(ev) { 
+      40: function(ev) {
         if (ev.ctrlKey === true) {
           focused.split('VStack', 1);
         } else {
           focused.moveVertical(1);
         }
       },
-     
+
       27: function() { focused.unfocus() },           // escape
       33: function() { if (focused.parent) {          // pgup
           focused.parent.focus();
@@ -84,7 +84,7 @@ var view = (function() {
       189: function() { focused.shrink(); },           // -
       107: function() { focused.grow(); },             // + (NumPad)
       109: function() { focused.shrink(); }            // - (NumPad)
-      
+
     };
 
     var bindings = {};
@@ -112,6 +112,8 @@ var view = (function() {
   // View ////////////////////////////////////////////////////////////////////
 
   var View = function(json) {
+    this.id = json.id || util.uniqueId();
+    this.version = json.version || 0;
     this.type = json.type;
     this.el = $('<div class="view">');
     this.weight = json.weight || 1;
@@ -122,10 +124,13 @@ var view = (function() {
 
     var self = this;
     this.clickFocusable = true;
-    this.el.click(function() {
-      if (self.clickFocusable) {
-        self.focus();
-      }
+    this.el.click(function(e) {
+        if (!e) var e = windows.event;
+        if (e.ctrlKey || e.metaKey) {
+            if (self.clickFocusable) {
+                self.focus();
+            }
+        }
     });
   };
   types.View = View;
@@ -162,19 +167,28 @@ var view = (function() {
     }
   };
 
+  View.prototype.bumpVersion = function() {
+    this.version = (this.version + 1) || 1;
+    if (this.parent) {
+      this.parent.bumpVersion();
+    }
+  };
+
   View.prototype.reflow = function() {
   };
 
   View.prototype.grow = function() {
     this.weight *= 2;
-    this.parent.reflow(); 
+    this.parent.reflow();
     focused.refocus();
+    this.bumpVersion();
   };
 
   View.prototype.shrink = function() {
     this.weight *= 0.5;
     this.parent.reflow();
     focused.refocus();
+    this.bumpVersion();
   };
 
   // Replace this view with a different one. Returns replacement.
@@ -186,7 +200,7 @@ var view = (function() {
     if (p == null) {
       throw "Sorry, can't replace top-level views.";
     }
-    
+
     if (p.replaceChild == null) {
       throw "Sorry, can't replace unless parent can replace child.";
     }
@@ -226,7 +240,7 @@ var view = (function() {
   // new view before us) or +1 (place the new view after us).
   View.prototype.splitParentStack = function(i) {
     console.log("Split parent");
-    if (i === null) { i = 0 } 
+    if (i === null) { i = 0 }
     var index = this.parent.indexOf(this) - Math.min(i, 0);
     console.log(this.parent.indexOf(this), index);
     this.parent.insertChild(
@@ -251,7 +265,7 @@ var view = (function() {
           weight: this.weight
         });
         parent.replaceChild(this, stack);
-        
+
         // Add self to stack
         this.weight = 1;
         if (i === -1) {
@@ -318,7 +332,7 @@ var view = (function() {
       return null;
     }
   }
-  
+
   // Returns the nearest parent vstack
   View.prototype.enclosingVStack = function() {
     try {
@@ -363,6 +377,7 @@ var view = (function() {
           neighbor.addChild(this);
           neighbor.reflow();
           this.focus();
+          this.bumpVersion();
           return;
         }
       }
@@ -374,17 +389,18 @@ var view = (function() {
           // left. Nothing *needs* to happen, so we return immediately.
         return;
       }
-      
+
       // We're moving to a new position inside the enclosing stack.
       this.removeFromParent();
       stack.insertChild(newI, this);
       stack.reflow();
       this.focus();
+      this.bumpVersion();
     } else {
       console.log("Sorry, not yet");
     }
   }
-  
+
   View.prototype.moveHorizontal = function(delta) {
     this.move('enclosingHStack', delta);
   }
@@ -406,7 +422,7 @@ var view = (function() {
         '<button name="apply">Apply</button>' +
         '</form></div>');
     dialog.find('h1').text("Edit " + this.type);
-    
+
     // The serialized representation of a view that we're editing.
     // Carried between various view types; when Apply is clicked, projected
     // into an actual view.
@@ -446,7 +462,7 @@ var view = (function() {
     });
 
     // Apply button.
-    var me = this; 
+    var me = this;
     dialog.find('button[name=apply]').click(function(e) {
       // Don't submit the form.
       e.preventDefault();
@@ -457,7 +473,12 @@ var view = (function() {
       // Replace view.
       delete replacementJson.virtual;
       replacement = me.replace(reify(replacementJson));
+      replacement.bumpVersion();
+
+      // Reflow
       replacement.parent.reflow();
+
+      // Clean up view
       me.delete();
       replacement.focus();
 
@@ -467,7 +488,7 @@ var view = (function() {
 
     // Show dialog.
     keys.disable();
-    dialog.modal({onClose: function() { 
+    dialog.modal({onClose: function() {
         keys.enable();
         $.modal.close();
     }});
@@ -475,7 +496,10 @@ var view = (function() {
 
   // Serialize this view to JSON.
   View.prototype.json = function() {
-    return {type: 'View', weight: this.weight};
+    return {type:     'View',
+            weight:   this.weight,
+            id:       this.id,
+            version:  this.version};
   }
 
   // Balloon /////////////////////////////////////////////////////////////////
@@ -486,7 +510,7 @@ var view = (function() {
     this.clickFocusable = false;
     this.el.detach();
     this.el.appendTo(this.container);
-    
+
     this.child = reify(json.child);
     this.child.parent = this;
     this.el.append(this.child.el);
@@ -504,7 +528,7 @@ var view = (function() {
   Balloon.prototype.replaceChild = function(v1, v2) {
     this.child.parent = null;
     this.child.el.detach();
-    
+
     this.child = v2;
     v2.parent = this;
     this.el.append(this.child.el);
@@ -668,13 +692,13 @@ var view = (function() {
   };
   inherit(Stack, VStack);
   types.VStack = VStack;
-  
+
   VStack.prototype.json = function() {
     return $.extend(Stack.prototype.json.call(this), {type: 'VStack'});
   }
-  
+
   VStack.prototype.isVStack = true;
-  
+
   VStack.prototype.reflow = function() {
     if (this.el === null) {
       // We're gone.

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

@@ -5,6 +5,7 @@
       view.View.call(this, json);
       this.query = json.query;
       this.title = json.title;
+      this.max = json.max || null;
       this.graphType = json.graphType || 'line';
       this.stackMode = json.stackMode || 'false';
       this.lineWidth = json.lineWidth || 1;
@@ -94,6 +95,7 @@
         yaxis: {
           font: this.font,
           min: 0,
+          max: this.max
         }, 
         xaxis: {
           font: this.font,
@@ -239,6 +241,7 @@
         type: 'Flot',
         title: this.title,
         query: this.query,
+        max: this.max,
         timeRange: this.timeRange / 1000,
         graphType: this.graphType,
         stackMode: this.stackMode
@@ -262,7 +265,9 @@
       '<label for="query">query</label>' +
       '<textarea type="text" class="query" name="query">{{ query }}</textarea><br />' +
       '<label for="timeRange">Time range (s)</label>' +
-      '<input type="text" name="timeRange" value="{{timeRange / 1000}}" />'
+      '<input type="text" name="timeRange" value="{{timeRange / 1000}}" />' +
+      '<label for="max">Max</label>' +
+      '<input type="text" name="max" value="{{max}}" />'
     );
 
     // Returns the edit form

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

@@ -2,11 +2,19 @@
     var fitopts = {min: 6, max: 1000};
 
     var Gauge = function(json) {
+      // Init
       view.View.call(this, json);
+      this.clickFocusable = true;
+
+      // Config
       this.query = json.query;
       this.title = json.title;
       this.commaSeparateThousands = json.commaSeparateThousands;
-      this.clickFocusable = true;
+
+      // State
+      this.currentEvent = null;
+
+      // HTML
       this.el.addClass('gauge');
       this.el.append(
         '<div class="box">' +
@@ -18,11 +26,16 @@
       this.box = this.el.find('.box');
       this.el.find('h2').text(this.title);
 
+      // When clicked, display event
+      var self = this;
+      this.box.click(function() { eventPane.show(self.currentEvent) });
+
       if (this.query) {
         var reflowed = false;
         var me = this;
         var value = this.el.find('.value');
         this.sub = subs.subscribe(this.query, function(e) {
+          self.currentEvent = e;
           me.box.attr('class', 'box state ' + e.state);
           value.text(format.float(e.metric, 2, me.commaSeparateThousands));
           value.attr('title', e.description);