pimon 0.1.4 → 0.1.5

data/Gemfile

@@ -2,7 +2,6 @@ source :rubygems
 
 gem 'capistrano'
 gem 'haml'
-gem 'redis'
 gem 'sinatra', :require => 'sinatra/base'
 gem 'sinatra-websocket', '~> 0.2.0'
 gem 'thin', '~> 1.5.0'
@@ -10,7 +9,6 @@ gem 'thin', '~> 1.5.0'
 gem 'pry', :group => [:development, :test]
 
 group :test do
-  gem 'mock_redis', '~> 0.5.0'
   gem 'rack-test'
   gem 'rspec', '~> 2.11.0'
   gem 'simplecov', :require => false

data/Gemfile.lock

@@ -19,7 +19,6 @@ GEM
     highline (1.6.15)
     jruby-pageant (1.1.1)
     method_source (0.8)
-    mock_redis (0.5.2)
     multi_json (1.3.6)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
@@ -38,7 +37,6 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    redis (3.0.2)
     rspec (2.11.0)
       rspec-core (~> 2.11.0)
       rspec-expectations (~> 2.11.0)
@@ -75,10 +73,8 @@ PLATFORMS
 DEPENDENCIES
   capistrano
   haml
-  mock_redis (~> 0.5.0)
   pry
   rack-test
-  redis
   rspec (~> 2.11.0)
   simplecov
   simplecov-rcov

data/README.md

@@ -6,23 +6,18 @@
 
 ## Description
 Pimon is a simple server monitor designed for the Raspberry Pi.
-It uses redis lists to keep the latest observed statistics and also uses
-highcharts to display some nice charts on your web browser.
 
 ## What do I need to get it to work?
 1. Clone this repo: git clone git://github.com/pedrocarrico/pimon.git
-2. Install redis an configure it to run on a socket on /tmp/redis.sock
-3. bundle
-4. bin/pimon start # run the sinatra app
-5. go to http://localhost:3000 and PROFIT!
+2. bundle
+3. bin/pimon start # run the sinatra app
+4. go to http://localhost:3000 and PROFIT!
 Optionally you may install it as a gem and run it, please check "Installing as a gem" further down.
 
 ## Configuration
 Configuration is done through a YAML file, you may check some examples on the config directory.
 
-1. redis - location of the redis socket
 2. chart - colors for each chart
-3. queues - redis list names for the series in the charts
 4. stats_collector - configure number of stats and time period between them
 
 ## Installing as a gem

data/config/default.yml

@@ -1,5 +1,3 @@
-redis:
-  socket: /tmp/redis.sock
 chart:
   cpu:
     color: '#D2691E'
@@ -11,13 +9,6 @@ chart:
     color: '#FF9B04'
   swap:
     color: '#3CB371'
-queues:
-  time: pimon_time
-  cpu:  pimon_cpu
-  disk: pimon_disk
-  mem:  pimon_mem
-  swap: pimon_swap
-  temp: pimon_temp
 stats_collector:
   number_of_stats: 6
-  time_period_in_min: 1
+  time_period_in_secs: 30

data/config/test.yml

@@ -2,8 +2,6 @@ basic_auth:
   enabled: true
   username: pimon
   password: pimon
-redis:
-  socket: /thou/shalt/not/use/redis/on/test/environment
 chart:
   cpu:
     color: '#D2691E'

data/config/test_broken.yml

@@ -1,7 +1,3 @@
-basic_auth:
-  enabled: true
-redis:
-  socket: /thou/shalt/not/use/redis/on/test/environment
 chart:
   cpu:
     color: '#D2691E'
@@ -11,12 +7,6 @@ chart:
     color: '#87CEFA'
   swap:
     color: '#3CB371'
-queues:
-  time: pimon_time
-  cpu:  pimon_cpu
-  disk: pimon_disk
-  mem:  pimon_mem
-  swap: pimon_swap
 stats_collector:
   number_of_stats: 6
   time_period_in_min: 10

