riemann-dash 0.2.11 → 0.2.12

data/README.markdown

@@ -31,6 +31,11 @@ set :bind, "1.2.3.4" # Bind to a different interface
 config[:ws_config] = 'custom/config.json' # Specify custom workspace config
 ```
 
+You can also specify the default config file to be used by setting the
+`RIEMANN_DASH_CONFIG` environment variable. If set, this value will override
+the default config file location of `config.rb` when no config file is passed
+on the command line.
+
 Putting in production
 =====================
 

data/lib/riemann/dash/app.rb

@@ -17,7 +17,7 @@ module Riemann
       end
 
       def self.load(filename)
-        filename ||= 'config.rb'
+        filename ||= ENV['RIEMANN_DASH_CONFIG'] || 'config.rb'
         unless config.load_config(filename)
           # Configuration failed; load a default view.
           puts "No configuration loaded; using defaults."

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

@@ -10,7 +10,7 @@
         "<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. 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>Make views bigger and smaller with the +/- keys. Pageup selects the parent of the current view. To delete a view, use the delete key or press d.</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>" +

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

@@ -0,0 +1,45 @@
+(function() {
+    var iframe = function(json) {
+      view.View.call(this, json);
+      this.title = json.title;
+      this.url = json.url;
+      this.clickFocusable = true;
+      this.el.addClass("iframe");
+      this.h2 = $('<h2/>');
+      this.el.append(this.h2);
+      this.h2.text(this.title);
+      this.iframe = $('<iframe />');
+      this.iframe.addClass('container').addClass('quickfit');
+      this.iframe.attr('src', this.url);
+      this.el.append(this.iframe);
+      this.reflow();
+    }
+
+    view.inherit(view.View, iframe);
+    view.iframe = iframe;
+    view.types.iframe = iframe;
+
+    iframe.prototype.json = function() {
+      return $.extend(view.View.prototype.json.call(this), {
+        type: 'iframe',
+        title: this.title,
+        url: this.url
+      });
+    }
+
+    var editTemplate = _.template(
+      '<label for="title">Title</label>' +
+      '<input type="title" name="title" value="{{title}}" /><br />' +
+      '<label for="title">URL</label>' +
+      '<input type="text" name="url" value="{{url}}" />'
+    );
+
+    iframe.prototype.editForm = function() {
+      return editTemplate(this);
+    }
+
+    iframe.prototype.reflow = function() {
+      this.iframe.height(this.el.innerHeight() - this.h2.height())
+      this.iframe.width(this.width())
+    }
+})();

data/lib/riemann/dash/version.rb

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

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

@@ -57,6 +57,7 @@
   <script src="views/gauge.js"></script>
   <script src="views/dial.js"></script>
   <script src="views/grid.js"></script>
+  <script src="views/iframe.js"></script>
   <script src="dash.js"></script>
 
   <script>dash.reload()</script>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-dash
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -178,6 +178,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/iframe.js
 - lib/riemann/dash/public/views/list.js
 - lib/riemann/dash/public/views/log.js
 - lib/riemann/dash/public/views/timeseries.js