Commit 3f756fb0 authored by Paul Asmuth's avatar Paul Asmuth
Browse files

toplist, distribution, timeseries gauge: display number of samples, fancy timerange

parent 0017d7b4
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ TODO
----

- gauge-view: interval selection dropdown 
- report: print number of samples, interval-size on topright via scalaexp-buttonstyle

- timeseries-widget: cardinal on/off should be skeuomorph
- proper cmdline output (status?)
+6 −2
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ class FnordMetric::DistributionGauge < FnordMetric::Gauge
    @histogram = FnordMetric::Histogram.new
    @values = []

    @samples = 0

    @mmm_timeseries = Hash.new do |h,k| 
      h[k] = { :min => nil, :max => 0, :avg => [] }
    end
@@ -23,6 +25,8 @@ class FnordMetric::DistributionGauge < FnordMetric::Gauge
        _count = _count.to_f
        _val = _val.to_f * @opts[:value_scale]

        @samples += _count

        @histogram[_val] += _count
        @values += [_val] * _count

+5 −2
Original line number Diff line number Diff line
@@ -28,10 +28,13 @@ class FnordMetric::TimeseriesGauge < FnordMetric::Gauge
    @series = Hash.new
    @zooms  = FnordMetric::TICKS[tick, @interval.size]

    @total = 0

    @opts[:series].each do |series|
      ts = FnordMetric::Timeseries.new

      fraction_values_in(@interval, series).each do |time, frac|
        @total += frac.first # FIXPAUL
        ts.incr_fraction(time, *frac)
      end

+22 −4
Original line number Diff line number Diff line
.report_view

  %ul.ui_numbers(style="float:right;")
    %li
      .val
        %span.ui_value(data-value="#{@samples}")
      .title Number of Samples
    %li
      .val
        %span.ui_value(data-value="#{@values.mean}")
      .title Total Value Mean
    %li
      .val
        %span.ui_value(data-value="#{@values.median}")
      .title Total Value Median
    %li.twoline
      .title Time Range
      .val= (fancy_timerange(@interval) * " - ")


  %h1= @opts[:title]
  %h3= (fancy_timerange(@interval) * " &nbsp;&mdash;&nbsp; ")
  %h3 Numeric Distribution Gauge

  %ul.ui_tabs.tabs
    %li.active{"data-tab" => "Overview"}
+3 −8
Original line number Diff line number Diff line
@@ -2,20 +2,15 @@

  %ul.ui_numbers(style="float:right;")
    %li
      .val 123
      .title Number of Samples
    %li
      .val 123
      .title Number of Samples
    %li
      .val 123
      .val
        %span.ui_value(data-value="#{@total}")
      .title Number of Samples
    %li.twoline
      .title Time Range
      .val= (fancy_timerange(@interval) * " - ")

  %h1= @opts[:title] || @opts[:key]
  %h3= (fancy_timerange(@interval) * " &nbsp;&mdash;&nbsp; ")
  %h3 Numeric Timeseries Gauge

  %ul.ui_tabs.tabs
    %li.active{"data-tab" => "Overview"}
Loading