redmon 0.0.5 → 0.0.6

data/README.md

@@ -88,11 +88,64 @@ Redmon.configure do |config|
 end
 ```
 
-This will mount the Redmon application to the /redmon/ path. The trailing slash
-is important.  The worker that gathers the redis info stats will not be started
-when Redmon is mounted.  In order to get a worker running inside of your Rails
-app you can try this [Railtie](https://github.com/steelThread/redmon/pull/19#issuecomment-7273659)
-based approach.
+This will mount the Redmon application to the /redmon path.
+
+### Stats worker
+
+The worker that gathers the Redis info stats will not be started when Redmon is mounted like this. In order to get a EventMachine worker running inside your Rails app you can try this [Railtie based approach](https://github.com/steelThread/redmon/pull/19#issuecomment-7273659). If you are using a system to execute background tasks in your app (like Sidekiq, Resque, or Delayed Job), you can write your own worker to update the info stats.
+
+A simple worker for Sidekiq looks like this:
+
+```ruby
+class RedmonWorker
+  include Sidekiq::Worker
+
+  def perform
+    Redmon::Worker.new.record_stats
+  ensure
+    self.class.perform_in Redmon.config.poll_interval.seconds
+  end
+end
+```
+
+Once enqueued, the worker updates the stats and automatically enqueues itself to be performed again after the defined poll interval.
+
+## Using with another Sinatra application
+
+Create/Edit config.ru:
+
+```ruby
+require './app.rb'
+require 'redmon'
+
+map '/' do
+  run Sinatra::Application
+end
+map '/redmon' do
+  if EM.reactor_running?
+    Redmon::Worker.new.run!
+  else
+    fork do
+      trap('INT') { EM.stop }
+      trap('TERM') { EM.stop }
+      EM.run { Redmon::Worker.new.run! }
+    end
+  end
+
+  run Redmon::App
+end
+```
+
+In order to configure Redmon use this code in your app.rb file:
+
+```ruby
+Redmon.configure do |config|
+  config.redis_url = 'redis://127.0.0.1:6379'
+  config.namespace = 'redmon'
+end
+```
+
+This will mount the Redmon application to the /redmon path.
 
 ## License
 
@@ -102,4 +155,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/redmon/app.rb

@@ -53,4 +53,4 @@ module Redmon
     end
 
   end
-end
+end

data/lib/redmon/helpers.rb

@@ -14,5 +14,9 @@ module Redmon
       -(params[:count] ? params[:count].to_i : 1)
     end
 
+    def absolute_url(path='')
+      "#{uri(nil, false)}#{path.sub(%r{^\/+}, '')}"
+    end
+
   end
-end
+end

data/lib/redmon/public/redmon.js

@@ -30,7 +30,7 @@ var Redmon = (function() {
    */
   function requestData(count, callback) {
     $.ajax({
-      url: 'stats?count='+count,
+      url: config.absoluteUrl+'stats?count='+count,
       success: function(data) {
         callback(
           data.map(function(info) {
@@ -138,7 +138,7 @@ var Redmon = (function() {
     }
 
     function onBtnClick(cmd) {
-      $.ajax({url: 'cli?command='+cmd});
+      $.ajax({url: config.absoluteUrl+'cli?command='+cmd});
     }
 
     return {
@@ -303,7 +303,7 @@ var Redmon = (function() {
           , field = el.attr('id');
 
         if (data[field]) {
-          var type = el.attr('type')
+          var type = el.data('type')
           if (type && type == 'date')
             el.text(formatDate(data[field]));
           else if (type && type == 'number')
@@ -369,13 +369,13 @@ var Redmon = (function() {
       'appendfsync'               : 'always,everysec,no'
     };
 
-    function render(data) {
+    function render() {
       $('#config-table .editable').each(function() {
         var editable = $(this)
           , id = editable.attr('id');
 
-        var config = {
-          url           : '/config',
+        var options = {
+          url           : config.absoluteUrl+'config',
           element_id    : 'param',
           update_value  : 'value',
           show_buttons  :  true,
@@ -385,11 +385,11 @@ var Redmon = (function() {
         };
 
         if (selects[id]) {
-          config.field_type     = 'select';
-          config.select_options = selects[id];
+          options.field_type     = 'select';
+          options.select_options = selects[id];
         }
 
-        editable.editInPlace(config);
+        editable.editInPlace(options);
       });
     }
 
@@ -425,7 +425,7 @@ var Redmon = (function() {
       }
 
       $.ajax({
-        url     : 'cli?command='+command,
+        url     :  config.absoluteUrl+'cli?command='+command,
         success :  callback
       });
     }
@@ -561,4 +561,4 @@ var Redmon = (function() {
   return  {
     init: init
   }
-})();
+})();

data/lib/redmon/version.rb

@@ -1,3 +1,3 @@
 module Redmon
-  VERSION = "0.0.5"
-end
+  VERSION = "0.0.6"
+end

data/lib/redmon/views/app.haml

@@ -3,18 +3,18 @@
   %head
     %title Redmon
 
-    %script(type="text/javascript" src="vendor/jquery-1.7.1.min.js")
-    %script(type="text/javascript" src="vendor/jquery-effects-core.min.js")
-    %script(type="text/javascript" src="vendor/jquery.editinplace.js")
-    %script(type="text/javascript" src="vendor/bootstrap-modal.js")
-    %script(type="text/javascript" src="vendor/d3.v3.min.js")
-    %script(type="text/javascript" src="vendor/nv.d3.min.js")
-    %script(type="text/javascript" src="vendor/terminal.js")
-    %script(type="text/javascript" src="redmon.js")
+    %script(type='text/javascript' src='#{absolute_url('vendor/jquery-1.7.1.min.js')}')
+    %script(type='text/javascript' src='#{absolute_url('vendor/jquery-effects-core.min.js')}')
+    %script(type='text/javascript' src='#{absolute_url('vendor/jquery.editinplace.js')}')
+    %script(type='text/javascript' src='#{absolute_url('vendor/bootstrap-modal.js')}')
+    %script(type='text/javascript' src='#{absolute_url('vendor/d3.v3.min.js')}')
+    %script(type='text/javascript' src='#{absolute_url('vendor/nv.d3.min.js')}')
+    %script(type='text/javascript' src='#{absolute_url('vendor/terminal.js')}')
+    %script(type='text/javascript' src='#{absolute_url('redmon.js')}')
 
-    %link(type="text/css" rel="stylesheet" href="vendor/bootstrap.min.css")
-    %link(type="text/css" rel="stylesheet" href="vendor/nv.d3.css")
-    %link(type="text/css" rel="stylesheet" href="redmon.css")
+    %link(type='text/css' rel='stylesheet' href='#{absolute_url('vendor/bootstrap.min.css')}')
+    %link(type='text/css' rel='stylesheet' href='#{absolute_url('vendor/nv.d3.css')}')
+    %link(type='text/css' rel='stylesheet' href='#{absolute_url('redmon.css')}')
 
   %body
     .topbar
@@ -22,17 +22,17 @@
         .container
           %a.brand Redmon
           %ul.nav
-            %li.active{:id => 'dashboard'}
+            %li#dashboard.active
               %a Dashboard
-            %li{:id => 'cli'}
+            %li#cli
               %a CLI
-            %li{:id => 'config'}
+            %li#config
               %a Configuration
           .pull-right
             %a.brand #{redis_url}
             .btns
-              %button.btn.primary{:id => 'flush-btn'} Flush DB
-              %button.btn.primary{:id => 'reset-btn'} Reset Statistics
+              %button#flush-btn.btn.primary Flush DB
+              %button#reset-btn.btn.primary Reset Statistics
 
     .container.viewport
       .dashboard
@@ -62,80 +62,80 @@
                   .widget
                     .headbar
                       %h2 Slow Log
-                    %div{:style => "height:225px;overflow-y:scroll;"}
-                      %table.condensed-table{:id => "slow-tbl"}
+                    %div{:style => 'height:225px;overflow-y:scroll;'}
+                      %table#slow-tbl.condensed-table
                         %tbody
 
             .span6
               .widget
                 .headbar
                   %h2 Info
-                %table.condensed-table{:id => "info-tbl"}
+                %table#info-tbl.condensed-table
                   %tbody
                     %tr
-                      %td{:style => "width: 65%"} Version
-                      %td{:id => "redis_version"}
+                      %td{:style => 'width: 65%'} Version
+                      %td#redis_version
                     %tr
                       %td Role
-                      %td{:id => "role"}
+                      %td#role
                     %tr
                       %td Uptime Days
-                      %td{:id => "uptime_in_days"}
+                      %td#uptime_in_days
                     %tr
                       %td Memory Used
-                      %td{:id => "used_memory_human"}
+                      %td#used_memory_human
                     %tr
                       %td Memory Peak
-                      %td{:id => "used_memory_peak_human"}
+                      %td#used_memory_peak_human
                     %tr
                       %td Memory Fragmentation Ratio
-                      %td{:id => "mem_fragmentation_ratio"}
+                      %td#mem_fragmentation_ratio
                     %tr
                       %td DB Size (Keys)
-                      %td{:id => "dbsize", :type => 'number'}
+                      %td#dbsize{:data => {:type => 'number'}}
                     %tr
                       %td Keyspace Hits
-                      %td{:id => "keyspace_hits", :type => 'number'}
+                      %td#keyspace_hits{:data => {:type => 'number'}}
                     %tr
                       %td Keyspace Misses
-                      %td{:id => "keyspace_misses", :type => 'number'}
+                      %td#keyspace_misses{:data => {:type => 'number'}}
                     %tr
                       %td Pub/Sub Channels
-                      %td{:id => "pubsub_channels", :type => 'number'}
+                      %td#pubsub_channels{:data => {:type => 'number'}}
                     %tr
                       %td Pub/Sub Patterns
-                      %td{:id => "pubsub_patterns", :type => 'number'}
+                      %td#pubsub_patterns{:data => {:type => 'number'}}
                     %tr
                       %td Total Connections Received
-                      %td{:id => "total_connections_received", :type => 'number'}
+                      %td#total_connections_received{:data => {:type => 'number'}}
                     %tr
                       %td Total Commands Processed
-                      %td{:id => "total_commands_processed", :type => 'number'}
+                      %td#total_commands_processed{:data => {:type => 'number'}}
                     %tr
                       %td Blocked Clients
-                      %td{:id => "blocked_clients", :type => 'number'}
+                      %td#blocked_clients{:data => {:type => 'number'}}
                     %tr
                       %td Connected Slaves
-                      %td{:id => "connected_slaves", :type => 'number'}
+                      %td#connected_slaves{:data => {:type => 'number'}}
                     %tr
                       %td Last Save
-                      %td{:id => "last_save_time", :type => 'date'}
+                      %td#last_save_time{:data => {:type => 'date'}}
                     %tr
                       %td Changes Since Last Save
-                      %td{:id => "changes_since_last_save", :type => 'number'}
+                      %td#changes_since_last_save{:data => {:type => 'number'}}
                     %tr
                       %td AOF Enabled
-                      %td{:id => "aof_enabled"}
+                      %td#aof_enabled
                     %tr
                       %td VM Enabled
-                      %td{:id => "vm_enabled"}
+                      %td#vm_enabled
 
       .cli.hidden
         .content
           .page-header
             %h1 Command Line Interface
           .row
-            .span21{:style => "height:620px"}
+            .span21{:style => 'height:620px'}
               #terminal
 
       .config.hidden
@@ -145,11 +145,11 @@
             .widget
               .headbar
                 %h2 Parameters
-              %table.condensed-table{:id => "config-table"}
+              %table#config-table.condensed-table
                 %tbody
                 - config.each do |k,v|
                   %tr
-                    %td{:style => "width: 20%"}= k
+                    %td{:style => 'width: 20%'}= k
                     %td
                       .editable{:id => "#{k}"}= v
 
@@ -160,13 +160,14 @@
       .modal-body
         %p This action will, without a doubt, delete all the keys of the redis server.
       .modal-footer
-        %button.btn.secondary{:id => 'flush-cancel-btn'} Well On Second Thought
-        %button.btn.danger{:id => 'flush-confirm-btn'} Just Do It Already!
+        %button#flush-cancel-btn.btn.secondary Well On Second Thought
+        %button#flush-confirm-btn.btn.danger Just Do It Already!
 
 :javascript
   $(document).ready(function() {
     Redmon.init({
       pollInterval : #{poll_interval},
-      cliPrompt    : "#{prompt}"
+      cliPrompt    : '#{prompt}',
+      absoluteUrl  : '#{absolute_url}'
     });
-  });
+  });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redmon
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -307,7 +307,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1243816364635606113
+      hash: -912310078698028843
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -316,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1243816364635606113
+      hash: -912310078698028843
 requirements: []
 rubyforge_project: redmon
 rubygems_version: 1.8.23