fnordmetric 1.0.1 → 1.2.0

data/lib/fnordmetric/widgets/toplist_widget.rb

@@ -6,18 +6,20 @@ class FnordMetric::ToplistWidget < FnordMetric::Widget
     return false unless event["gauge"]
 
     resp = if event["cmd"] == "values_for"
+      vals = execute_values_for(namespace.gauges[event["gauge"].to_sym], t)
+
       {
         :cmd => :values_for,
         :gauge => event["gauge"],
-        :values => execute_values_for(namespace.gauges[event["gauge"].to_sym], t),
-        :count  => namespace.gauges[event["gauge"].to_sym].field_values_total(t)
+        :values => vals,
+        :count  => vals.inject(0){ |m, (k,c)| m + c }
       }
     end
 
     return false unless resp
 
     resp.merge(
-      :class => "widget_response",
+      :type => "widget_response",
       :widget_key => event["widget_key"]
     )
   end
@@ -38,7 +40,9 @@ class FnordMetric::ToplistWidget < FnordMetric::Widget
       :ticks => @opts[:ticks],
       :click_callback => @opts[:click_callback],
       :async_chart => true,
-      :tick => tick
+      :tick => tick,
+      :limit => @opts[:limit],
+      :no_min_height => @opts[:no_min_height]
     ).tap do |dat|
       dat.merge!(
         :gauges => @opts[:_gauges]

data/lib/fnordmetric/worker.rb

@@ -55,7 +55,7 @@ class FnordMetric::Worker
   end
 
   def announce_event(event)
-    namespace(event[:_namespace]).ready!(redis).announce(event)
+    namespace(event[:_namespace]).ready!(redis, sync_redis).announce(event)
   end
 
   def expire_event(event_id)
@@ -82,4 +82,8 @@ class FnordMetric::Worker
     @redis ||= EM::Hiredis.connect(FnordMetric.options[:redis_url]) # FIXPAUL
   end
 
+  def sync_redis
+    @sync_redis ||= FnordMetric.mk_redis
+  end
+
 end

data/lib/fnordmetric/zero_config_gauge.rb

@@ -0,0 +1,138 @@
+class FnordMetric::ZeroConfigGauge
+
+  TYPES = [:_incr, :_decr, :_avg, :_min, :_max, :_set]
+
+  Handler = proc do
+    if data[:gauge]
+      gauge_key = data[:gauge].to_sym
+    else
+      FnordMetric.error("missing key for zero config event: gauge")
+      next
+    end
+
+    unless data[:value]
+      FnordMetric.error("missing key for zero config event: value")
+      next
+    end
+
+    gauge = if namespace.gauges.has_key?(gauge_key)
+      namespace.gauges[gauge_key]
+    else
+      namespace.opt_gauge(gauge_key,
+        :flush_interval => data[:flush_interval],
+        :average => (type == :_avg),
+        :zero_config => true)
+    end
+
+    case type
+
+      when :_set
+        set_value gauge, data[:value].to_i
+
+      when :_incr
+        incr_tick gauge, data[:value].to_i
+
+      when :_decr
+        FnordMetric.error("_decr is not yet implemented")
+
+      when :_avg
+        incr_avg gauge, data[:value].to_i
+
+      when :_min, :_max
+        FnordMetric.error("_min/_max is not yet implemented")
+
+    end
+  end
+
+  class EmtpyGauge
+
+    def self.tick
+      FnordMetric.options[:default_flush_interval]
+    end
+
+    def self.retention
+      tick * 10
+    end
+
+    def self.tick_at(time, _tick=tick)
+      (time/_tick.to_f).floor*_tick
+    end
+
+    def group
+      "Gauges"
+    end
+
+    def unit
+      nil
+    end
+
+    def key_nouns
+      ["Key", "Keys"]
+    end
+
+    def key(_append=nil)
+      "----empty-gauge----"
+    end
+
+    def tick_key(_time, _append=nil)
+      "----empty-gauge----"
+    end
+
+    def tick_keys(_range, _append=nil)
+        ["----empty-gauge----"]
+    end
+
+    def retention_key(_time, _append=nil)
+        "----empty-gauge----"
+    end
+
+    def two_dimensional?
+      true
+    end
+
+    def three_dimensional?
+      false
+    end
+
+    def progressive?
+      false
+    end
+
+    def unique?
+      false
+    end
+
+    def average?
+      false
+    end
+
+    def has_series?
+      false
+    end
+
+  end
+
+  def initialize(key, namespace)
+    @key = key
+    @namespace = namespace
+  end
+
+  def name
+    @key
+  end
+
+  def title
+    @key
+  end
+
+  def method_missing(*msg)
+    gauge = @namespace.gauges[@key]
+
+    if gauge
+      gauge.send(*msg)
+    else
+      EmtpyGauge.send(*msg)
+    end
+  end
+
+end

data/spec/context_spec.rb

@@ -18,12 +18,12 @@ describe FnordMetric::Context do
   it "should expose the current session_key" do
     ns = FnordMetric::Namespace.new(
       :myns_253,
-      :redis_prefix => "fnordmetrictest"      
+      :redis_prefix => "fnordmetrictest"
     )
     ns.opt_event(:fnordbar, {}) do
       session_key.should == "145d3f6dee1a770e3a3c550b3993dc81"
     end
-    ns.ready!(@redis_wrap).announce(
+    ns.ready!(@redis_wrap, @redis).announce(
       :_eid => "35r2423",
       :_time => Time.now.to_i, 
       :_type => "fnordbar", 
@@ -35,8 +35,8 @@ describe FnordMetric::Context do
     Thread.current["fnord_123"] = false
     my_block = proc{ Thread.current["fnord_123"] = "35r25" }   
     context = FnordMetric::Context.new({}, my_block)
-    context.call({}, nil)
+    context.call({}, nil, nil)
     Thread.current["fnord_123"].should == "35r25"
   end
 
-end
+end

data/spec/event_spec.rb

@@ -6,24 +6,24 @@ describe FnordMetric::Event do
   include FnordMetric
 
   before(:all) do
-    @now = Time.utc(1992,01,13,5,23,23).to_i   
+    @now = Time.utc(1992,01,13,5,23,23).to_i
     @redis = Redis.new
     @redis_wrap = RedisWrap.new(@redis)
 
-    @namespace = "fnordmetric-test-ns123" 
+    @namespace = "fnordmetric-test-ns123"
     @timeline = "#{@namespace}-timeline"
 
-    @opts = {         
+    @opts = {
       :namespace_prefix => "#{@namespace}",
       :redis_prefix => "fnordmetric-test",
       :redis => @redis
-    }  
+    }
   end
 
   describe "finding events" do
 
-    before(:each) do        
-      @redis.keys("fnordmetric-test-*").each { |k| @redis.del(k) }     
+    before(:each) do
+      @redis.keys("fnordmetric-test-*").each { |k| @redis.del(k) }
     end
 
     it "should find all events" do
@@ -101,15 +101,15 @@ describe FnordMetric::Event do
 
     it "should find all events by type" do
       namespace = Namespace.new(:ns123, :redis_prefix => "fnordmetric-test")
-      namespace.ready!(@redis_wrap).announce(
+      namespace.ready!(@redis_wrap, @redis).announce(
         :_type => "fn0rd",
         :_time => @now
       )
-      namespace.ready!(@redis_wrap).announce(
+      namespace.ready!(@redis_wrap, @redis).announce(
         :_type => "f00bar",
         :_time => @now
       )
-      namespace.ready!(@redis_wrap).announce(
+      namespace.ready!(@redis_wrap, @redis).announce(
         :_type => "fn0rd",
         :_time => @now
       )
@@ -132,9 +132,9 @@ describe FnordMetric::Event do
 
       before do
         created_events_data.each do |(event_id, session)|
-          event_data = { :_time => @now + event_id, :_eid => event_id }
+          event_data = { :_time => @now + event_id, :_eid => event_id, :_type => "fnord" }
           event_data[:_session] = session if session
-          namespace.ready!(@redis_wrap).announce event_data
+          namespace.ready!(@redis_wrap, @redis).announce event_data
         end
       end
 

data/spec/gauge_modifiers_spec.rb

@@ -2,14 +2,122 @@ require ::File.expand_path('../spec_helper.rb', __FILE__)
 
 describe FnordMetric::GaugeModifiers do
 
-  before(:all) do    
-    @now = Time.utc(1992,01,13,5,23,23).to_i    
+  before(:all) do
+    @now = Time.utc(1992,01,13,5,23,23).to_i
     @redis = Redis.new
     @redis_wrap = RedisWrap.new(@redis)
+    @namespace = FnordMetric::Namespace.new(:myns_213,
+      :redis_prefix => "fnordmetric")
+    @namespace.ready!(@redis_wrap, @redis)
   end
 
   before(:each) do
-    @redis.keys("fnordmetrics-myns*").each { |k| @redis.del(k) }  
+    @redis.keys("fnordmetrics-myns*").each { |k| @redis.del(k) }
+    @redis.keys("fnordmetric-myns*").each { |k| @redis.del(k) } 
+  end
+
+  describe "increment zero-config gauges" do
+
+    it "should create and increment zero-config gauges" do
+      @namespace.announce(
+        :_type => "_incr",
+        :_eid  => 1234,
+        :_time => 1360584960,
+        :value => 42,
+        :gauge => "sales-per-second",
+        :flush_interval => 20
+      )
+
+      @namespace.gauges[:"sales-per-second"].should be_a(Gauge)
+
+      gauge_key = "fnordmetric-myns_213-gauge-sales-per-second-20"
+      @redis.hget(gauge_key, "1360584960").should == "42"
+
+      @namespace.announce(
+        :_type => "_incr",
+        :_eid  => 1234,
+        :_time => 1360584960,
+        :value => 11,
+        :gauge => "sales-per-second",
+        :flush_interval => 20
+      )
+
+      @redis.hget(gauge_key, "1360584960").should == "53"
+      @namespace.gauges[:"sales-per-second"].value_at(1360584961).should == "53"
+    end
+
+    it "should create and increment zero-config gauges with the default flush interval" do
+      @namespace.announce(
+        :_type => "_incr",
+        :_eid  => 1234,
+        :_time => 1360584960,
+        :value => 42,
+        :gauge => "sales-per-second-default"
+      )
+
+      @namespace.gauges[:"sales-per-second-default"].should be_a(Gauge)
+
+      gauge_key = "fnordmetric-myns_213-gauge-sales-per-second-default-10"
+      @redis.hget(gauge_key, "1360584960").should == "42"
+    end
+
+    it "should create and set zero-config gauges" do
+      @namespace.announce(
+        :_type => "_set",
+        :_eid  => 1234,
+        :_time => 1360584960,
+        :value => 123,
+        :gauge => "sales-per-second-set",
+        :flush_interval => 10
+      )
+
+      @namespace.gauges[:"sales-per-second-set"].should be_a(Gauge)
+
+      gauge_key = "fnordmetric-myns_213-gauge-sales-per-second-set-10"
+      @redis.hget(gauge_key, "1360584960").should == "123"
+
+      @namespace.announce(
+        :_type => "_set",
+        :_eid  => 1234,
+        :_time => 1360584960,
+        :value => 555,
+        :gauge => "sales-per-second-set",
+        :flush_interval => 10
+      )
+
+      @redis.hget(gauge_key, "1360584960").should == "555"
+      @namespace.gauges[:"sales-per-second-set"].value_at(1360584961).should == "555"
+    end
+
+    it "should create and increment-average zero-config gauges" do
+      @namespace.announce(
+        :_type => "_avg",
+        :_eid  => 1234,
+        :_time => 1360584960,
+        :value => 5,
+        :gauge => "sales-per-second-avg",
+        :flush_interval => 10
+      )
+
+      @namespace.gauges[:"sales-per-second-avg"].should be_a(Gauge)
+      @namespace.gauges[:"sales-per-second-avg"].average?.should be_true
+
+      gauge_key = "fnordmetric-myns_213-gauge-sales-per-second-avg-10"
+      @redis.hget(gauge_key, "1360584960").should == "5"
+
+      @namespace.announce(
+        :_type => "_avg",
+        :_eid  => 1234,
+        :_time => 1360584960,
+        :value => 10,
+        :gauge => "sales-per-second-avg",
+        :flush_interval => 10
+      )
+
+      @redis.hget(gauge_key, "1360584960").should == "15"
+      @namespace.gauges[:"sales-per-second-avg"].value_at(1360584961).should == 7.5
+    end
+
   end
 
   describe "increment non-progressive gauges" do
@@ -24,7 +132,7 @@ describe FnordMetric::GaugeModifiers do
         incr(:mygauge_234, 1)  
       }).tap do |context|      
         event = { :_time => @now }
-        context.call(event, @redis_wrap)
+        context.call(event, @redis_wrap, @namespace)
       end
       @redis.hget(gauge_key, "695280200").should == "13"
     end
@@ -39,7 +147,7 @@ describe FnordMetric::GaugeModifiers do
         incr(:mygauge_224, 5)  
       }).tap do |context|      
         event = { :_time => @now }
-        context.call(event, @redis_wrap)
+        context.call(event, @redis_wrap, @namespace)
       end
       @redis.hget(gauge_key, "695280200").should == "23"
     end
@@ -54,13 +162,12 @@ describe FnordMetric::GaugeModifiers do
         incr(:mygauge_253, data[:myval].to_i)  
       }).tap do |context|      
         event = { :_time => @now, :myval => "25" }