data/lib/pimon.rb

@@ -18,12 +18,11 @@ class Pimon < Sinatra::Base
   set :sockets, []
 
   configure :development, :production do
-    require 'redis'
     filename = "#{File.dirname(__FILE__)}/../config/default.yml"
     config = PimonConfig.create_new(ENV['PIMON_CONFIG'] || filename)
     
     EventMachine::next_tick do
-      settings.timer = EventMachine::add_periodic_timer(config.stats[:time_period_in_min] * 60) do
+      settings.timer = EventMachine::add_periodic_timer(config.stats[:time_period_in_secs]) do
         settings.stats_checker.collect_stats
         @stats = settings.stats_checker.show_stats
         
@@ -32,20 +31,20 @@ class Pimon < Sinatra::Base
     end
     
     set :config, config
-    set :stats_checker, StatsCollector.new(config, Redis.new(:path => config.redis[:socket]))
+    set :stats_checker, StatsCollector.new(config)
     set :timer, nil
     
+    settings.stats_checker.collect_stats
+    @stats = settings.stats_checker.show_stats
   end
   
   configure :test do
-    require 'mock_redis'
     
     config = PimonConfig.create_new("#{File.dirname(__FILE__)}/../config/test.yml")
     
     set :config, config
-    set :stats_checker, StatsCollector.new(config, MockRedis.new)
+    set :stats_checker, StatsCollector.new(config)
     set :timer, nil
-    
   end
   
   get '/' do

data/lib/pimon/pimon_config.rb

@@ -3,45 +3,17 @@ require 'yaml'
 
 class PimonConfig
   def self.create_new(filename)
-    config = self.new(filename)
-    
-    return config if config.valid?
-  end
-  
-  def basic_auth
-    if is_basic_auth_enabled? && has_authentication_details?
-      [@config[:basic_auth][:username], @config[:basic_auth][:password]]
-    else
-      nil
-    end
+    return self.new(filename)
   end
   
   def chart
     @config[:chart]
   end
   
-  def is_basic_auth_enabled?
-    @config[:basic_auth][:enabled]
-  end
-  
-  def queues
-    @config[:queues]
-  end
-  
-  def redis
-    @config[:redis]
-  end
-  
   def stats
     @config[:stats_collector]
   end
   
-  def valid?
-    raise "Basic auth enabled with no authentication details" if is_basic_auth_enabled? && !has_authentication_details?
-    raise "Redis has no socket details" unless has_redis_details?
-    true
-  end
-  
   private
   
   def initialize(filename)
@@ -53,17 +25,4 @@ class PimonConfig
       raise e
     end
   end
-  
-  def has_authentication_details?
-    @config[:basic_auth].has_key?(:username) && @config[:basic_auth].has_key?(:password)
-  end
-  
-  def has_redis_details?
-    # Thou shalt not use a live redis in test environment
-    is_test_environment? || (@config.has_key?(:redis) && @config[:redis].has_key?(:socket))
-  end
-  
-  def is_test_environment?
-    @config[:environment] == 'test'
-  end
 end

data/lib/pimon/probe/time_check.rb

@@ -0,0 +1,11 @@
+require 'pimon/probe/probe'
+
+class Probe::TimeCheck < Probe
+  def self.check
+    Time.now.strftime("%Y-%m-%d %H:%M:%S")
+  end
+  
+  def self.symbol
+    :time
+  end
+end

data/lib/pimon/stats.rb

@@ -0,0 +1,25 @@
+class Stats
+  
+  def initialize(queues)
+    @stats = {}
+    queues.each do |queue|
+      @stats[queue] = []
+    end
+  end
+  
+  def index(queue, index)
+    @stats[queue][index]
+  end
+
+  def push(queue, value)
+    @stats[queue].push(value)
+  end
+  
+  def shift(queue)
+    @stats[queue].shift
+  end
+  
+  def range(queue)
+    @stats[queue]
+  end
+end

data/lib/pimon/stats_collector.rb

