riemann-dash 0.2.10 → 0.2.11

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

@@ -187,12 +187,28 @@ dash = (function() {
     );
   }
 
+  var showconfig = function() {
+    stash();
+    var configTemplate = _.template("<div>{{- config }}</div>");
+    var rendered = configTemplate({config: JSON.stringify({
+        server: toolbar.server(),
+        server_type: toolbar.server_type(),
+        workspaces: workspaces
+    })});
+    var dialog = $(rendered);
+    dialog.modal({onClose: function() {
+        keys.enable();
+        $.modal.close();
+    }});
+ };
+
   var help = function() {
     var dialog = $(
       '<div><h1>Help</h1><ul>' +
       '<li><b>e</b>: edit the view</li>' +
       '<li><b>?</b>: display this help box</li>' +
       '<li><b>s</b>: save the dashboard</li>' +
+      '<li><b>c</b>: display the current config</li>' +
       '<li><b>r</b>: reload the dashboard from last saved config</li>' +
       '<li><b>+</b>: increase the size of the view</li>' +
       '<li><b>-</b>: decrease the size of the view</li>' +
@@ -221,6 +237,7 @@ dash = (function() {
   keys.bind(80, subs.toggle); // p
   keys.bind(82, reload);      // r
   keys.bind(83, save);        // s
+  keys.bind(67, showconfig);  // c
   keys.bind(191, help);       // ?
   keys.bind(49, function(e) { e.altKey && switchWorkspace(workspaces[0]) });
   keys.bind(50, function(e) { e.altKey && switchWorkspace(workspaces[1]) });

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

@@ -6,6 +6,7 @@
       this.query = json.query;
       this.title = json.title;
       this.max = json.max || null;
+      this.min = json.min || null;
       this.graphType = json.graphType || 'line';
       this.stackMode = json.stackMode || 'false';
       this.lineWidth = json.lineWidth || 1;
@@ -94,7 +95,7 @@
         },
         yaxis: {
           font: this.font,
-          min: 0,
+          min: this.min,
           max: this.max
         }, 
         xaxis: {
@@ -241,6 +242,7 @@
         type: 'Flot',
         title: this.title,
         query: this.query,
+        min: this.min,
         max: this.max,
         timeRange: this.timeRange / 1000,
         graphType: this.graphType,
@@ -266,6 +268,10 @@
       '<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}}" />' +
+      '<br />' +
+      '<label for="min">Min</label>' +
+      '<input type="text" name="min" value="{{min}}" />' +
+      '<br />' +
       '<label for="max">Max</label>' +
       '<input type="text" name="max" value="{{max}}" />'
     );

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

@@ -37,7 +37,11 @@
         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));
+          if (e.metric != undefined) {
+            value.text(format.float(e.metric, 2, me.commaSeparateThousands));
+          } else if (e.state != undefined) {
+            value.text(e.state)
+          }
           value.attr('title', e.description);
 
           // The first time, do a full-height reflow.

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

@@ -8,7 +8,8 @@
         "<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>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>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>" +
         "<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>" +

data/lib/riemann/dash/version.rb

@@ -1,4 +1,4 @@
 module Riemann; end
 module Riemann::Dash
-  VERSION = '0.2.10'
+  VERSION = '0.2.11'
 end

metadata

@@ -1,32 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: riemann-dash
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
+  prerelease: 
 platform: ruby
 authors:
 - Kyle Kingsbury
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-03-03 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
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,20 +46,23 @@ dependencies:
 - !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
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -190,26 +201,27 @@ 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: 2.0.14
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: HTTP dashboard for the distributed event system Riemann.
 test_files:
 - test/browser_config_test.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: c1c5f97ba41d86b262e340c7071d20d990dfacfd
-  data.tar.gz: c93abeae7877cd6923002b3246e0a4e9fa31a38d
-SHA512:
-  metadata.gz: 55a17113c9830e91dbcc85552727481ff483ecd949f098eb27b1d77919362e28f210edc71da6bc25b8e6ca2ad35c08203cc53c38100fc699ff207844b384471a
-  data.tar.gz: 4008c69a5b998b36319fefdbb518768fafe1cdc88ec96bf6607aca622c8ec9cc0488c28a5630ee605b8a67732ba8c9b786e9e46acc501834191c5ce5782f7ee5