-        context.call(event, @redis_wrap)
+        context.call(event, @redis_wrap, @namespace)
       end
       @redis.hget(gauge_key, "695280200").should == "36"
     end
 
   end
-  
 
   describe "increment progressive gauges" do
 
@@ -76,7 +183,7 @@ describe FnordMetric::GaugeModifiers do
         incr(:mygauge_123, 1)  
       }).tap do |context|      
         event = { :_time => @now }
-        context.call(event, @redis_wrap)
+        context.call(event, @redis_wrap, @namespace)
       end
       @redis.hget(gauge_key, "695280200").should == "24"
       @redis.get(gauge_key+"-head").should == "24"
@@ -94,7 +201,7 @@ describe FnordMetric::GaugeModifiers do
         incr(:mygauge_125, 5)  
       }).tap do |context|      
         event = { :_time => @now }
-        context.call(event, @redis_wrap)
+        context.call(event, @redis_wrap, @namespace)
       end
       @redis.hget(gauge_key, "695280200").should == "27"
       @redis.get(gauge_key+"-head").should == "27"
@@ -112,7 +219,7 @@ describe FnordMetric::GaugeModifiers do
         incr(:mygauge_128, 3)  
       }).tap do |context|      
         event = { :_time => @now }
-        context.call(event, @redis_wrap)
+        context.call(event, @redis_wrap, @namespace)
       end
       @redis.hget(gauge_key, "695280200").should == "20"
       @redis.get(gauge_key+"-head").should == "20"