@@ -4,45 +4,52 @@ require 'pimon/probe/cpu_usage'
 require 'pimon/probe/disk_usage'
 require 'pimon/probe/memory_usage'
 require 'pimon/probe/swap_usage'
+require 'pimon/probe/time_check'
 require 'pimon/probe/temperature'
+require 'pimon/stats'
 
 class StatsCollector
-  def initialize(config, redis)
+  def initialize(config)
     @config = config
-    @redis = redis
-    @probes = [Probe::CpuUsage, Probe::MemoryUsage, Probe::SwapUsage, Probe::DiskUsage, Probe::Temperature]
+    @probes = [
+      Probe::TimeCheck,
+      Probe::CpuUsage,
+      Probe::MemoryUsage,
+      Probe::SwapUsage,
+      Probe::DiskUsage,
+      Probe::Temperature
+    ]
+    @stats = Stats.new(@probes.map(&:symbol).concat([:time]))
   end
   
   def collect_stats
     pop_old_stats
     
-    @redis.rpush(@config.queues[:time], Time.now.strftime("%Y-%m-%d %H:%M:%S"))
     @probes.each do |probe|
-      @redis.rpush(@config.queues[probe.symbol], probe.check)
+      @stats.push(probe.symbol, probe.check)
     end
   end
   
   def last_update
-    time = @redis.lindex(@config.queues[:time], @config.stats[:number_of_stats] - 1)
+    time = @stats.index(:time, @config.stats[:number_of_stats] - 1)
     
     DateTime.parse(time) if time
   end
   
   def show_stats
-    time = @redis.lrange(@config.queues[:time], 0, -1)
+    time = @stats.range(:time)
     
     stats = {
-              :time => { :stats => time.map { |t| (/\d\d:\d\d:\d\d/.match(t))[0] } },
-              :refresh_interval_in_millis => @config.stats[:time_period_in_min] * 60 * 1000
+              :time => { :stats => time.map { |t| (/\d\d:\d\d:\d\d/.match(t))[0] } }
             }
     
     @probes.each do |probe|
       stats[probe.symbol] =
        { 
-         :stats => @redis.lrange(@config.queues[probe.symbol],  0, -1).map(&:to_i),
+         :stats => @stats.range(probe.symbol).map(&:to_i),
          :color => @config.chart[probe.symbol][:color],
          :unit => probe.unit
-       }
+       } unless probe.symbol == :time
     end
     
     stats.to_json
@@ -51,12 +58,11 @@ class StatsCollector
   private
    
   def pop_all_queues
-    @redis.lpop(@config.queues[:time])
-    @probes.each { |probe| @redis.lpop(@config.queues[probe.symbol]) }
+    @probes.each { |probe| @stats.shift(probe.symbol) }
   end
   
   def pop_old_stats
-    queue_size = @redis.llen(@config.queues[:time])
+    queue_size = @stats.range(:time).length
     
     if queue_size >= @config.stats[:number_of_stats]
       (queue_size - @config.stats[:number_of_stats] + 1).times { pop_all_queues }

data/lib/pimon/version.rb

@@ -1,3 +1,3 @@
 module Pimon
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/pimon.gemspec

@@ -10,8 +10,8 @@ Gem::Specification.new do |s|
   s.email       = [ 'pedro.carrico@gmail.com' ]
   s.homepage    = 'http://pimon.pedrocarrico.net/'
   s.summary     = 'Pimon - Raspberry Pi server monitor'
-  s.description = 'Pimon is a simple server monitor designed for the Raspberry Pi. It uses redis lists to keep the latest observed statistics and also uses highcharts to display some nice charts on your web browser.'
-  s.post_install_message = 'Before running Pimon be sure to have a redis instance up and running and listening on /tmp/redis.sock'
+  s.description = 'Pimon is a simple server monitor designed for the Raspberry Pi.'
+  s.post_install_message = 'Thank you for using Pimon :-)'
   
   s.required_ruby_version = '>= 1.9'
   
