fnordmetric 0.5.1 → 0.5.2

data/doc/version

@@ -0,0 +1 @@
+0.5.2

data/fnordmetric.gemspec

@@ -5,38 +5,30 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fnordmetric}
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Asmuth"]
-  s.date = %q{2011-12-10}
+  s.date = %q{2011-12-26}
   s.description = %q{FnordMetric is a Ruby Event-Tracking gem on steroids}
   s.email = %q{paul@paulasmuth.com}
   s.files = [
-    ".document",
+    ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
     "Rakefile",
     "VERSION",
-    "_spec/app_spec.rb",
-    "_spec/cache_spec.rb",
-    "_spec/combine_metric_spec.rb",
-    "_spec/core_spec.rb",
-    "_spec/count_metric_spec.rb",
-    "_spec/dashboard_spec.rb",
-    "_spec/event_spec.rb",
-    "_spec/metric_spec.rb",
-    "_spec/report_spec.rb",
-    "_spec/sum_metric_spec.rb",
-    "_spec/widget_spec.rb",
-    "doc/example_server.rb",
-    "doc/import_dump.rb",
+    "doc/preview1.png",
+    "doc/preview2.png",
+    "doc/ulm_stats.rb",
+    "doc/version",
     "fnordmetric.gemspec",
     "haml/app.haml",
     "haml/widget.haml",
     "lib/fnordmetric.rb",
     "lib/fnordmetric/app.rb",
     "lib/fnordmetric/average_metric.rb",
+    "lib/fnordmetric/bars_widget.rb",
     "lib/fnordmetric/cache.rb",
     "lib/fnordmetric/combine_metric.rb",
     "lib/fnordmetric/context.rb",
@@ -53,34 +45,21 @@ Gem::Specification.new do |s|
     "lib/fnordmetric/metric_api.rb",
     "lib/fnordmetric/namespace.rb",
     "lib/fnordmetric/numbers_widget.rb",
+    "lib/fnordmetric/pie_widget.rb",
     "lib/fnordmetric/report.rb",
     "lib/fnordmetric/session.rb",
     "lib/fnordmetric/standalone.rb",
     "lib/fnordmetric/sum_metric.rb",
     "lib/fnordmetric/timeline_widget.rb",
+    "lib/fnordmetric/toplist_widget.rb",
     "lib/fnordmetric/widget.rb",
     "lib/fnordmetric/worker.rb",
-    "pub/fnordmetric/fnordmetric.css",
-    "pub/fnordmetric/fnordmetric.js",
-    "pub/fnordmetric/widget_numbers.js",
-    "pub/fnordmetric/widget_timeline.css",
-    "pub/fnordmetric/widget_timeline.js",
-    "pub/highcharts/adapters/mootools-adapter.js",
-    "pub/highcharts/adapters/mootools-adapter.src.js",
-    "pub/highcharts/adapters/prototype-adapter.js",
-    "pub/highcharts/adapters/prototype-adapter.src.js",
-    "pub/highcharts/highcharts.js",
-    "pub/highcharts/highcharts.src.js",
-    "pub/highcharts/modules/exporting.js",
-    "pub/highcharts/modules/exporting.src.js",
-    "pub/highcharts/themes/dark-blue.js",
-    "pub/highcharts/themes/dark-green.js",
-    "pub/highcharts/themes/gray.js",
-    "pub/highcharts/themes/grid.js",
-    "pub/jquery-1.6.1.min.js",
-    "pub/raphael-min.js",
-    "pub/raphael-utils.js",
+    "pub/fnordmetric.css",
+    "pub/fnordmetric.js",
+    "pub/loader.gif",
     "pub/sprite.png",
+    "pub/vendor/highcharts.js",
+    "pub/vendor/jquery-1.6.1.min.js",
     "readme.rdoc",
     "spec/app_spec.rb",
     "spec/context_spec.rb",
@@ -92,8 +71,7 @@ Gem::Specification.new do |s|
     "spec/session_spec.rb",
     "spec/spec_helper.rb",
     "spec/widget_spec.rb",
-    "spec/worker_spec.rb",
-    "ulm_stats.rb"
+    "spec/worker_spec.rb"
   ]
   s.homepage = %q{http://github.com/paulasmuth/fnordmetric}
   s.licenses = ["MIT"]

data/haml/app.haml

@@ -3,11 +3,13 @@
 
   %head
     %title Fnordmetric Dashboard
-    %script(type="text/javascript" src="#{path_prefix}/jquery-1.6.1.min.js")
-    %link(type="text/css" rel="stylesheet" href="#{path_prefix}/fnordmetric/fnordmetric.css")
-    %script(type="text/javascript" src="#{path_prefix}/raphael-min.js")
-    %script(type="text/javascript" src="#{path_prefix}/raphael-utils.js")
-    %script(type="text/javascript" src="#{path_prefix}/fnordmetric/fnordmetric.js")
+
+    %script(type="text/javascript" src="#{path_prefix}/vendor/jquery-1.6.1.min.js")
+    %script(type="text/javascript" src="#{path_prefix}/vendor/highcharts.js")
+
+    %script(type="text/javascript" src="#{path_prefix}/fnordmetric.js")
+    %link(type="text/css" rel="stylesheet" href="#{path_prefix}/fnordmetric.css")
+
     :javascript
       FnordMetric.p = '#{path_prefix}';
 
@@ -37,6 +39,7 @@
 
     $('#tabs li.dashboard').click(function(){
       FnordMetric.renderDashboard($(this).attr('rel'));
+      window.location.hash = $(this).attr('rel');
     });
 
     $('#tabs li.sessions').click(function(){
@@ -56,6 +59,10 @@
     resizeViewport();
     $(window).resize(resizeViewport);
 
+    if(window.location.hash){
+      $('#tabs li.dashboard[rel="'+window.location.hash.slice(1)+'"]').trigger('click');
+    }
+
   });
 
 

data/lib/fnordmetric.rb

@@ -128,6 +128,9 @@ require "fnordmetric/worker"
 require "fnordmetric/widget"
 require "fnordmetric/timeline_widget"
 require "fnordmetric/numbers_widget"
+require "fnordmetric/bars_widget"
+require "fnordmetric/toplist_widget"
+require "fnordmetric/pie_widget"
 require "fnordmetric/namespace"
 require "fnordmetric/gauge_modifiers"
 require "fnordmetric/gauge_calculations"

data/lib/fnordmetric/app.rb

@@ -57,16 +57,25 @@ class FnordMetric::App < Sinatra::Base
     ""
   end
 
-  #get '/metric/:name' do
-  #  content_type 'application/json'
-  #  FnordMetric::MetricAPI.new(params).render    
-  #end
-
-  #get '/widget/:name' do
-  #  @dashboard = FnordMetric.dashboards.first
-  #  @widget = @dashboard.widgets.first
-  #  haml :widget
-  #end
+  get '/:namespace/gauge/:name' do
+
+    gauge = current_namespace.gauges.fetch(params[:name].intern)
+
+    data = if gauge.three_dimensional?
+      _t = (params[:at] || Time.now).to_i
+      { :count => gauge.field_values_total(_t), :values => gauge.field_values_at(_t) }
+    elsif params[:at] && params[:at] =~ /^[0-9]+$/
+      { (_t = gauge.tick_at(params[:at].to_i)) => gauge.value_at(_t) }
+    elsif params[:at] && params[:at] =~ /^([0-9]+)-([0-9]+)$/
+      _range = params[:at].split("-").map(&:to_i)
+      _values = gauge.values_in(_range.first.._range.last)
+      params[:sum] ? { :sum => _values.values.compact.map(&:to_i).sum } : _values
+    else
+      { (_t = gauge.tick_at(Time.now.to_i-gauge.tick)) => gauge.value_at(_t) }
+    end    
+
+    data.to_json
+  end
 
   get '/:namespace/sessions' do
 

data/lib/fnordmetric/bars_widget.rb

@@ -0,0 +1,26 @@
+class FnordMetric::BarsWidget  < FnordMetric::Widget
+
+  def data
+    super.merge(
+      :gauges => gauges.map(&:name),
+      :gauge_titles => gauge_titles,
+      :autoupdate => (@opts[:autoupdate] || 60),
+      :order_by => (@opts[:order_by] || 'value'),
+      :plot_style => (@opts[:plot_style] || 'vertical'),
+      :tick => tick
+    )
+  end
+
+  def gauge_titles
+    {}.tap do |_hash|
+      gauges.each do |gauge|
+        _hash.merge!(gauge.name => gauge.title)
+      end
+    end
+  end
+
+  def has_tick?
+    false
+  end
+
+end

data/lib/fnordmetric/context.rb

@@ -4,13 +4,13 @@ class FnordMetric::Context
 
   def initialize(opts, block)
     @block = block
-  	@opts = opts    
+    @opts = opts    
   end
 
   def call(event, redis)
     @redis = redis
-  	@event = event    
-  	self.instance_eval(&@block)
+    @event = event    
+    self.instance_eval(&@block)
   rescue Exception => e
     raise e  if ENV['FNORDMETRIC_ENV'] == 'test'
     puts "error: #{e.message}"

data/lib/fnordmetric/gauge.rb

@@ -18,6 +18,10 @@ class FnordMetric::Gauge
   def name
     @opts[:key]
   end
+
+  def title
+    @opts[:title] || name
+  end
   
   def key(_append=nil)
     [@opts[:key_prefix], "gauge", name, tick, _append].flatten.compact.join("-")
@@ -31,6 +35,10 @@ class FnordMetric::Gauge
     !@opts[:three_dimensional]
   end
 
+  def three_dimensional?
+    !!@opts[:three_dimensional]
+  end
+
   def progressive?
     !!@opts[:progressive]
   end
@@ -39,8 +47,20 @@ class FnordMetric::Gauge
     !!@opts[:unique]
   end
 
+  def average?
+    !!@opts[:average]
+  end
+
   def add_redis(_redis)
     @opts[:redis] = _redis
   end
 
+  def ticks_in(r)
+    (((r.last-r.first)/tick.to_f).ceil+1).times.map{ |n| tick_at(r.first + tick*(n-1)) }
+  end
+
+  def values_in(range)
+    values_at(ticks_in(range))
+  end
+
 end

data/lib/fnordmetric/gauge_calculations.rb

@@ -1,8 +1,15 @@
 module FnordMetric::GaugeCalculations
 
   @@avg_per_session_proc = proc{ |_v, _t|
-    #raise redis.get(tick_key(_t, :"sessions-count")).inspect
-    (_v.to_f / (redis.get(tick_key(_t, :"sessions-count"))||0).to_i)
+    (_v.to_f / (redis.get(tick_key(_t, :"sessions-count"))||1).to_i)
+  }
+
+  @@count_per_session_proc = proc{ |_v, _t|
+    (redis.get(tick_key(_t, :"sessions-count"))||0).to_i
+  }
+
+  @@avg_per_count_proc = proc{ |_v, _t|
+    (_v.to_f / (redis.get(tick_key(_t, :"value-count"))||1).to_i)
   }
 
   def value_at(time, opts={}, &block)
@@ -27,8 +34,10 @@ module FnordMetric::GaugeCalculations
   end
 
   def calculate_value(_v, _t, opts, block)
-    block = @@avg_per_session_proc if opts[:avg_per_session]
-
+    block = @@avg_per_count_proc if average?
+    #block = @@count_per_session_proc if unique?
+    block = @@avg_per_session_proc if unique? && average?
+    
     if block
       instance_exec(_v, _t, &block)
     else
@@ -36,6 +45,21 @@ module FnordMetric::GaugeCalculations
     end
   end
 
+  def field_values_at(time, opts={}, &block)
+    opts[:max_fields] ||= 50
+    redis.zrevrange(
+      tick_key(time), 
+      0, opts[:max_fields]-1, 
+      :withscores => true
+    ).in_groups_of(2).map do |key, val|
+      [key, calculate_value(val, time, opts, block)]
+    end
+  end
+
+  def field_values_total(time)
+    (redis.get(tick_key(time, :count))||0).to_i
+  end
+
   def redis
     @opts[:redis]
   end

data/lib/fnordmetric/gauge_modifiers.rb

@@ -5,6 +5,8 @@ module FnordMetric::GaugeModifiers
     assure_two_dimensional!(gauge)
     if gauge.unique? 
       incr_uniq(gauge, value)
+    elsif gauge.average? 
+      incr_avg(gauge, value)
     else
       incr_tick(gauge, value)
     end
@@ -18,26 +20,57 @@ module FnordMetric::GaugeModifiers
         end
       end
     else
-      @redis.hincrby(gauge.key, gauge.tick_at(time), value)    
+      @redis.hsetnx(gauge.key, gauge.tick_at(time), 0).callback do
+        @redis.hincrby(gauge.key, gauge.tick_at(time), value)
+      end
     end
   end  
 
-  def incr_uniq(gauge, value)
-    return false unless session_key
+  def incr_uniq(gauge, value, field_name=nil)
+    return false if session_key.blank?
     @redis.sadd(gauge.tick_key(time, :sessions), session_key).callback do |_new|
       @redis.expire(gauge.tick_key(time, :sessions), gauge.tick)
-      if _new
+      if (_new == 1) || (_new == true) #redis vs. em-redis
         @redis.incr(gauge.tick_key(time, :"sessions-count")).callback do |sc|
-          incr_tick(gauge, value)
+          field_name ? incr_field_by(gauge, field_name, value) : incr_tick(gauge, value)
         end
       end
     end
   end
 
+  def incr_avg(gauge, value)
+    @redis.incr(gauge.tick_key(time, :"value-count")).callback do
+      incr_tick(gauge, value)
+    end
+  end
+
   def incr_field(gauge_name, field_name, value=1)
     gauge = fetch_gauge(gauge_name)
     assure_three_dimensional!(gauge)
-    # here be dragons
+    if gauge.unique? 
+      incr_uniq(gauge, value, field_name)
+    else
+      incr_field_by(gauge, field_name, value)
+    end
+  end
+
+  def incr_field_by(gauge, field_name, value)
+    @redis.zincrby(gauge.tick_key(time), value, field_name).callback do
+      @redis.incrby(gauge.tick_key(time, :count), 1)
+    end
+  end  
+
+  def set_value(gauge_name, value)
+    gauge = fetch_gauge(gauge_name)
+    assure_two_dimensional!(gauge)
+    @redis.hset(gauge.key, gauge.tick_at(time), value)
+  end
+
+  def set_field(gauge_name, field_name, value)
+    gauge = fetch_gauge(gauge_name)
+    assure_three_dimensional!(gauge)
+    @redis.zadd(gauge.tick_key(time), value, field_name)
   end
 
+
 end

data/lib/fnordmetric/logger.rb

@@ -35,4 +35,23 @@ class FnordMetric::Logger
     fetcher.join
   end
 
+  def self.import(logfile_path)
+    redis = Redis.new
+    dump_file = File.open(logfile_path, 'r')
+
+    puts "reading #{logfile_path}..."
+    dump_lines = dump_file.read.split("\n")
+
+    puts "importing #{dump_lines.length} events..."
+    pre_uuid = rand(999999999999999999999)
+    log_every = (dump_lines.length / 150)
+    dump_lines.each_with_index do |line,n|
+      puts "#{n}/#{dump_lines.length} (#{((n/dump_lines.length.to_f)*100).to_i}%)" if n%log_every==0
+      my_uuid = "#{pre_uuid}-#{n}"
+      redis.set("fnordmetric-event-#{my_uuid}", line)
+      redis.lpush("fnordmetric-queue", my_uuid) 
+      redis.expire("fnordmetric-event-#{my_uuid}", 3600*12)
+    end
+  end
+
 end

data/lib/fnordmetric/numbers_widget.rb

@@ -2,8 +2,9 @@ class FnordMetric::NumbersWidget < FnordMetric::Widget
 
   def data
     super.merge(
-      :offsets => offsets,
-      :gauges => data_gauges
+      :gauges => data_gauges,
+      :offsets => (@opts[:offsets] || [0, 1, "s30"]),
+      :autoupdate => (@opts[:autoupdate] || 0)
     )
   end
 
@@ -11,26 +12,15 @@ class FnordMetric::NumbersWidget < FnordMetric::Widget
     Hash.new.tap do |hash|
       gauges.each do |g|
         hash[g.name] = {
-          :values => data_gauge(g),
-          :title => g.name
+          :tick => g.tick,
+          :title => g.title
         }
       end
     end
   end
 
-  def data_gauge(gauge)
-    offsets.map do |offset|
-      offset_time = Time.now.to_i - offset*gauge.tick
-      [gauge.tick_at(offset_time), gauge.value_at(offset_time)]
-    end
-  end
-
   def has_tick?
     false
   end
 
-  def offsets
-    [0, 1, 30]
-  end
-
 end