@@ -130,7 +237,7 @@ describe FnordMetric::GaugeModifiers do
         incr(:mygauge_121, 6)  
       }).tap do |context|      
         event = { :_time => @now }
-        context.call(event, @redis_wrap)
+        context.call(event, @redis_wrap, @namespace)
       end
       @redis.hget(gauge_key, "695280200").should == "25"
       @redis.get(gauge_key+"-head").should == "25"
@@ -147,7 +254,7 @@ describe FnordMetric::GaugeModifiers do
       }).tap do |context|      
         event = { :_time => @now }
         lambda{
-          context.call(event, @redis_wrap)
+          context.call(event, @redis_wrap, @namespace)
         }.should raise_error(RuntimeError)
       end
     end
@@ -168,7 +275,7 @@ describe FnordMetric::GaugeModifiers do
         incr(:mygauge_917, 30)  
       }).tap do |context|      
         event = { :_time => @now, :_session_key => "mysesskey" }
-        context.call(event, @redis_wrap)
+        context.call(event, @redis_wrap, @namespace)
       end
       @redis.hget(gauge_key, "695280200").should == "84"
       @redis.get(gauge_key+"-695280200-value-count").should == "6"
@@ -190,7 +297,7 @@ describe FnordMetric::GaugeModifiers do
         incr(:mygauge_963, 30)  
       }).tap do |context|      
         event = { :_time => @now, :_session_key => "mysesskey" }
