rename dividend/divisor -> numerator/denominator (a0df92c1) · Commits · github_fork / Clip

V1.0-ROADMAP

+4 −4

Original line number	Diff line number	Diff line
		@@ -40,10 +40,10 @@ ROADMAP

		> Timeseries Gauge
		X timeseries-gauge/widget: set resolution via "tick buttons"
		X timeseries-gauge: calculate option (sum, average, progressive_sum)
		X timeseries-gauge: incr_counter / incr_denominator for avg
		- timeseries-gauge: realtime tab w/ moving average
		- timeseries-widget: tooltip -> show key noun
		- timeseries-gauge: calculate option (sum, average, progressive_sum)
		X timeseries-gauge: incr_counter / incr_divisor for avg
		- timeseries-gauge: overview realtime gauge
		- timeseries-gauge: overview series weights
		- timeseries-gauge: overview all numbers
		@@ -110,7 +110,7 @@ WIKI
		> gauges
		> timeseries gauge
		- calculate-option: count, sum, progressive_sum, avg
		- incr / incr_counter / incr_divisor
		- incr / incr_counter / incr_denominator
		> toplist gauge
		> distribution gauge

+1 −1

Original line number	Diff line number	Diff line
		@@ -80,7 +80,7 @@ module FnordMetric::GaugeCalculations
		ticks_in(range, retention).each do \|_tick\|
		sync_redis.hgetall(retention_key(_tick)).each do \|k, v\|
		kx = k.split("-")
		vals[kx.first.to_i][kx.last == "divisor" ? 1 : 0] += v.to_f
		vals[kx.first.to_i][kx.last == "denominator" ? 1 : 0] += v.to_f
		end
		end
		end

+4 −4

Original line number	Diff line number	Diff line
		@@ -72,12 +72,12 @@ module FnordMetric::GaugeModifiers
		@redis.zadd(gauge.tick_key(time), value, field_name)
		end

		def incr_dividend(ctx, series_name=:default, value=1, prog=false)
		incr_fraction(ctx, series_name, :dividend, value, prog)
		def incr_numerator(ctx, series_name=:default, value=1, prog=false)
		incr_fraction(ctx, series_name, :numerator, value, prog)
		end

		def incr_divisor(ctx, series_name=:default, value=1, prog=false)
		incr_fraction(ctx, series_name, :divisor, value, prog)
		def incr_denominator(ctx, series_name=:default, value=1, prog=false)
		incr_fraction(ctx, series_name, :denominator, value, prog)
		end

		def incr_fraction(ctx, series_name, part, value, prog)

+6 −6

Original line number	Diff line number	Diff line
		@@ -44,8 +44,8 @@ class FnordMetric::TimeseriesGauge < FnordMetric::Gauge

		def execute(cmd, context, *args)
		return incr(context, *args) if cmd == :incr
		return incr_dividend(context, *args) if cmd == :incr_dividend
		return incr_divisor(context, *args) if cmd == :incr_divisor
		return incr_numerator(context, *args) if cmd == :incr_numerator
		return incr_denominator(context, *args) if cmd == :incr_denominator

		FnordMetric.error("gauge '#{name}': unknown command: #{cmd}")
		end
		@@ -62,12 +62,12 @@ private

		def incr(ctx, series_name = :default, value = 1)
		if @calculate == :average
		incr_dividend(ctx, series_name, value)
		incr_divisor(ctx, series_name, 1)
		incr_numerator(ctx, series_name, value)
		incr_denominator(ctx, series_name, 1)
		elsif @calculate == :sum
		incr_dividend(ctx, series_name, value)
		incr_numerator(ctx, series_name, value)
		elsif @calculate == :progressive_sum
		incr_dividend(ctx, series_name, value, true)
		incr_numerator(ctx, series_name, value, true)
		end
		end

+5 −5

Original line number	Diff line number	Diff line
		@@ -5,16 +5,16 @@ class FnordMetric::Timeseries
		@timeline.merge!(timeline)
		end

		def incr_fraction(time, dividend, divisor)
		incr_dividend(time, dividend) if dividend
		incr_divisor(time, divisor) if divisor
		def incr_fraction(time, numerator, denominator)
		incr_numerator(time, numerator) if numerator
		incr_denominator(time, denominator) if denominator
		end

		def incr_dividend(time, value)
		def incr_numerator(time, value)
		@timeline[time.to_i][0] += value
		end

		def incr_divisor(time, value)
		def incr_denominator(time, value)
		@timeline[time.to_i][-1] \|\|= 0
		@timeline[time.to_i][-1] += value
		end