@@ -21,14 +21,11 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
   
   s.add_runtime_dependency     'haml',              '~> 3.1.7'
-  s.add_runtime_dependency     'redis',             '~> 3.0.1'
   s.add_runtime_dependency     'sinatra',           '~> 1.3.2'
   s.add_runtime_dependency     'sinatra-websocket', '~> 0.2.0'
   s.add_runtime_dependency     'thin',              '~> 1.5.0'
   
   s.add_development_dependency 'rack-test',  '~> 0'
-  s.add_development_dependency 'mock_redis', '~> 0.5.0'
-  s.add_development_dependency 'rspec',      '~> 2.11.0'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'simplecov-rcov'
   s.add_development_dependency 'timecop'

data/spec/pimon_config_spec.rb

@@ -4,13 +4,8 @@ describe 'PimonConfig' do
   context 'when created for the test environment' do
     subject { PimonConfig.create_new("#{File.dirname(__FILE__)}/../config/test.yml") }
     
-    its(:basic_auth) { should == ['pimon', 'pimon'] }
     its(:chart) { should == { :cpu => { :color => '#D2691E' }, :disk => { :color => '#CDC673' }, :mem => { :color => '#87CEFA' }, :temp => {:color=>"#FF9B04"}, :swap => { :color => '#3CB371' } } }
-    its(:is_basic_auth_enabled?) { should be_true }
-    its(:queues) { should == { :time => 'pimon_time', :cpu => 'pimon_cpu', :disk => 'pimon_disk', :mem => 'pimon_mem', :temp => 'pimon_temp', :swap => 'pimon_swap' } }
-    its(:redis) { should == { :socket  => '/thou/shalt/not/use/redis/on/test/environment' } }
     its(:stats) { should == { :number_of_stats => 6, :time_period_in_min => 10 } }
-    its(:valid?) { should be_true }
   end
   
   context 'when created with an invalid environment' do
@@ -18,10 +13,4 @@ describe 'PimonConfig' do
       expect{ PimonConfig.create_new('invalid') }.to raise_error(Errno::ENOENT)
     end
   end
-  
-  context 'when created with a broken environment configuration with basic_auth enabled but no username/password' do
-    it 'should raise an error' do
-      expect{ PimonConfig.create_new("#{File.dirname(__FILE__)}/../config/test_broken.yml") }.to raise_error(RuntimeError)
-    end
-  end
 end

data/spec/stats_collector_spec.rb

@@ -4,9 +4,9 @@ require 'spec_helper'
 require 'json'
 
 describe 'StatsCollector' do
-  context 'when new with a valid config and redis' do
+  context 'when new with a valid config' do
     before do
-      @stats_collector = StatsCollector.new(PimonConfig.create_new("#{File.dirname(__FILE__)}/../config/test.yml"), MockRedis.new)
+      @stats_collector = StatsCollector.new(PimonConfig.create_new("#{File.dirname(__FILE__)}/../config/test.yml"))
     end
     subject { @stats_collector }
     
@@ -22,14 +22,13 @@ describe 'StatsCollector' do
     
     its(:show_stats) { 
                         should == {
-                                    :time => { :stats => [] },
-                                    :refresh_interval_in_millis => 600000,
-                                    :cpu => { :stats => [], :color => '#D2691E', :unit => '%' },
-                                    :mem => { :stats => [], :color => '#87CEFA', :unit => '%' },
-                                    :swap => {:stats => [], :color => '#3CB371', :unit => '%' },
-                                    :disk => {:stats => [], :color => '#CDC673', :unit => '%' },
-                                    :temp => {:stats => [], :color => '#FF9B04', :unit => 'ºC' }
-                                  }.to_json
+                          :time => { :stats => [] },
+                          :cpu => { :stats => [], :color => '#D2691E', :unit => '%' },
+                          :mem => { :stats => [], :color => '#87CEFA', :unit => '%' },
+                          :swap => {:stats => [], :color => '#3CB371', :unit => '%' },
+                          :disk => {:stats => [], :color => '#CDC673', :unit => '%' },
+                          :temp => {:stats => [], :color => '#FF9B04', :unit => 'ºC' }
+                        }.to_json
                      }
     
     context 'when collected some stats' do