-        context.call(event, @redis_wrap)
+        context.call(event, @redis_wrap, @namespace)
       end
       @redis.hget(gauge_key, "695280200").should == "84"
       @redis.get(gauge_key+"-695280200-sessions-count").should == "6"
@@ -210,7 +317,7 @@ describe FnordMetric::GaugeModifiers do
         incr(:mygauge_966, 30)  
       }).tap do |context|      
         event = { :_time => @now, :_session_key => "mysesskey" }
-        context.call(event, @redis_wrap)
+        context.call(event, @redis_wrap, @namespace)
       end
       @redis.hget(gauge_key, "695280200").should == "54"
       @redis.get(gauge_key+"-695280200-sessions-count").should == "5"
@@ -229,7 +336,7 @@ describe FnordMetric::GaugeModifiers do
         incr(:mygauge_966, 30)  
       }).tap do |context|      
         event = { :_time => @now }
-        context.call(event, @redis_wrap)
+        context.call(event, @redis_wrap, @namespace)
       end
       @redis.hget(gauge_key, "695280200").should == "54"
       @redis.get(gauge_key+"-695280200-sessions-count").should == "5"
@@ -250,7 +357,7 @@ describe FnordMetric::GaugeModifiers do
         incr(:mygauge_963, 30)  
       }).tap do |context|      
         event = { :_time => @now, :_session_key => "mysesskey" }
