Commit 7a718f5e authored by Paul Asmuth's avatar Paul Asmuth
Browse files

gauge.ticks_in should include the current tick

parent 8d36f7e2
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ module FnordMetric::GaugeCalculations
    (_v.to_f / (sync_redis.get(tick_key(_t, :"value-count"))||1).to_i)
  }

  def ticks_in(r, _tick=tick)
    (((r.last-r.first)/_tick.to_f).ceil+1).times.map{ |n| tick_at(r.first + _tick*(n-1), _tick) }
  def ticks_in(r, _tick=tick, overflow=0)
    (((r.last-r.first)/_tick.to_f).ceil+1+overflow).times.map{ |n| tick_at(r.first + _tick*(n-1), _tick) }
  end

  def values_in(range)
+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ class FnordMetric::DistributionGauge < FnordMetric::Gauge
      h[k] = { :min => nil, :max => 0, :avg => [] }
    end

    ticks_in(@interval).each do |_tick|
    ticks_in(@interval, tick, 1).each do |_tick|
      tkey = tick_key(_tick, :histogram)

      sync_redis.hgetall(tkey).each do |_val, _count|        
+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ class FnordMetric::ToplistGauge < FnordMetric::Gauge
    @interval = parse_interval(event["interval"])

    @toplist = FnordMetric::Toplist.new
    @all_ticks = ticks_in(@interval)
    @all_ticks = ticks_in(@interval, tick, 1)

    @all_ticks.each do |_tick|
      field_values_at(_tick, :limit => top_k, :append => :toplist).each do |item, count|