riemann-dash 0.2.6 → 0.2.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f4c289eed32e6170e10dbe98f328ad9eef4be086
+  data.tar.gz: 72850ab6107b78532fe7c786aa42d27ec3e3e765
+SHA512:
+  metadata.gz: 58bfdfb8cbaff5681efc68a5c3836c47e849b17b9ff80e1895f9e19b31c9364690ae942afee15bde2b8107eec2d2de7326554dd048f4c6165441d897447f79fd
+  data.tar.gz: 04db465f234ea5d5e55003d719e8c2026393e6da7a5556b4c0acbff432be56a778102f3177c43546b4d6ad72956b3695e37563936d31759969545d9325d27c11

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

@@ -1,6 +1,9 @@
 var format = (function() {
 
   var formatFloat = function(number, precision, commas) {
+	  if (number == null) {
+		  return null;
+		}
     precision = precision || 2;
     var base = Math.pow(10, precision);
     var val =  Math.round(number * base) / base;

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

@@ -14,7 +14,7 @@ var subs = (function() {
   
   // Switch to turn on/off event processing
   var active = true;
- 
+
   // Error queue for notification
   var errorQueue = [];
 
@@ -34,6 +34,7 @@ var subs = (function() {
 
   // Closes a subscription and deletes it from the subscription manager.
   var unsubscribe = function(sub) {
+    clock.unsubscribe(sub.clockSub);
     delete subs[sub.id];
     return sub.close();
   }
@@ -48,12 +49,30 @@ var subs = (function() {
     return sub.open();
   }
 
+  // Emit an expired event if oldest item from prioqueue is in the past.
+  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.state = 'expired';
+          sub.f(expired);
+        }
+      }
+    }
+  }
+
   var Subscription = Backbone.Model.extend({
 
     initialize: function(id, query, f) {
       this.id = id;
       this.query = query;
       this.f = f;
+      this.prioqueue = new PriorityQueue();
+      this.clockSub = false;
     },
 
     isOpen: function() {
@@ -109,6 +128,12 @@ var subs = (function() {
           var event = JSON.parse(e.data);
           event.time = Date.parse(event.time);
           clock.advance(event.time);
+          if (event.ttl > 0) { // only expired events have no TTL
+            this.prioqueue.update(
+              {host: event.host, service: event.service},
+              event.time + (event.ttl * 1000) // convert TTL to ms
+            );
+          }
           this.f(event);
         }
         var t2 = Date.now();
@@ -134,6 +159,11 @@ var subs = (function() {
   var subscribe = function(query, f) {
     var sub = new Subscription(newId(), query, f).open();
     subs[sub.id] = sub;
+
+    sub.clockSub = clock.subscribe(function(now) {
+      expire(sub, now);
+    });
+
     return sub;
   }
 

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

@@ -0,0 +1,206 @@
+/**
+ * Object to be appended in the priority queue.
+ *
+ * @class
+ * @param 	mixed 	v
+ * @param	integer	p
+ * @author	Augusto Pascutti
+ */
+var QueueItem = function(v, p) {
+	this.value    = v;
+	this.priority = p;
+};
+
+/**
+ * Priority queue class.
+ *
+ * @class
+ * @param 	Function[optional] 	c	Compare function to be used
+ * @param	integer[optional]	m	Max number of elements to hold
+ * @author	Augusto Pascutti
+ */
+var PriorityQueue = function(c, m) { this.init(c, m) };
+PriorityQueue.prototype = {
+	_queue: [],
+	_compare: undefined,
+	_size: 0,
+
+	/**
+	 * Priority queue class constructor.
+	 *
+	 * @class
+	 * @param 	Function[optional] 	compare_function	Compare function to be used
+	 * @param	integer[optional]	maximum_size		Max number of elements to hold
+	 */
+	init: function(compare_function, maximum_size) {
+		this._compare = compare_function || undefined;
+		this._size    = maximum_size || 0 ;
+		this.reset();
+	},
+
+	/**
+	 * Pushes something to the priority queue.
+	 *
+	 * @param 	mixed 		value
+	 * @param 	integer		priority
+	 * @return 	void
+	 */
+	push: function(value, priority) {
+		this._queue.push(new QueueItem(value, priority));
+		this._queue.sort(this.compare());
+		this._maitain();
+	},
+
+
+	/**
+	 * Update priority of something in the queue. Will silently add it if it
+	 * doesn't already exist.
+	 *
+	 * @param 	mixed 		value
+	 * @param 	integer		priority
+	 * @return 	void
+	 */
+	update: function(value, priority) {
+		known = false;
+		idx = 0;
+
+		this._queue.forEach(function() {
+			if (JSON.stringify(this._queue[idx].value) === JSON.stringify(value)) {
+				this._queue[idx].priority = priority;
+				known = true;
+				return;
+			}
+			idx++;
+		}, this);
+
+		if (!known) {
+			this._queue.push(new QueueItem(value, priority));
+		}
+		this._queue.sort(this.compare());
+		this._maitain();
+	},
+
+	/**
+	 * Removes the most important item and return its value. 
+	 *
+	 * @return mixed
+	 */
+	pop: function() {
+		item = this._queue.shift();
+		this._maitain();
+		return (item) ? item.value : undefined;
+	},
+
+	/**
+	 * Returns most important item value from this queue, without removing it.
+	 *
+	 * @return mixed
+	 */
+	top: function() {
+		item = this._queue[0];
+		return (item) ? item.value : undefined;
+	},
+
+	/**
+	 * Returns most important item priority from this queue, without removing it.
+	 *
+	 * @return mixed
+	 */
+	topPriority: function() {
+		item = this._queue[0];
+		return (item) ? item.priority : undefined;
+	},
+
+	/**
+	 * Removes the less important item and return its value.
+	 *
+	 * @return mixed
+	 */
+	shift: function() {
+		item = this._queue.pop();
+		this._maitain();
+		return (item) ? item.value : undefined;
+	},
+
+	/**
+	 * Returns the less important item value, without removing it.
+	 *
+	 * @return mixed
+	 */
+	bottom: function() {
+		idx  = this.length-1;
+		item = this._queue[idx];
+		return (item) ? item.value : undefined;
+	},
+
+	/**
+	 * Returns the less important item priority, without removing it.
+	 *
+	 * @return mixed
+	 */
+	bottomPriority: function() {
+		idx  = this.length-1;
+		item = this._queue[idx];
+		return (item) ? item.priority : undefined;
+	},
+
+	/**
+	 * Returns the ordered queue as an Array.
+	 *
+	 * @return Array
+	 */
+	getArray: function() {
+	    return this._queue || new Array();
+	},
+
+	/**
+	 * Resets the queue.
+	 *
+	 * @return void
+	 */
+	reset: function() {
+		this._queue = [];
+		this._maitain();
+	},
+
+	/**
+	 * Returns the compare function.
+	 * If no compare function is set, defines a default one.
+	 *
+	 * @return Function
+	 */
+	compare: function() {
+		if (!this._compare) {
+			this._compare = function(a,b) {
+				return b.priority - a.priority;
+			};
+		}
+		return this._compare;
+	},
+
+	/**
+	 * Defines a fixed size to the queue.
+	 * Zero for no limit and any other number to set it as the highest number
+	 * of items allowed in this queue.
+	 *
+	 * @param 	integer		i
+	 * @return 	void
+	 */
+	size: function(i) {
+		this._size = i;
+	},
+
+	/**
+	 * Keeps the size of the queue by removing the less important item of it and length
+	 * information atribute.
+     *
+	 * @return void
+	 */
+	_maitain: function() {
+	    this.length = this._queue.length;
+		if ( this._size == 0 ) return;
+		while (this._size < this.length) {
+			this.shift();
+		}
+	},
+};

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

@@ -32,6 +32,7 @@
 
       // Create local copies of slurred functions
       this.reflowGraph = util.slur(200, this.reflowGraph);
+      this.setGraphData = util.slur(1000, this.setGraphData);
 
       // This view can be clicked to focus on it.
       this.clickFocusable = true;
@@ -48,7 +49,8 @@
 
         this.clockSub = clock.subscribe(function(t) {
           self.trimData(t);
-          self.setupGraph(t);
+          self.updateTime(t);
+//          self.setupGraph(t);
         });
 
         // Subscribe to our query
@@ -69,7 +71,10 @@
     FlotView.prototype.setupGraph = function(t) {
       if (this.container.width() === 0 ||
           this.container.height() === 0) {
-            this.graph = null;
+            if (this.graph != null) {
+              this.graph.shutdown();
+              this.graph = null;
+            }
             return;
       }
 
@@ -99,6 +104,20 @@
       });
     };
 
+    // Called as the clock advances to new times.
+    FlotView.prototype.updateTime = function(t) {
+      if (this.graph == null) {
+        this.setupGraph(t);
+        return;
+      }
+
+      var axis = this.graph.getOptions().xaxes[0];
+      axis.min = t - this.timeRange;
+      axis.max = t;
+      this.graph.setupGrid();
+      this.graph.draw();
+    }
+
     // Re-order the data list and series index to be in sorted order by label. 
     FlotView.prototype.resortSeries = function() {
       // Shorten labels
@@ -177,7 +196,11 @@
         series.push([event.time, event.metric]);
       }
       
-      // Update graph data
+      this.setGraphData();
+    };
+
+    // Tells the Flot graph to use our current dataset.
+    FlotView.prototype.setGraphData = function() {
       if (this.graph) {
         this.graph.setData(this.data);
       }

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

@@ -162,12 +162,15 @@
     e.td.attr('class', "state box " + event.state);
 
     // Description
-    e.td.attr('title', event.host + ' ' + event.service + "\n" +
-        event.state + ' at ' + new Date(event.time).toString() + "\n\n" +
-        event.description);
+    e.td.attr('title', event.host + ' ' + event.service + "\n" + event.state +
+        "\nreceived at " + new Date(event.time).toString() +
+        "\nexpiring at " + new Date(event.time + event.ttl * 1000).toString() +
+        (event.description ? ("\n\n" + event.description) : ""));
 
     // Metric
-    e.metric.text(format.float(event.metric));
+    if (event.metric != undefined) {
+      e.metric.text(format.float(event.metric));
+    }
 
     // Bar chart
     if (event.metric === 0) {
@@ -354,7 +357,9 @@
   Grid.prototype.remove = function(e) {
     var row_key = this.row_fn(e);
     var col_key = this.col_fn(e);
-    delete this.events[row_key][col_key];
+    if (this.events[row_key] && this.events[row_key][col_key]) {
+      delete this.events[row_key][col_key];
+    }
 
     // Wipe element cache
     if (this.elCache[row_key]) {
@@ -385,7 +390,11 @@
   
   // Accept an event.
   Grid.prototype.update = function(e) {
-    this.add(e);
+    if (e.state === "expired") {
+      this.remove(e);
+    } else {
+      this.add(e);
+    }
   };
 
   Grid.prototype.reflow = function() {

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

@@ -10,6 +10,7 @@
         "<p>To save your changes to the server, press s. You can refresh the page, or press r to reload.</p>" +
         "<p>Make views bigger and smaller with the +/- keys. Pageup selects the parent of the current view. To delete a view, use the delete key.</p>" +
         "<p>Switch between workspaces with alt-1, alt-2, etc.</p>" +
+        "<p>View is an empty space. Title is an editable text title. Fullscreen and Balloon are top-level container views; you probably won't use them. HStack and VStack are the horizontal and vertical container views; they're implicitly created by splits, but you can create them yourself for fine control. Gauge shows a single event. Grid shows a table of events. Timeseries and Flot show metrics over time--Timeseries is deprecated; Flot will probably replace it.</p>" +
         "<p>My sincere apologies for layout jankiness. There are a few gross bugs and incapabilities in the current hstack/vstack system; if things get really bad, you can always edit ws/config.json on the server. The control scheme will probably change; I appreciate your ideas and patches.</p>" +
         '</div>'
     );

data/lib/riemann/dash/version.rb

@@ -1,4 +1,4 @@
 module Riemann; end
 module Riemann::Dash
-  VERSION = '0.2.6'
+  VERSION = '0.2.7'
 end

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

@@ -168,18 +168,14 @@ html,table {
   background: $green;
   color: #000;
 }
-.state.warning, .bar.warning {
+.state.warning, .state.warn, .bar.warning, .bar.warn {
   background: $amber;
   color: #000;
 }
-.state.critical, .state.failure, .bar.critical, .bar.failure {
+.state.critical, .state.failure, .state.err, .bar.critical, .bar.failure, .bar.err {
   background: $orange;
   color: #000;
 }
-.state.expired {
-  background: $purple;
-  color: #000;
-}
 
 .view .query {
   display: block;
@@ -341,6 +337,8 @@ h2 {
 }
 
 .grid {
+  white-space: nowrap;
+
   h2 {
     height: 28px;
     font-size: 24px;
@@ -376,6 +374,10 @@ h2 {
     position: absolute;
     width: 100%;
     border-spacing: 3px;
+    
+    th {
+      text-align: right;
+    }
 
     thead {
       margin: 0;
@@ -386,7 +388,7 @@ h2 {
         position: relative;
         top: 3px;
         vertical-align: bottom;
-        text-align: right;
+        text-align: left;
       }
     }
   }

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

@@ -24,6 +24,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/PriorityQueue.js"></script>
   <script> // turn underscore templates into mustache style templates
     _.templateSettings = {
       evaluate    : /\{\%([\s\S]+?)\%\}/g,  // {%  eval(js);  %}

metadata

@@ -1,100 +1,88 @@
 --- !ruby/object:Gem::Specification
 name: riemann-dash
 version: !ruby/object:Gem::Version
-  version: 0.2.6
-  prerelease: 
+  version: 0.2.7
 platform: ruby
 authors:
 - Kyle Kingsbury
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-21 00:00:00.000000000 Z
+date: 2014-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.7
 - !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.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.2
 - !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: thin
   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
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -138,6 +125,7 @@ files:
 - lib/riemann/dash/public/subs.js
 - lib/riemann/dash/public/toolbar.js
 - lib/riemann/dash/public/util.js
+- lib/riemann/dash/public/vendor/PriorityQueue.js
 - lib/riemann/dash/public/vendor/backbone.js
 - lib/riemann/dash/public/vendor/flot/jquery.colorhelpers.js
 - lib/riemann/dash/public/vendor/flot/jquery.colorhelpers.min.js
@@ -204,27 +192,26 @@ files:
 - test/test_helper.rb
 homepage: https://github.com/aphyr/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.23
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: HTTP dashboard for the distributed event system Riemann.
 test_files:
 - test/config_test.rb