fnordmetric 0.6.2 → 0.6.3

data/README.md

@@ -75,7 +75,7 @@ Installation
 
 or in your Gemfile:
 
-    gem 'fnordmetric', '~> 0.5'
+    gem 'fnordmetric', '>= 0.6.3'
 
 
 Documentation
@@ -177,6 +177,12 @@ require "fnordmetric"
 
 FnordMetric.namespace :myapp do
 
+  # Set a custom namespace title, if you want one
+  # set_title "Emails sent"
+  
+  # Hide the "Active Users" tab, if you want
+  # hide_active_users
+
   # numeric (delta) gauge, 1-hour tick
   gauge :messages_sent, 
     :tick => 1.hour.to_i, 
@@ -336,19 +342,13 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 Todos
 -----
 
-* funnel-widget
-* combine/calculation gauges via opts_gauge({}, &block) (+calculate ctr)
-* timeline_widget: 'compare mode': compate gauge to yesterday
-* numbers_widget: handle decreasing vals
-* make listen-ports configurable
-* referal tracking fu (parse googlequeries)  
-* trend detection
-* opt_event options: :increment => gauge_name
-* preconfigured default-dashboard (like google analytics)
-* pagview+ref-tracking via js-tracking-pixel 
-* table/gauge-list-widget (with mini-stats!)
-* prune the namespace-sessions-timline (remove event_ids older than x)
-* prune the namespace-event-types-list (trim to max items)
-* timelinewidget + numberswidget => should use redis hmget
-* get multiple metrics in a single http get
-* `{ _namespace: myns }` field 
++ combine/calculation gauges via opts_gauge({}, &block) (+calculate ctr)
++ timeline_widget: 'compare mode': compare gauge to yesterday
++ numbers_widget: handle decreasing vals
++ opt_event options: :increment => gauge_name
++ prune the namespace-sessions-timline (remove event_ids older than x)
++ prune the namespace-event-types-list (trim to max items)
++ the funnel-widget
++ timelinewidget + numberswidget => should use redis hmget
++ get multiple metrics in a single http get
++ the `{ _namespace: myns }` field 

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.6.3

data/fnordmetric.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fnordmetric}
-  s.version = "0.6.2"
+  s.version = "0.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Asmuth"]
@@ -62,7 +62,6 @@ Gem::Specification.new do |s|
     "pub/fnordmetric.css",
     "pub/fnordmetric.js",
     "pub/loader.gif",
-    "pub/sprite.png",
     "pub/vendor/highcharts.js",
     "pub/vendor/jquery-1.6.1.min.js",
     "spec/api_spec.rb",
@@ -72,6 +71,7 @@ Gem::Specification.new do |s|
     "spec/event_spec.rb",
     "spec/gauge_modifiers_spec.rb",
     "spec/gauge_spec.rb",
+    "spec/inbound_stream_spec.rb",
     "spec/namespace_spec.rb",
     "spec/session_spec.rb",
     "spec/spec_helper.rb",
@@ -91,6 +91,7 @@ Gem::Specification.new do |s|
     "spec/event_spec.rb",
     "spec/gauge_modifiers_spec.rb",
     "spec/gauge_spec.rb",
+    "spec/inbound_stream_spec.rb",
     "spec/namespace_spec.rb",
     "spec/session_spec.rb",
     "spec/spec_helper.rb",

data/haml/app.haml

@@ -2,7 +2,7 @@
 %html
 
   %head
-    %title Fnordmetric Dashboard
+    %title=current_namespace.title
 
     %script(type="text/javascript" src="#{path_prefix}/vendor/jquery-1.6.1.min.js")
     %script(type="text/javascript" src="#{path_prefix}/vendor/highcharts.js")
@@ -18,14 +18,15 @@
       %ul
         -namespaces.each do |key,namespace|
           %li{:class => namespace.token == current_namespace.token ? 'active' : nil}
-            %a{:href=>"/#{namespace.token}"}=h namespace.token
+            %a{:href=>"/#{namespace.token}"}=h namespace.title
 
     #wrap
       #tabs
         %ul
-          %li.active.sessions
-            .picto.piechart
-            Active Users
+          - if current_namespace.active_users_available
+            %li.active.sessions
+              .picto.piechart
+              Active Users
 
           -current_namespace.dashboards.each do |key,dashboard|
             %li.dashboard{:rel => dashboard.token}
@@ -64,6 +65,10 @@
     resizeViewport();
     $(window).resize(resizeViewport);
 
+    if(!#{current_namespace.active_users_available.to_s}) {
+      $('#tabs li:first').trigger('click');
+    }
+    
     if(window.location.hash){
       $('#tabs li.dashboard[rel="'+window.location.hash.slice(1)+'"]').trigger('click');
     }

