riemann-dash 0.2.13 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6101ce9bb7b5d9c11c24673be2a5b3c0399f2a3
-  data.tar.gz: e19a97d12f65736cb9137fef3f1dc6b4bcfb59e7
+  metadata.gz: c5293b9ead848b26ceb29f3d4cb1e9366573f4e1
+  data.tar.gz: a00f02f7ed7267e059a31fc3bea29eea9096dc6e
 SHA512:
-  metadata.gz: b762f4b990ec0375e49eab17659ad17ecc03e11c6f3a009aa5045390cff70aafdf60f0a26dca9ed0617b78ed254ad50728445e617060ab9e1964678e385f6c9c
-  data.tar.gz: 7ed47f5330e26204182463aafdadb2371c6d74bbeb51a2c9882259f6aa594f69a3a67d94ea3c572a9a4669a97a092d2a30978df9e01df783566d72eee2b253a0
+  metadata.gz: 9022ae3dfdfcffe90b9a8372edd524e045b99f34b74fb596926ff42d9938c97dcdeb0a493b4b4dbf13d847c5eea15bc7fefe55804ad269a1137002b6307ed900
+  data.tar.gz: 86c4d4c5f86356d8847fd3547198eedf76c7c331662554dd2fa4b2d54922ad71d33fbc88071c73e85a6a2ab233ba2d631be68fbf6837a66c480509849204a4f2

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

@@ -237,7 +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(87, showconfig);  // w
   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/toolbar.js

@@ -15,7 +15,7 @@ var toolbar = (function() {
   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>');
   var server = $('<input class="server" type="text" name="text">');
-  var server_type = $('<div class="server"><label><input type="radio" id="ws" name="server_type" value="ws" checked>websockets</label><input type="radio" id="sse" name="server_type" value="sse">sse</label></div>');
+  var server_type = $('<div class="server"><label><input type="radio" id="ws" name="server_type" value="ws" checked>websockets</label><label><input type="radio" id="sse" name="server_type" value="sse">sse</label></div>');
   var server_type_selector = $("input[name=server_type]");
   var server_type_sse_selector = $("input#ws");
   var server_type_ws_selector = $("input#sse");

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

@@ -16,6 +16,7 @@
     this.col_sort = json.col_sort || "lexical";
     this.row_fn = util.extract_fn(json.rows) || util.extract_fn('host');
     this.col_fn = util.extract_fn(json.cols) || util.extract_fn('service');
+    this.description = json.description;
     this.clickFocusable = true;
 
     // Initial display
@@ -57,7 +58,8 @@
       rows: this.rows_str,
       cols: this.cols_str,
       row_sort: this.row_sort,
-      col_sort: this.col_sort
+      col_sort: this.col_sort,
+      description: this.description
     });
   };
 
@@ -83,7 +85,9 @@
     "</select><br />" +
     "<label for='max'>Max</label>" +
     "<input type='text' name='max' value=\"{{-max}}\" /><br />" +
-    "<span class='desc'>'all', 'host', 'service', or any number.</span>"
+    "<span class='desc'>'all', 'host', 'service', or any number.</span><br />" +
+    "<label for='description'>Description</label>" +
+    "<textarea name='description'>{{-description}}</textarea><br />"
   );
 
   Grid.prototype.editForm = function() {
@@ -219,8 +223,23 @@
     td.attr('class', "state box " + event.state);
 
     // Description
-    td.attr('title', event.host + ' ' + event.service + "\n" + event.state +
-        "\nreceived at " + new Date(event.time).toString() +
+    var list = [];
+    if(this.json().description != undefined){
+        list = this.json().description.split(',');
+    }
+    var description = "";
+    list.forEach(function(input){
+        if(input === "all"){
+            for(k in event){
+                description += k + ': ' + event[k] + '\n';
+            }
+        }
+        if(event[input] != undefined){
+            description += input + ": " + event[input] + '\n';
+        }
+    });
+    td.attr('title', event.host + ' ' + event.service + "\n" + event.state + '\n' + description +
+        "received at " + new Date(event.time).toString() +
         "\nexpiring at " + new Date(event.time + event.ttl * 1000).toString() +
         (event.description ? ("\n\n" + event.description) : ""));
 

data/lib/riemann/dash/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riemann-dash
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
 platform: ruby
 authors:
 - Kyle Kingsbury
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-26 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: riemann-dash
-rubygems_version: 2.4.5
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: HTTP dashboard for the distributed event system Riemann.