@@ -49,13 +48,13 @@ describe 'StatsCollector' do
       
       its(:show_stats) {
                           should == {
-                                      :time => { :stats => ['12:00:00', '12:00:00', '12:00:00', '12:00:00', '12:00:00', '12:00:00']},
-                                      :refresh_interval_in_millis => 600000, :cpu => {:stats => [50, 50, 50, 50, 50, 50], :color => '#D2691E', :unit => '%'},
-                                      :mem => { :stats => [78, 78, 78, 78, 78, 78], :color =>'#87CEFA', :unit => '%'},
-                                      :swap=>{ :stats => [50, 50, 50, 50, 50, 50], :color => '#3CB371', :unit => '%'},
-                                      :disk=>{ :stats => [25, 25, 25, 25, 25, 25], :color => '#CDC673', :unit => '%'},
-                                      :temp=>{ :stats => [40, 40, 40, 40, 40, 40], :color => '#FF9B04', :unit => 'ºC'}
-                                    }.to_json
+                            :time => { :stats => ['12:00:00', '12:00:00', '12:00:00', '12:00:00', '12:00:00', '12:00:00']},
+                            :cpu => {:stats => [50, 50, 50, 50, 50, 50], :color => '#D2691E', :unit => '%'},
+                            :mem => { :stats => [78, 78, 78, 78, 78, 78], :color =>'#87CEFA', :unit => '%'},
+                            :swap=>{ :stats => [50, 50, 50, 50, 50, 50], :color => '#3CB371', :unit => '%'},
+                            :disk=>{ :stats => [25, 25, 25, 25, 25, 25], :color => '#CDC673', :unit => '%'},
+                            :temp=>{ :stats => [40, 40, 40, 40, 40, 40], :color => '#FF9B04', :unit => 'ºC'}
+                          }.to_json
                        }
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pimon
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-14 00:00:00.000000000 Z
+date: 2012-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -27,22 +27,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.7
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -107,38 +91,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mock_redis
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.11.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -187,9 +139,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Pimon is a simple server monitor designed for the Raspberry Pi. It uses
-  redis lists to keep the latest observed statistics and also uses highcharts to display
-  some nice charts on your web browser.
+description: Pimon is a simple server monitor designed for the Raspberry Pi.
 email:
 - pedro.carrico@gmail.com
 executables:
@@ -205,7 +155,6 @@ files:
 - README.md
 - Rakefile
 - WTFPL-LICENSE
-- bin/clean_redis_stats
 - bin/free.c
 - bin/makefile
 - bin/pimon
@@ -229,8 +178,10 @@ files:
 - lib/pimon/probe/swap_usage.rb
 - lib/pimon/probe/system_memory.rb
 - lib/pimon/probe/temperature.rb
+- lib/pimon/probe/time_check.rb
 - lib/pimon/public/favicon.ico
 - lib/pimon/public/index.js
+- lib/pimon/stats.rb
 - lib/pimon/stats_collector.rb
 - lib/pimon/version.rb
 - lib/pimon/views/index.haml
@@ -241,8 +192,7 @@ files:
 - spec/stats_collector_spec.rb
 homepage: http://pimon.pedrocarrico.net/
 licenses: []
-post_install_message: Before running Pimon be sure to have a redis instance up and
-  running and listening on /tmp/redis.sock
+post_install_message: Thank you for using Pimon :-)
 rdoc_options: []
 require_paths:
 - lib

data/bin/clean_redis_stats

@@ -1 +0,0 @@
-/Users/pecarrico/opt/redis/src/redis-cli -s /tmp/redis.sock del pimon_mem del pimon_swap del pimon_cpu del pimon_time del pimon_disk pimon_temp