-        context.call(event, @redis_wrap)
+        context.call(event, @redis_wrap, @namespace)
       end
       @redis.hget(gauge_key, "695280200").should == "84"
       @redis.get(gauge_key+"-progressive-sessions-count").should == "6"
@@ -271,7 +378,7 @@ describe FnordMetric::GaugeModifiers do
         incr(:mygauge_966, 30)  
       }).tap do |context|      
         event = { :_time => @now, :_session_key => "mysesskey" }
-        context.call(event, @redis_wrap)
+        context.call(event, @redis_wrap, @namespace)
       end
       @redis.hget(gauge_key, "695280200").should == "54"
       @redis.get(gauge_key+"-progressive-sessions-count").should == "5"
@@ -293,7 +400,7 @@ describe "increment three-dimensional gagues" do
         incr_field(:mygauge_434, "whoopwhoop", 1)  
       }).tap do |context|      
         event = { :_time => @now }
-        context.call(event, @redis_wrap)
+        context.call(event, @redis_wrap, @namespace)
       end
       @redis.zscore(gauge_key, "whoopwhoop").to_f.should == 13.0
       @redis.get(gauge_key+"-count").should == "1"
@@ -310,7 +417,7 @@ describe "increment three-dimensional gagues" do
         incr_field(:mygauge_634, "whoopwhoop", 5)  
       }).tap do |context|      
         event = { :_time => @now }
-        context.call(event, @redis_wrap)
+        context.call(event, @redis_wrap, @namespace)
       end
       @redis.zscore(gauge_key, "whoopwhoop").to_f.should == 5.0
       @redis.get(gauge_key+"-count").should == "7"
@@ -327,7 +434,7 @@ describe "increment three-dimensional gagues" do
         incr_field(:mygauge_634, data[:myfield], 5)  
       }).tap do |context|      
         event = { :_time => @now, :myfield => "fnordybar" }
-        context.call(event, @redis_wrap)
+        context.call(event, @redis_wrap, @namespace)
       end
       @redis.zscore(gauge_key, "fnordybar").to_f.should == 16.0
     end
@@ -345,7 +452,7 @@ describe "increment three-dimensional gagues" do
         incr_field(:mygauge_1263, "mykey", 30)  
       }).tap do |context|      
         event = { :_time => @now, :_session_key => "mysesskey" }
-        context.call(event, @redis_wrap)
+        context.call(event, @redis_wrap, @namespace)
       end
       @redis.zscore(gauge_key, "mykey").to_f.should == 84.0
       @redis.get(gauge_key+"-sessions-count").should == "6"
@@ -366,7 +473,7 @@ describe "increment three-dimensional gagues" do
         incr_field(:mygauge_1266, "otherkey", 30)  
       }).tap do |context|      
         event = { :_time => @now, :_session_key => "mysesskey" }
-        context.call(event, @redis_wrap)
+        context.call(event, @redis_wrap, @namespace)
       end
       @redis.zscore(gauge_key, "otherkey").to_f.should == 54.0
       @redis.get(gauge_key+"-sessions-count").should == "5"
@@ -389,7 +496,7 @@ describe "increment three-dimensional gagues" do
         set_value(:mygauge_5463, 17)  
       }).tap do |context|      
         event = { :_time => @now, :_session_key => "mysesskey" }
-        context.call(event, @redis_wrap)
+        context.call(event, @redis_wrap, @namespace)
       end
       @redis.hget(gauge_key, "695280200").should == "17"
     end
@@ -407,7 +514,7 @@ describe "increment three-dimensional gagues" do
         set_field(:mygauge_1463, "asdasdkey", 23)  
       }).tap do |context|      
         event = { :_time => @now, :_session_key => "mysesskey" }
-        context.call(event, @redis_wrap)
+        context.call(event, @redis_wrap, @namespace)
       end
       @redis.zscore(gauge_key, "asdasdkey").to_f.should == 23.0
     end
@@ -422,10 +529,9 @@ private
   def create_gauge_context(opts, block)
     gauge = FnordMetric::Gauge.new({
       :key_prefix => "fnordmetrics-myns"
-    }.merge(opts))      
-    FnordMetric::Context.new({
-      :gauges => { opts[:key].intern => gauge }
-    }, block) 
+    }.merge(opts))
+    @namespace.instance_variable_set(:"@gauges", { opts[:key].intern => gauge })
+    FnordMetric::Context.new({}, block)
   end