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

better default intervals

parent 3f756fb0
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ def start_example_data_generator
    loop do
      api.event(:_type => :signup, :referrer => (rand(3) == 1 ? :twitter : :facebook))
      api.event(:_type => :search, :keyword => (%w(Donau Dampf Schiff Fahrts Kaptitaens Muetzen Staender).shuffle[0..2] * ""))
      api.event(:_type => :user_demography, :age => rand(15..85), :gender => (rand(2)==1 ? :female : :male) )
      api.event(:_type => :user_demography, :age => rand(15..55), :gender => (rand(2)==1 ? :female : :male) )
      sleep (rand(10)/10.to_f)
    end
  end
+23 −6
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ FnordMetric.views.gaugeView = (function(gauge_name){
  var viewport = null;
  var tabs = [];
  var conf = {};
  var tick;

  var start_timestamp, end_timestamp;

  function load(_viewport){
    viewport = _viewport;
@@ -12,6 +15,7 @@ FnordMetric.views.gaugeView = (function(gauge_name){
    viewport.append($('<div class="gauge_viewport"></div>'));

    conf.title = gauge_name;
    tick = Math.max(3600, FnordMetric.gauges[gauge_name].tick);

    FnordMetric.ui.navbar($('.navbar', viewport), {
      breadcrumb: [ 
@@ -25,11 +29,16 @@ FnordMetric.views.gaugeView = (function(gauge_name){
    });

    var now = parseInt((new Date()).getTime() / 1000);
    //var init_interval = (now-(FnordMetric.gauges[gauge_name].tick*24)) + "-" + now;
    var init_interval = (now-(3600*24)) + "-" + now;

    start_timestamp = atTick((now-(tick*24)));
    end_timestamp   = atTick(now);

    updateDatepicker();
    load_interval();
  }

    load_interval(init_interval);
  function atTick(t){
    return (Math.ceil(t / tick) * tick);
  }

  function close(){
@@ -40,6 +49,14 @@ FnordMetric.views.gaugeView = (function(gauge_name){

  }

  function updateDatepicker(){
    $(".navbar .datepicker .date", viewport).html(
      FnordMetric.util.dateFormat(start_timestamp) +
      '&nbsp;&dash;&nbsp;' +
      FnordMetric.util.dateFormat(end_timestamp)
    );
  }

  function announce(evt){
    if ((evt.gauge != gauge_name) ||
       (evt.type != "render_response") ||
@@ -83,14 +100,14 @@ FnordMetric.views.gaugeView = (function(gauge_name){
    });
  }

  function load_interval(interval){
  function load_interval(){
    $('.gauge_viewport', viewport)
      .html("");

    FnordMetric.publish({
      "gauge": gauge_name,
      "type": "render_request",
      "interval": interval
      "interval": start_timestamp + "-" + end_timestamp
    })
  }

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ FnordMetric.ui.navbar = function(elem, opts){
  if(opts.datepicker){
    elem.append(
      $('<a class="button datepicker">')
        .html('<div class="date">22.05.12 15:00 &nbsp;&mdash;&nbsp; 23.05.12 15:00</div><i class="icon-calendar"></i>'));  
        .html('<div class="date">&nbsp;</div><i class="icon-calendar"></i>'));  
  }

  elem.append(head);