redmon 0.0.4 → 0.0.5

data/.gitignore

@@ -1,8 +1,9 @@
 *.gem
 .bundle
-/vendor
+.rbenv-version
 .DS_Store
 dump.rdb
-Gemfile.lock
-.rvmrc
-highcharts.js
+pkg
+vendor
+!/lib/redmon/public/vendor
+Gemfile.lock

data/.travis.yml

@@ -1 +1,9 @@
-rvm: 1.9.3
+language: ruby
+rvm:
+  - ree-1.8.7
+  - 1.9.2
+  - 1.9.3
+branches:
+  only:
+    - master
+    - ruby-1.8

data/README.md

@@ -1,12 +1,12 @@
 # Redmon
 
-** Work in progress in the very early stages of dev **
-
 Simple sinatra based dashbord for redis.  After seeing the [fnordmetric](https://github.com/paulasmuth/fnordmetric)
 project I was inspired to write this.  Some of the ideas there have be carried over here.
 
 [ ![Build status - Travis-ci](https://secure.travis-ci.org/steelThread/redmon.png) ](http://travis-ci.org/steelThread/redmon)
 
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/steelThread/redmon)
+
 ----
 
 Watch your redis server live.
@@ -38,17 +38,18 @@ gem install redmon
 ## Usage
 
 ```bash
-$ bundle install
-$ bundle exec bin/redmon -h
-Usage: bin/redmon (options)
+$ redmon -h
+Usage: /Users/sean/codez/steelThread/redmon/vendor/ruby/1.9.1/bin/redmon (options)
     -a, --address ADDRESS            The thin bind address for the app (default: 0.0.0.0)
     -n, --namespace NAMESPACE        The root Redis namespace (default: redmon)
     -i, --interval SECS              Poll interval in secs for the worker (default: 10)
     -p, --port PORT                  The thin bind port for the app (default: 4567)
     -r, --redis URL                  The Redis url for monitor (default: redis://127.0.0.1:6379)
+    -s, --secure CREDENTIALS         Use basic auth. Colon separated credentials, eg admin:admin.
         --no-app                     Do not run the web app to present stats
         --no-worker                  Do not run a worker to collect the stats
-$ bundle exec bin/redmon
+
+$ redmon
 >> Thin web server (v1.3.1 codename Triple Espresso)
 >> Maximum connections set to 1024
 >> Listening on 0.0.0.0:4567, CTRL+C to stop
@@ -63,7 +64,6 @@ $ ruby load_sim.rb
 
 Open your browser to 0.0.0.0:4567
 
-
 ## Using in a Rails application
 
 Add to Gemfile:
@@ -85,12 +85,14 @@ You can configure the Redmon using an initializer config/initializers/redmon.rb:
 Redmon.configure do |config|
   config.redis_url = 'redis://127.0.0.1:6379'
   config.namespace = 'redmon'
-  config.poll_interval = 10
 end
 ```
 
 This will mount the Redmon application to the /redmon/ path. The trailing slash
-is important.
+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.
 
 ## License
 

data/bin/redmon

@@ -1,12 +1,13 @@
 #!/usr/bin/env ruby
 
+require 'rubygems'
 require 'mixlib/cli'
 require 'redmon'
 
 class RedmonCLI
   include Mixlib::CLI
 
-  to_i =-> s {s.to_i}
+  to_i = lambda { |s| s.to_i }
 
   option :address,
     :short       => '-a ADDRESS',
@@ -33,6 +34,11 @@ class RedmonCLI
     :default     => 'redmon',
     :description => 'The root Redis namespace (default: redmon)'
 
+  option :secure,
+    :short       => '-s CREDENTIALS',
+    :long        => '--secure CREDENTIALS',
+    :description => "Use basic auth. Colon separated credentials, eg admin:admin."
+
   option :poll_interval,
     :short       => '-i SECS',
     :long        => '--interval SECS',
@@ -56,10 +62,10 @@ class RedmonCLI
 
   def run
     parse_options
-    config[:web_interface] = [config[:address], config[:port]]
+    config[:web_interface] = [config[:address], config[:port]] if config[:app]
     config
   end
 
 end
 
-Redmon.run RedmonCLI.new.run
+Redmon.run RedmonCLI.new.run

data/lib/redmon.rb

@@ -1,10 +1,5 @@
-require 'redmon/config'
-require 'active_support/core_ext'
 require 'eventmachine'
-require 'haml'
-require 'redis'
-require 'sinatra/base'
-require 'thin'
+require 'active_support/core_ext'
 
 module Redmon
   extend self
@@ -13,8 +8,11 @@ module Redmon
     config.apply opts
     start_em
   rescue Exception => e
-    log "!!! Redmon has shit the bed, restarting... #{e.message}"
-    sleep(1); run(opts)
+    unless e.is_a?(SystemExit)
+      log "!!! Redmon has shit the bed, restarting... #{e.message}"
+      sleep(1)
+      run(opts)
+    end
   end
 
   def start_em
@@ -27,8 +25,10 @@ module Redmon
   end
 
   def start_app
-    app = Redmon::App.new
-    Thin::Server.start(*config.web_interface, app)
+    require 'thin'
+    Thin::Server.start(*config.web_interface) do
+      run Redmon::App.new
+    end
     log "listening on http##{config.web_interface.join(':')}"
   rescue Exception => e
     log "Can't start Redmon::App. port in use?  Error #{e}"
@@ -46,14 +46,10 @@ module Redmon
     puts "[#{Time.now.strftime('%y-%m-%d %H:%M:%S')}] #{msg}"
   end
 
-  # @deprecated
-  def [](option)
-    config.send :option
-  end
+  require 'redmon/config'
+  require 'redmon/redis'
 
-end
+  autoload :App,    'redmon/app'
+  autoload :Worker, 'redmon/worker'
 
-require 'redmon/redis'
-require 'redmon/helpers'
-require 'redmon/app'
-require 'redmon/worker'
+end

data/lib/redmon/app.rb

@@ -1,4 +1,6 @@
+require 'sinatra/base'
 require 'redmon/helpers'
+require 'haml'
 
 module Redmon
   class App < Sinatra::Base
@@ -6,17 +8,24 @@ module Redmon
     helpers Redmon::Helpers
 
     use Rack::Static, {
-      urls: [/\.css$/, /\.js$/],
-      root: "#{root}/public",
-      cache_control: 'public, max-age=3600'
+      :urls => [/\.css$/, /\.js$/],
+      :root => "#{root}/public",
+      :cache_control => 'public, max-age=3600'
     }
 
+    if Redmon.config.secure
+      use Rack::Auth::Basic do |username, password|
+        [username, password] == Redmon.config.secure.split(':')
+      end
+    end
+
     get '/' do
       haml :app
     end
 
     get '/cli' do
-      args = params[:command].split
+      args = params[:command].split(/ *"(.*?)" *| *'(.*?)' *| /)
+      args.reject!(&:blank?)
       @cmd = args.shift.downcase.intern
       begin
         raise RuntimeError unless supported? @cmd
@@ -44,4 +53,4 @@ module Redmon
     end
 
   end
-end
+end

data/lib/redmon/config.rb

@@ -14,7 +14,8 @@ module Redmon
       :app           => true,
       :worker        => true,
       :web_interface => ['0.0.0.0', 4567],
-      :poll_interval => 10
+      :poll_interval => 10,
+      :secure        => false
     }
 
     attr_accessor(*DEFAULTS.keys)
@@ -24,8 +25,8 @@ module Redmon
     end
 
     def apply(opts)
-      opts.each {|k,v| send("#{k}=", v) if respond_to? k}
+      opts.each { |k,v| send("#{k}=", v) if respond_to? k }
     end
 
   end
-end
+end

data/lib/redmon/helpers.rb

@@ -1,5 +1,3 @@
-require 'redmon/redis'
-
 module Redmon
   module Helpers
     include Redmon::Redis
@@ -17,4 +15,4 @@ module Redmon
     end
 
   end
-end
+end

data/lib/redmon/public/redmon.css

@@ -108,7 +108,21 @@ body {
 
 #terminal input:focus{ box-shadow:none; }
 
-.chart {
+.chart-container {
+  position: relative;
   width:880px;
   height:225px;
+  margin-top: 10px;
+}
+
+.label {
+  padding: none;
+  font-size: inherit;
+  font-weight: bold;
+  color: white;
+  text-transform: uppercase;
+  background-color: #404040;
+  -webkit-border-radius: none;
+  -moz-border-radius: none;
+  border-radius: none;
 }

data/lib/redmon/public/redmon.js

@@ -52,17 +52,20 @@ var Redmon = (function() {
   }
 
   function formatDate(date) {
-    var d = new Date(parseInt(parseInt(date)));
+    var d = new Date(parseInt(date));
     return d.getMonth()+1+'/'+d.getDate()+' '+d.getHours()+':'+d.getMinutes()+':'+d.getSeconds();
   }
 
   function formatNumber(num) {
-    return (num + "").replace(/(\d)(?=(\d{3})+(\.\d+|)\b)/g, "$1,");
+    return d3.format(',.0f')(d3.round(num, 2));
+  }
+
+  function formatMetric(num) {
+    return d3.format('s')(num);
   }
 
   function formatTime(time) {
-    var d = new Date(parseInt(parseInt(time)));
-    return d.getHours()+':'+d.getMinutes();
+    return d3.time.format('%H:%S')(new Date(time));
   }
 
   /**
@@ -70,10 +73,10 @@ var Redmon = (function() {
    */
   function base1024(arg) {
     var y = arg;
-    if (y >= 1073741824)     { return (y / 1073741824).toFixed(2) + "GB" }
-    else if (y >= 1048576)   { return (y / 1048576).toFixed(1) + "MB" }
-    else if (y >= 1024)      { return (y / 1024).toFixed(0) + "KB" }
-    else if (y < 1 && y > 0) { return y.toFixed(0) }
+    if (y >= 1073741824)     { return (y / 1073741824).toFixed(2) + "Gb" }
+    else if (y >= 1048576)   { return (y / 1048576).toFixed(1) + "Mb" }
+    else if (y >= 1024)      { return (y / 1024).toFixed(0) + "Kb" }
+    else if (y < 1 && y > 0) { return y.toFixed(0) + "b"}
     else                     { return y }
   }
 
@@ -146,57 +149,57 @@ var Redmon = (function() {
   //////////////////////////////////////////////////////////////////////
   // encapsulate the keyspace chart
   var memoryWidget = (function() {
-    var plot
-      , dataset;
+    var chart
+      , dataset = [];
 
     function render(data) {
       dataset = points(data);
-      plot = $.plot('#memory-container', [dataset], {
-        lines: {
-          show: true,
-          fill: true,
-          color: 'rgb(255,50,50)'
-        },
-        points: { show: false },
-        series: { shadowSize: 3 },
-        yaxis:  { tickFormatter: base1024},
-        xaxis:  { tickFormatter: formatTime},
-        grid: {
-          hoverable: true,
-          clickable: true,
-          backgroundColor: {
-            colors: ['#ddd', '#fff']
-          }
-        }
-      });
+      chart = nv.models.lineChart()
+        .x(function(d) { return d.x })
+        .y(function(d) { return d.y })
+        .margin({top : 10, right : 20, bottom : 20, left : 60})
+        .showLegend(false);
+
+      chart.xAxis
+        .tickFormat(formatTime);
+
+      chart.yAxis
+        .tickFormat(base1024);
+
+      update();
+
+      events.bind('data', onData);
     }
 
     function points(data) {
-      return data.map(point);
+      if (data.length)
+        return data.map(point);
+
+      return [];
     }
 
     function point(info) {
-      return [
-        parseInt(info.time),
-        parseInt(info.used_memory)
-      ]
+      return !info ? {} : {
+        x : parseInt(info.time),
+        y : parseInt(info.used_memory)
+      }
     }
 
     function onData(ev, data) {
-      if (data) {
-        if (dataset.length >= 100) {
-          dataset.shift()
-        }
-
-        dataset.push(point(data));
-        plot.setData([dataset]);
-        plot.setupGrid();
-        plot.draw();
+      if (dataset.length >= 200) {
+        dataset.shift()
       }
+
+      dataset.push(point(data));
+      update();
     }
 
-    // observe data events
-    events.bind('data', onData);
+    function update() {
+      d3.select('#memory-chart svg')
+        .datum([{key : '', values: dataset}])
+        .transition()
+          .ease("linear").call(chart);
+    }
 
     return {
       render: render
@@ -206,47 +209,45 @@ var Redmon = (function() {
   //////////////////////////////////////////////////////////////////////
   // encapsulate the keyspace chart
   var keyspaceWidget = (function() {
-    var plot
+    var chart
       , dataset = {
-        hits: {label: 'Hits', data: []},
-        misses: {label: 'Misses', data: []},
+        hits:   {key: 'Hits'   , values: []},
+        misses: {key: 'Misses' , values: []},
         load: function(data) {
           var self = this;
           points(data).forEach(function(point) {self.push(point)});
-          return self.series();
+          return self;
         },
         append: function(data) {
-          if (this.hits.length >= 100) this.shift();
+          if (this.hits.values.length >= 100) this.shift();
           this.push(point(data));
-          return this;
         },
         push: function(point) {
-          this.hits.data.push(point[0]);
-          this.misses.data.push(point[1]);
+          this.hits.values.push(point[0]);
+          this.misses.values.push(point[1]);
         },
         shift: function() {
-          this.hits.data.shift();
-          this.misses.data.shift();
-        },
-        series: function() {
-          return [this.hits, this.misses]
+          this.hits.values.shift();
+          this.misses.values.shift();
         }
       };
 
     function render(data) {
-      plot = $.plot('#keyspace-container', dataset.load(data), {
-        series: { shadowSize: 3 },
-        legend: { show: false },
-        yaxis:  { tickFormatter: formatNumber },
-        xaxis:  { tickFormatter: formatTime },
-        grid: {
-          hoverable: true,
-          clickable: true,
-          backgroundColor: {
-            colors: ['#ddd', '#fff']
-          }
-        }
-      });
+      dataset.load(data);
+      chart = nv.models.lineChart()
+        .x(function(d) { return d.x })
+        .y(function(d) { return d.y })
+        .margin({top : 10, right : 20, bottom : 20, left : 60});
+
+      chart.xAxis
+        .tickFormat(formatTime);
+
+      chart.yAxis
+        .tickFormat(formatMetric);
+
+      update();
+
+      events.bind('data', onData);
     }
 
     function points(data) {
@@ -256,21 +257,27 @@ var Redmon = (function() {
     function point(info) {
       var time = parseInt(info.time);
       return [
-        [time, parseInt(info.keyspace_hits)],
-        [time, parseInt(info.keyspace_misses)]
+        {x: time, y: parseInt(info.keyspace_hits)},
+        {x: time, y: parseInt(info.keyspace_misses)}
       ];
     }
 
     function onData(ev, data) {
-      if (data) {
-        plot.setData(dataset.append(data).series());
-        plot.setupGrid();
-        plot.draw();
-      }
+      dataset.append(data);
+      update();
     }
 
-    // observe data events
-    events.bind('data', onData);
+    function update() {
+      var data = [
+        {key : dataset.hits.key, values : dataset.hits.values, color : '#0000FF'},
+        {key : dataset.misses.key, values : dataset.misses.values, color : '#FF0000'}
+      ];
+
+      d3.select('#keyspace-chart svg')
+        .datum(data)
+        .transition()
+          .ease("linear").call(chart);
+    }
 
     return {
       render: render
@@ -281,7 +288,8 @@ var Redmon = (function() {
   // encapsulate the info widget
   var infoWidget = (function() {
     function render(data) {
-      updateTable(data[data.length-1]);
+      if (data && data.length)
+        updateTable(data[data.length-1]);
     }
 
     function onData(ev, data) {