data/lib/fnordmetric/api.rb

@@ -12,8 +12,17 @@ class FnordMetric::API
   end
   
   def event(event_data)
-    event_data = event_data.to_json if event_data.is_a?(Hash)
-    push_event(get_next_uuid, event_data)
+    begin
+      if event_data.is_a?(Hash)
+        event_data = event_data.to_json  
+      else
+        JSON.parse(event_data) # void ;)
+      end
+    rescue JSON::ParserError
+      FnordMetric.log("event_lost: can't parse json")
+    else
+      push_event(get_next_uuid, event_data)
+    end
   end
 
   def disconnect
@@ -23,7 +32,7 @@ class FnordMetric::API
   private 
   
   def push_event(event_id, event_data)    
-    prefix = @@opts[:redis_prefix]
+    prefix = @@opts[:redis_prefix]    
     @redis.hincrby "#{prefix}-testdata",          "events_received", 1
     @redis.hincrby "#{prefix}-stats",             "events_received", 1
     @redis.set     "#{prefix}-event-#{event_id}", event_data

data/lib/fnordmetric/app.rb

@@ -3,6 +3,12 @@
 class FnordMetric::App < Sinatra::Base
 
   @@sessions = Hash.new
+  @@public_files = {
+    "fnordmetric.css" => "text/css",
+    "fnordmetric.js" => "application/x-javascript",
+    "vendor/jquery-1.6.1.min.js" => "application/x-javascript",
+    "vendor/highcharts.js" => "application/x-javascript"
+  }
 
   Encoding.default_external = Encoding::UTF_8
 
@@ -11,8 +17,7 @@ class FnordMetric::App < Sinatra::Base
   enable :session
 
   set :haml, :format => :html5
-  set :views, ::File.expand_path('../../../haml', __FILE__)
-  set :public_folder, ::File.expand_path('../../../pub', __FILE__)
+  set :views, ::File.expand_path('../../../haml', __FILE__)  
 
   def initialize(namespaces, opts)
     @namespaces = {}
@@ -126,6 +131,12 @@ class FnordMetric::App < Sinatra::Base
     track_event((8**32).to_s(36), parse_params(params))
   end
 
+  @@public_files.each do |public_file, public_file_type|
+    get "/#{public_file}" do
+      content_type(public_file_type)
+      ::File.open(::File.expand_path("../../../pub/#{public_file}", __FILE__)).read
+    end
+  end
 private
 
   def parse_params(hash)

data/lib/fnordmetric/inbound_stream.rb

@@ -6,7 +6,11 @@ class FnordMetric::InboundStream < EventMachine::Connection
     EM.start_server(*opts[:inbound_stream], self)    
   end
 
-  def receive_data(chunk)        
+  def self.options(opts)
+    @@opts = opts
+  end
+
+  def receive_data(chunk)     
     @buffer << chunk         
     EM.defer{ next_event }
   end

data/lib/fnordmetric/namespace.rb

@@ -2,12 +2,14 @@ class FnordMetric::Namespace
   
   attr_reader :handlers, :gauges, :opts, :key, :dashboards
 
-  @@opts = [:event, :gauge, :widget]
+  @@opts = [:event, :gauge, :widget, :set_title, :active_users_available]
 
   def initialize(key, opts)    
     @gauges = Hash.new
     @dashboards = Hash.new
-    @handlers = Hash.new                 
+    @handlers = Hash.new
+    @title = key
+    @active_users_available = true
     @opts = opts
     @key = key      
   end
@@ -63,7 +65,15 @@ class FnordMetric::Namespace
   def token
     @key
   end
-
+  
+  def title
+    @title
+  end
+  
+  def active_users_available
+    @active_users_available
+  end
+  
   def dashboards(name=nil)
     return @dashboards unless name
     dash = FnordMetric::Dashboard.new(:title => name)
@@ -85,6 +95,14 @@ class FnordMetric::Namespace
     send(:"opt_#{m}", *args, &block)
   end
 
+  def hide_active_users
+    @active_users_available = false
+  end
+  
+  def set_title(key)
+    @title = key
+  end
+  
   def opt_event(event_type, opts={}, &block)    
     opts.merge!(:redis => @redis, :gauges => @gauges)   
     FnordMetric::Context.new(opts, block).tap do |context|

data/lib/fnordmetric/worker.rb

@@ -22,7 +22,7 @@ class FnordMetric::Worker
     @redis.blpop(queue_key, 0).callback do |list, event_id|           
       @redis.get(event_key(event_id)).callback do |event_data|                     
         process_event(event_id, event_data) if event_data        
