memdash 0.0.1 → 0.1.0

data/.travis.yml

@@ -3,3 +3,4 @@ rvm:
   - 1.9.2
   - 1.9.3
   - ruby-head
+env: ADAPTER=active_record

data/Gemfile

@@ -1,3 +1,3 @@
-source 'https://rubygems.org'
+source 'http://rubygems.org'
 
-gemspec
+gemspec :name => 'memdash'

data/README.md

@@ -39,11 +39,13 @@ To view the dashboard, you'll need to add `require 'memdash/server'` to `config/
       mount Memdash::Server.new, :at => "/memdash"
     end
 
-## Why Did I Build This?
+## What's the point?
 
-Memdash is meant to give you insight into your memcached setup without adding overhead to your application. I found it useful when deploying apps to Heroku where the memcached add-on is a bit of a black box. Stuff goes in, stuff comes out. Hopefully, it's being used effectively.
+Memdash is meant to give you insight into your memcached setup without adding overhead to your application or relying on a background process.
 
-## How Does it Work???
+I find it useful when deploying apps to Heroku, where the memcached add-on is a bit of a black box. Stuff goes in, stuff comes out. Hopefully, it's being used effectively. Memdash could fill the gap between not having any statistics and having to send custom data to Scout, New Relic or statsd.
+
+## How Does it Work?
 
 Building on top of [Dalli](https://github.com/mperham/dalli), Memdash hooks into Dalli's chokepoint method to generate statistics.
 

data/Rakefile

@@ -1,9 +1,13 @@
 #!/usr/bin/env rake
 
-require 'bundler/gem_tasks'
+require 'bundler/gem_helper'
 require 'rspec/core/rake_task'
 
-ADAPTERS = %w(active_record)
+Bundler::GemHelper.install_tasks(:name => 'memdash')
+Bundler::GemHelper.install_tasks(:name => 'memdash-activerecord')
+Bundler::GemHelper.install_tasks(:name => 'memdash-mongo_mapper')
+
+ADAPTERS = %w(active_record mongo_mapper)
 
 task :default => :test
 

data/config.ru

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 require 'logger'
-
 require 'memdash/server'
 
 use Rack::ShowExceptions

data/lib/memdash/configuration.rb

@@ -3,6 +3,7 @@ module Memdash
     DEFAULT_TTL = 60
 
     attr_writer :ttl
+    attr_accessor :backend
 
     def ttl
       @ttl ||= DEFAULT_TTL

data/lib/memdash/report.rb

@@ -0,0 +1,11 @@
+module Memdash
+  module Report
+    def self.last
+      Memdash.backend.last
+    end
+    
+    def self.past_day
+      Memdash.backend.past_day      
+    end
+  end
+end

data/lib/memdash/server.rb

@@ -1,6 +1,6 @@
 require 'sinatra/base'
 require 'erb'
-require 'memdash/active_record'
+require 'memdash/report'
 
 module Memdash
   class Server < Sinatra::Base
@@ -32,18 +32,25 @@ module Memdash
       def miss_ratio_percentage(hits, misses)
         miss_ratio(hits, misses) * 100
       end
+
+      def hit_ratio_percentage(hits, misses)
+        hit_ratio(hits, misses) * 100
+      end
     end
 
     get "/" do
-      @last_report = Memdash::ActiveRecord::Report.last
-      past_day = Memdash::ActiveRecord::Report.past_day
+      @last_report = Memdash::Report.last
+      past_day = Memdash::Report.past_day
       @gets = past_day.flat_map{|report| report.stats.map{|_, v| [report.created_at.strftime("%m-%d-%Y %I:%M%p"), v["cmd_get"].to_i]}}
       @sets = past_day.flat_map{|report| report.stats.map{|_, v| [report.created_at.strftime("%m-%d-%Y %I:%M%p"), v["cmd_set"].to_i]}}
       @hits = past_day.flat_map{|report| report.stats.map{|_, v| [report.created_at.strftime("%m-%d-%Y %I:%M%p"), v["get_hits"].to_i]}}
       @misses = past_day.flat_map{|report| report.stats.map{|_, v| [report.created_at.strftime("%m-%d-%Y %I:%M%p"), v["get_misses"].to_i]}}
-      @limit_maxbytes = past_day.flat_map{|report| report.stats.map{|_, v| [report.created_at.strftime("%m-%d-%Y %I:%M%p"), (v["limit_maxbytes"].to_i / 1024.0 / 1024.0).round(2)]}}
+      @delete_hits = past_day.flat_map{|report| report.stats.map{|_, v| [report.created_at.strftime("%m-%d-%Y %I:%M%p"), v["delete_hits"].to_i]}}
+      @delete_misses = past_day.flat_map{|report| report.stats.map{|_, v| [report.created_at.strftime("%m-%d-%Y %I:%M%p"), v["delete_misses"].to_i]}}
+      @engine_maxbytes = past_day.flat_map{|report| report.stats.map{|_, v| [report.created_at.strftime("%m-%d-%Y %I:%M%p"), (v["engine_maxbytes"].to_i / 1024.0 / 1024.0).round(2)]}}
       @bytes = past_day.flat_map{|report| report.stats.map{|_, v| [report.created_at.strftime("%m-%d-%Y %I:%M%p"), (v["bytes"].to_i / 1024.0 / 1024.0).round(2)]}}
       @current_items = past_day.flat_map{|report| report.stats.map{|_, v| [report.created_at.strftime("%m-%d-%Y %I:%M%p"), v["curr_items"].to_i]}}
+      @evictions = past_day.flat_map{|report| report.stats.map{|_, v| [report.created_at.strftime("%m-%d-%Y %I:%M%p"), v["evictions"].to_i]}}
       erb :overview, :layout => :application
     end
   end

data/lib/memdash/server/public/charts.js

@@ -15,6 +15,9 @@ $(document).ready(function(){
         min: $("#gets-sets").data("gets")[0][0],
         max: $("#gets-sets").data("gets")[$("#gets-sets").data("gets").length - 1][0],
         tickInterval: "2 hours",
+      },
+      yaxis: {
+        pad: 1
       }
     },
     seriesDefaults: {
@@ -27,11 +30,12 @@ $(document).ready(function(){
       {label: 'Sets', showMarker: false},
    ],
    legend: {
-    show: true
+     show: true,
+     location: "nw"
    },
    seriesColors: ["rgb(36, 173, 227)", "rgb(227, 36, 132)"]
   });
-  $.jqplot('hits-misses', [$("#hits-misses").data("hits"), $("#hits-misses").data("misses")], {
+  $.jqplot('hits-misses', [$("#hits-misses").data("hits"), $("#hits-misses").data("misses"), $("#hits-misses").data("delete-hits"), $("#hits-misses").data("delete-misses")], {
     title: 'Hits & Misses for the Past Day',
     grid: {
       drawBorder: false,
@@ -49,7 +53,8 @@ $(document).ready(function(){
         tickInterval: "2 hours",
       },
       yaxis: {
-        rendererOptions: { forceTickAt0: true, forceTickAt100: true }
+        rendererOptions: { forceTickAt0: true, forceTickAt100: true },
+        pad: 1
       }
       
     },
@@ -59,15 +64,18 @@ $(document).ready(function(){
       }
     },
     series: [
-       {label: 'Hits', showMarker: false},
-       {label: 'Misses', showMarker: false}
+       {label: 'Get Hits', showMarker: false},
+       {label: 'Get Misses', showMarker: false},
+       {label: 'Delete Hits', showMarker: false},
+       {label: 'Delete Misses', showMarker: false}
     ],
     legend: {
-     show: true
+     show: true,
+     location: "nw"
     },
-    seriesColors: ["rgb(227, 36, 132)", "rgb(227, 193, 36)"]
+    seriesColors: ["rgb(227, 36, 132)", "rgb(227, 193, 36)","rgb(36, 173, 227)", "rgb(199, 255, 25)"]
   });
-  $.jqplot('memory-usage', [$("#memory-usage").data("limit-maxbytes"), $("#memory-usage").data("bytes")], {
+  $.jqplot('memory-usage', [$("#memory-usage").data("engine-maxbytes"), $("#memory-usage").data("bytes")], {
     title: 'Cache Memory for the Past Day',
     grid: {
       drawBorder: false,
@@ -80,9 +88,12 @@ $(document).ready(function(){
         tickOptions: {
           formatString:'%#I %p'
         },
-        min: $("#memory-usage").data("limit-maxbytes")[0][0],
-        max: $("#memory-usage").data("limit-maxbytes")[$("#memory-usage").data("limit-maxbytes").length - 1][0],
+        min: $("#memory-usage").data("engine-maxbytes")[0][0],
+        max: $("#memory-usage").data("engine-maxbytes")[$("#memory-usage").data("engine-maxbytes").length - 1][0],
         tickInterval: "2 hours",
+      },
+      yaxis: {
+        pad: 1
       }
     },
     seriesDefaults: {
@@ -95,7 +106,8 @@ $(document).ready(function(){
        {label: 'Used (MB)', showMarker: false}
     ],
     legend: {
-     show: true
+      show: true,
+      location: "nw"
     },
     seriesColors: ["rgb(227, 193, 36)", "rgb(36, 173, 227)"]
   });
@@ -117,7 +129,8 @@ $(document).ready(function(){
         tickInterval: "2 hours",
       },
       yaxis: {
-        rendererOptions: { forceTickAt0: true, forceTickAt100: true }
+        rendererOptions: { forceTickAt0: true, forceTickAt100: true },
+        pad: 1
       }
     },
     seriesDefaults: {
@@ -129,8 +142,45 @@ $(document).ready(function(){
        {label: 'Items', showMarker: false},
     ],
     legend: {
-     show: true
+      show: true,
+      location: "nw"
     },
     seriesColors: ["rgb(227, 193, 36)"]
   });
+  $.jqplot('evictions', [$("#evictions").data("evictions")], {
+    title: 'Evictions over the Past Day',
+    grid: {
+      drawBorder: false,
+      shadow: false,
+      background: '#fefefe'
+    },
+    axes:{
+      xaxis:{
+        renderer: $.jqplot.DateAxisRenderer,
+        tickOptions: {
+          formatString:'%#I %p'
+        },
+        min: $("#evictions").data("evictions")[0][0],
+        max: $("#evictions").data("evictions")[$("#evictions").data("evictions").length - 1][0],
+        tickInterval: "2 hours",
+      },
+      yaxis: {
+        rendererOptions: { forceTickAt0: true, forceTickAt100: true },
+        pad: 1
+      }
+    },
+    seriesDefaults: {
+      rendererOptions: {
+        smooth: true,
+      }
+    },
+    series: [
+       {label: 'Items', showMarker: false},
+    ],
+    legend: {
+      show: true,
+      location: "nw"
+    },
+    seriesColors: ["rgb(227, 36, 132)"]
+  });
 });

data/lib/memdash/server/views/overview.erb

@@ -1,19 +1,23 @@
 <div class="hero-stats">
   <ol class="row">
-    <li class="span4"><span class="count"><%= miss_ratio_percentage(@last_report.stats.map{|_, v| v["get_hits"].to_f}.sum, @last_report.stats.map{|_, v| v["get_misses"].to_f}.sum).round(2) %>%</span>Cache miss ratio</li>
+    <li class="span4"><span class="count"><%= hit_ratio_percentage(@last_report.stats.map{|_, v| v["get_hits"].to_f}.sum, @last_report.stats.map{|_, v| v["get_misses"].to_f}.sum).round(2) %>%</span>Cache hit rate</li>
     <li class="span4"><span class="count"><%= @last_report.stats.map{|_, v| v["curr_items"]}.sum %></span>Current items in memcache</li>
-    <li class="span4"><span class="count"><%= (@last_report.stats.map{|_,v| v["bytes"].to_i}.sum / 1024.0 / 1024.0).round(2) %>/<%= @last_report.stats.map{|_,v| v["limit_maxbytes"].to_i}.sum / 1024 / 1024 %> MB</span>Current memory usage</li>
+    <li class="span4"><span class="count"><%= (@last_report.stats.map{|_,v| v["bytes"].to_i}.sum / 1024.0 / 1024.0).round(2) %>/<%= @last_report.stats.map{|_,v| v["engine_maxbytes"].to_i}.sum / 1024 / 1024 %> MB</span>Current memory usage</li>
   </ol>  
 </div>
 
 <section class="container">
   <div class="row">
     <div id="gets-sets" class="span6" data-gets='<%= @gets %>' data-sets='<%= @sets %>'></div>
-    <div id="hits-misses" class="span6" data-hits='<%= @hits %>' data-misses='<%= @misses %>'></div>
+    <div id="hits-misses" class="span6" data-hits='<%= @hits %>' data-misses='<%= @misses %>' data-delete-hits='<%= @delete_hits %>' data-delete-misses='<%= @delete_misses %>'></div>
   </div>
 
   <div class="row">
-    <div id="memory-usage" class="span6" data-limit-maxbytes='<%= @limit_maxbytes %>' data-bytes='<%= @bytes %>'></div>
+    <div id="memory-usage" class="span6" data-engine-maxbytes='<%= @engine_maxbytes %>' data-bytes='<%= @bytes %>'></div>
     <div id="current-items" class="span6" data-current-items='<%= @current_items %>'></div>
   </div>
+
+  <div class="row">
+    <div id="evictions" class="span6" data-evictions='<%= @evictions %>'></div>    
+  </div>
 </section>

data/memdash-activerecord.gemspec

@@ -0,0 +1,19 @@
+# encoding: utf-8
+
+Gem::Specification.new do |gem|
+  gem.name    = 'memdash-activerecord'
+  gem.version = '0.1.0'
+
+  gem.authors     = ['Brian Ryckbost', 'Steve Richert']
+  gem.email       = 'bryckbost@gmail.com'
+  gem.description = 'A dashboard for your memcached, storing data in ActiveRecord.'
+  gem.summary     = 'A dashboard for your memcached, storing data in ActiveRecord.'
+  gem.homepage    = 'https://github.com/bryckbost/memdash'
+
+  gem.add_dependency 'memdash', gem.version
+  gem.add_dependency 'activerecord', '~> 3.0'
+
+  gem.files         = `git ls-files lib`.split($\).grep(/(active_?record|generators)/)
+  gem.require_paths = ['lib']
+end
+

data/memdash-mongo_mapper.gemspec

@@ -0,0 +1,19 @@
+# encoding: utf-8
+
+Gem::Specification.new do |gem|
+  gem.name    = 'memdash-mongo_mapper'
+  gem.version = '0.1.0'
+
+  gem.authors     = ['Brian Ryckbost']
+  gem.email       = 'bryckbost@gmail.com'
+  gem.description = 'A dashboard for your memcached, storing data in MongoMapper.'
+  gem.summary     = 'A dashboard for your memcached, storing data in MongoMapper.'
+  gem.homepage    = 'https://github.com/bryckbost/memdash'
+
+  gem.add_dependency 'memdash', gem.version
+  gem.add_dependency 'mongo_mapper', '~> 0.11'
+
+  gem.files         = `git ls-files lib`.split($\).grep(/(mongo_mapper)/)
+  gem.require_paths = ['lib']
+end
+

data/memdash.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name    = 'memdash'
-  gem.version = '0.0.1'
+  gem.version = '0.1.0'
 
   gem.authors     = ['Brian Ryckbost', 'Steve Richert']
   gem.email       = ['bryckbost@gmail.com', 'steve.richert@gmail.com']
@@ -10,16 +10,18 @@ Gem::Specification.new do |gem|
   gem.summary     = 'A dashboard for your memcache'
   gem.homepage    = 'https://github.com/bryckbost/memdash'
 
-  gem.add_dependency 'activerecord', '~> 3.0'
   gem.add_dependency 'dalli',        '~> 2.0'
   gem.add_dependency 'sinatra',      '~> 1.3'
 
+  gem.add_development_dependency 'activerecord'
+  gem.add_development_dependency 'bson_ext'
+  gem.add_development_dependency 'mongo_mapper'
   gem.add_development_dependency 'database_cleaner'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'sqlite3'
+  gem.add_development_dependency 'sqlite3'  
 
-  gem.files         = `git ls-files`.split($\)
-  gem.test_files    = gem.files.grep(/^spec\//)
+  gem.files         = `git ls-files`.split($\).reject{|f| f =~ /(lib\/memdash\-|adapters|generators)/ }
+  gem.test_files    = `git ls-files`.split($\).grep(/^spec\//)
   gem.require_paths = ['lib']
 end

data/spec/support/adapters/active_record.rb

@@ -1,8 +1,8 @@
-require 'memdash/active_record'
+require 'memdash/adapters/active_record'
 
 module ActiveRecordHelpers
   def reports_count
-    Memdash::ActiveRecord::Report.count
+    Memdash::Adapters::ActiveRecord::Report.count
   end
 end
 

data/spec/support/adapters/mongo_mapper.rb

@@ -0,0 +1,15 @@
+require 'memdash/adapters/mongo_mapper'
+require 'mongo_mapper'
+
+MongoMapper.connection = Mongo::Connection.new
+MongoMapper.database = 'memdash_test'
+
+module MongoMapperHelpers
+  def reports_count
+    Memdash::Adapters::MongoMapper::Report.count
+  end
+end
+
+RSpec.configure do |config|
+  config.include MongoMapperHelpers
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: memdash
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,16 +10,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-25 00:00:00.000000000 Z
+date: 2012-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: dalli
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,15 +27,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: dalli
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,23 +43,55 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bson_ext
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mongo_mapper
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -140,14 +172,10 @@ files:
 - README.md
 - Rakefile
 - config.ru
-- lib/generators/memdash/active_record_generator.rb
-- lib/generators/memdash/templates/migration.rb
 - lib/memdash.rb
-- lib/memdash/active_record.rb
-- lib/memdash/active_record/client.rb
-- lib/memdash/active_record/report.rb
 - lib/memdash/client.rb
 - lib/memdash/configuration.rb
+- lib/memdash/report.rb
 - lib/memdash/server.rb
 - lib/memdash/server/public/charts.js
 - lib/memdash/server/public/cross_scratches.png
@@ -161,15 +189,18 @@ files:
 - lib/memdash/server/public/style.css
 - lib/memdash/server/views/application.erb
 - lib/memdash/server/views/overview.erb
+- memdash-activerecord.gemspec
+- memdash-mongo_mapper.gemspec
 - memdash.gemspec
 - screenshot.png
 - spec/memdash_spec.rb
 - spec/spec_helper.rb
-- spec/support/adapters/active_record.rb
 - spec/support/dalli.rb
 - spec/support/database_cleaner.rb
 - spec/support/memcached.rb
 - spec/support/schema.rb
+- spec/support/adapters/active_record.rb
+- spec/support/adapters/mongo_mapper.rb
 homepage: https://github.com/bryckbost/memdash
 licenses: []
 post_install_message: 
@@ -198,6 +229,7 @@ test_files:
 - spec/memdash_spec.rb
 - spec/spec_helper.rb
 - spec/support/adapters/active_record.rb
+- spec/support/adapters/mongo_mapper.rb
 - spec/support/dalli.rb
 - spec/support/database_cleaner.rb
 - spec/support/memcached.rb

data/lib/generators/memdash/active_record_generator.rb

@@ -1,17 +0,0 @@
-require 'rails/generators/migration'
-require 'rails/generators/active_record/migration'
-
-module Memdash
-  module Generators
-    class ActiveRecordGenerator < Rails::Generators::Base
-      include Rails::Generators::Migration
-      extend ActiveRecord::Generators::Migration
-
-      self.source_paths << File.join(File.dirname(__FILE__), 'templates')
-
-      def create_migration_file
-        migration_template 'migration.rb', 'db/migrate/create_memdash_active_record_reports.rb'
-      end
-    end
-  end
-end

data/lib/generators/memdash/templates/migration.rb

@@ -1,12 +0,0 @@
-class CreateMemdashActiveRecordReports < ActiveRecord::Migration
-  def self.up
-    create_table :memdash_reports do |table|
-      table.text :stats
-      table.datetime :created_at
-    end
-  end
-
-  def self.down
-    drop_table :memdash_reports
-  end
-end

data/lib/memdash/active_record.rb

@@ -1,2 +0,0 @@
-require 'memdash'
-require 'memdash/active_record/client'

data/lib/memdash/active_record/client.rb

@@ -1,13 +0,0 @@
-require 'memdash/active_record/report'
-
-module Memdash
-  module ActiveRecord
-    module Client
-      def generate_stats
-        Memdash::ActiveRecord::Report.create!(:stats => stats)
-      end
-    end
-  end
-end
-
-Dalli::Client.send(:include, Memdash::ActiveRecord::Client)

data/lib/memdash/active_record/report.rb

@@ -1,13 +0,0 @@
-require 'active_record'
-
-module Memdash
-  module ActiveRecord
-    class Report < ::ActiveRecord::Base
-      self.table_name = :memdash_reports
-
-      serialize :stats
-
-      scope :past_day, where('created_at >= :time', :time => Time.current - 1.day)
-    end
-  end
-end