riemann-dash 0.2.8 → 0.2.9

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

@@ -6,7 +6,7 @@
       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>Click 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>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>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. 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>" +

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

@@ -0,0 +1,73 @@
+(function() {
+    var List = function(json) {
+      view.View.call(this, json);
+      this.query = json.query;
+      this.title = json.title;
+      this.el.addClass('list');
+      this.el.append(
+              '<h2 class="quickfit"></h2>' +
+              '<ul></ul>'
+      );
+
+      this.ul = this.el.find('ul');
+      this.el.find('h2').text(this.title);
+
+      this.events = {};
+
+      if (this.query) {
+        var me = this;
+        this.sub = subs.subscribe(this.query, function(e) {
+                me.update.call(me, e);
+        });
+      }
+    }
+
+    view.inherit(view.View, List);
+    view.List = List;
+    view.types.List = List;
+
+    List.prototype.json = function() {
+      return $.extend(view.View.prototype.json.call(this), {
+        type: 'List',
+        title: this.title,
+        query: this.query
+      });
+    }
+
+    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>');
+
+    List.prototype.editForm = function() {
+      return editTemplate(this);
+    }
+
+    List.prototype.reflow = function() {
+    }
+
+    List.prototype.delete = function() {
+      if (this.sub) {
+        subs.unsubscribe(this.sub);
+      }
+      view.View.prototype.delete.call(this);
+    }
+
+    List.prototype.update = function(e) {
+          var key = [e.host, e.service];
+          if (e.state == "expired") {
+                  delete this.events[key];
+          } else {
+                  this.events[key] = e;
+          }
+          this.ul.empty();
+          for (var row in this.events) {
+                  var e = this.events[row];
+                  var li = $('<li>' + e.host + " " + e.service + '</li>');
+                  li.attr('class', "state " + e.state);
+                  li.attr('title', e.description);
+                  this.ul.append(li);
+          }
+    }
+})();

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

@@ -76,6 +76,9 @@
     // Accept events from a subscription and update the log.
     LogView.prototype.update = function(event) {
       this.log.append(this.lineTemplate(event));
+      while (this.log[0].children.length > this.lines) {
+          this.log[0].deleteRow(0);
+      }
       if (this.tracking) { this.scrollToBottom(); };
     };
 

data/lib/riemann/dash/version.rb

@@ -1,4 +1,4 @@
 module Riemann; end
 module Riemann::Dash
-  VERSION = '0.2.8'
+  VERSION = '0.2.9'
 end

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

@@ -8,9 +8,10 @@ $amber: #FFC712;
 $light-blue: #2CCCFE;
 $blue: #2C55FF;
 $dark-grey: #1F1F1F;
+$grey: #888;
 $light-grey: #ccc;
 $off-white: #dedede;
-$grey: #888;
+$cream: #f6f6f6;
 $green: #06FA23;
 $yellow: #FEF206;
 
@@ -128,6 +129,54 @@ html,table {
   }
 }
 
+#event-pane {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  height: auto;
+  max-height: 30%;
+  overflow-y: auto;
+  z-index: 100;
+  background: #fff;
+  border-top: 1px solid $off-white;
+  padding: 3px;
+
+  &.active {
+    box-shadow: 0 0 40px rgba(0,0,0,0.2);
+  }
+
+  * {
+    float: left;
+    padding: 3px;
+  }
+
+  .state {
+    margin: 0 3px;
+    padding: 3px 6px;
+    border-radius: 3px;
+  }
+
+  .host {
+    font-style: italic;
+  }
+
+  .ttl:before {
+    color: $grey;
+    content: 'ttl ';
+  }
+
+  .tags:before {
+    color: $grey;
+    content: "tags: ";
+  }
+
+  .description {
+    clear: both;
+    white-space: pre-wrap;
+  }
+}
+
 #view {
   position: absolute;
   left: 3px;
@@ -336,6 +385,16 @@ h2 {
   }
 }
 
+.list {
+   ul {
+       display: inline-block;
+       position: relative;
+   }
+   ul li {
+       background: #cacaca;
+   }
+}
+
 .grid {
   white-space: nowrap;
 

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

@@ -9,6 +9,7 @@
 <body>
   <div id="toolbar"></div>
   <div id="view"></div>
+  <div id="event-pane"></div>
 
   <!-- begin third party dependencies -->
   <script src="vendor/smoothie.js"></script>
@@ -43,11 +44,13 @@
   <script src="keys.js"></script>
   <script src="subs.js"></script>
   <script src="toolbar.js"></script>
+  <script src="eventPane.js"></script>
   <script src="view.js"></script>
   <script src="views/timeseries.js"></script>
   <script src="views/flot.js"></script>
   <script src="views/title.js"></script>
   <script src="views/log.js"></script>
+  <script src="views/list.js"></script>
   <script src="views/help.js"></script>
   <script src="views/gauge.js"></script>
   <script src="views/grid.js"></script>

data/riemann-dash.gemspec

@@ -15,11 +15,10 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://github.com/aphyr/riemann-dash'
   gem.platform      = Gem::Platform::RUBY
 
-  gem.add_dependency 'riemann-client', '>= 0.0.7'
   gem.add_dependency 'erubis', '>= 2.7.0'
-  gem.add_dependency 'sinatra', '>= 1.3.2'
+  gem.add_dependency 'sinatra', '~> 1.4.5'
   gem.add_dependency 'sass', '>= 3.1.14'
-  gem.add_dependency 'thin', '>= 1.3.1'
+  gem.add_dependency 'webrick', '~> 1.3.1'
   gem.add_dependency 'multi_json', '1.3.6'
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: riemann-dash
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Kyle Kingsbury
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-24 00:00:00.000000000 Z
+date: 2014-08-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: riemann-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +28,16 @@ dependencies:
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.4.5
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -67,17 +53,17 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.1.14
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.1
 - !ruby/object:Gem::Dependency
@@ -112,11 +98,15 @@ files:
 - example/config.rb
 - lib/riemann/dash.rb
 - lib/riemann/dash/app.rb
+- lib/riemann/dash/browser_config.rb
+- lib/riemann/dash/browser_config/file.rb
+- lib/riemann/dash/browser_config/s3.rb
 - lib/riemann/dash/config.rb
 - lib/riemann/dash/controller/css.rb
 - lib/riemann/dash/controller/index.rb
 - lib/riemann/dash/public/clock.js
 - lib/riemann/dash/public/dash.js
+- lib/riemann/dash/public/eventPane.js
 - lib/riemann/dash/public/format.js
 - lib/riemann/dash/public/keys.js
 - lib/riemann/dash/public/persistence.js
@@ -172,6 +162,7 @@ files:
 - lib/riemann/dash/public/views/gauge.js
 - lib/riemann/dash/public/views/grid.js
 - lib/riemann/dash/public/views/help.js
+- lib/riemann/dash/public/views/list.js
 - lib/riemann/dash/public/views/log.js
 - lib/riemann/dash/public/views/timeseries.js
 - lib/riemann/dash/public/views/title.js
@@ -210,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: riemann-dash
-rubygems_version: 2.1.11
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: HTTP dashboard for the distributed event system Riemann.