-        FnordMetric.log("oops, lost an event :(") unless event_data
+        FnordMetric.log("event_lost: event_data not found for event-id '#{event_id}'") unless event_data
         EM.next_tick(&method(:tick))      
         @redis.hincrby(stats_key, :events_processed, 1)
       end

data/pub/fnordmetric.css

@@ -4,7 +4,7 @@ body{ background:#3b3e45; color:#333; margin:0; padding:0; overflow-y:scroll; fo
 .shown{ display: block; }
 .hidden{ display: none; }
 
-.topbar{ height:38px; background:#24272c; position:fixed; top:0px; width:100%; z-index: 1}
+.topbar{ height:38px; background:#24272c; position:fixed; top:0px; width:100%; z-index: 1000;}
 .topbar ul { list-style-type:none; margin:0; }
 .topbar ul li { padding: 5px 10px 5px 10px; background-color:#3b3e45; display:inline; height:38px; line-height:38px; border-radius:3px; margin-right:5px;}
 .topbar ul li a { color:#ccc; font-size:13px; text-decoration:none; }
@@ -21,7 +21,7 @@ body{ background:#3b3e45; color:#333; margin:0; padding:0; overflow-y:scroll; fo
 #tabs ul li:hover, #tabs ul li:hover:after{ color:#fff; }
 #tabs ul li:hover .picto{ opacity:1; }
 
-.picto{ display:block; height:14px; width:14px; float:left; background:url('/fnordmetric/sprite.png') no-repeat 14px 14px; opacity:0.7; }
+.picto{ display:block; height:14px; width:14px; float:left; opacity:0.7; }
 .picto.piechart{ background-position:-42px -173px; width:9px; margin-right:5px; }
 
 #viewport{ float:left; margin-left:150px; margin-top:30px; border-radius:3px; min-width:790px; }
@@ -73,7 +73,7 @@ text-shadow: 1px 0px 2px rgba(255, 255, 255, 1);
 .headbar .button{
   margin:8px 0px; height:16px; float:right; display:block;
   margin-right:-1px;
-  background:url('/fnordmetric/sprite.png') no-repeat 0 -49px #eee; 
+  background:#eee; 
   border:1px solid #999;
   border-bottom-color:#888;
   -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, .1); 

data/spec/inbound_stream_spec.rb

@@ -0,0 +1,34 @@
+require ::File.expand_path('../spec_helper.rb', __FILE__)
+
+describe FnordMetric::InboundStream do
+
+  before(:all) do
+    @redis = Redis.new
+    @redis_wrap = RedisWrap.new(@redis)
+    FnordMetric::InboundStream.options(
+      :redis_url => "redis://localhost:6379",
+      :redis_prefix => "fnordmetric-test",
+      :event_queue_ttl => 120
+    )
+    @inbound_stream = FnordMetric::InboundStream.new(nil)
+  end
+
+  describe "pushing new events" do
+    it "should add parsable event to the queue" do
+      data = %Q{{"_type": "started"}\n}
+
+      lambda {
+        @inbound_stream.receive_data data
+      }.should change { @redis.llen("fnordmetric-test-queue") }.by +1
+    end
+
+    it "should reject non parsable events" do
+      broken_data = %Q{{"_type": \n"started"}\n}
+    
+      lambda {
+        @inbound_stream.receive_data broken_data
+      }.should_not change { @redis.llen("fnordmetric-test-queue") }
+    end
+  end
+end
+

data/spec/spec_helper.rb

@@ -14,6 +14,9 @@ require "fnordmetric"
 require "eventmachine"
 require 'em-hiredis'
 
+def EM.defer; yield; end
+def EM.next_tick; yield; end
+
 class RedisWrap
 
   def initialize(redis, callbackable=true)

metadata

@@ -2,7 +2,7 @@
 name: fnordmetric
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors: 
 - Paul Asmuth
@@ -266,7 +266,6 @@ files:
 - pub/fnordmetric.css
 - pub/fnordmetric.js
 - pub/loader.gif
-- pub/sprite.png
 - pub/vendor/highcharts.js
 - pub/vendor/jquery-1.6.1.min.js
 - spec/api_spec.rb
@@ -276,6 +275,7 @@ files:
 - spec/event_spec.rb
 - spec/gauge_modifiers_spec.rb
 - spec/gauge_spec.rb
+- spec/inbound_stream_spec.rb
 - spec/namespace_spec.rb
 - spec/session_spec.rb
 - spec/spec_helper.rb
@@ -317,6 +317,7 @@ test_files:
 - spec/event_spec.rb
 - spec/gauge_modifiers_spec.rb
 - spec/gauge_spec.rb
+- spec/inbound_stream_spec.rb
 - spec/namespace_spec.rb
 - spec/session_spec.rb
 - spec/spec_helper.rb