fnordmetric 1.0.1 → 1.2.0

data/spec/gauge_spec.rb

@@ -22,9 +22,14 @@ describe FnordMetric::Gauge do
       gauge.tick.should == 23
     end
 
+    it "should return the correct tick if configured with flush_interval" do
+      gauge = FnordMetric::Gauge.new({:flush_interval => 42, :key_prefix => "fnordmetrics-myns", :key => "mygauge"})
+      gauge.tick.should == 42
+    end
+
     it "should return the default tick if none configured" do
       gauge = FnordMetric::Gauge.new({:key_prefix => "fnordmetrics-myns", :key => "mygauge"})
-      gauge.tick.should == 3600
+      gauge.tick.should == FnordMetric.options[:default_flush_interval]
     end
 
     it "should return the correct tick_at" do
@@ -222,4 +227,4 @@ describe FnordMetric::Gauge do
     end
 
   end
-end
+end

data/spec/namespace_spec.rb

@@ -73,29 +73,18 @@ describe FnordMetric::Namespace do
     it "should register an event handler and create a context"
     it "should register an event handler and pass options"
     it "should register an event handler and pass gauges"
-
-    it "should announce an event to the correct handler" do
-      pending("finish this")
-    # block_called = false
-    # FnordMetric::Dashboard.new(:title => 'My Dashboard') do |dash|
-    #    block_called = true
-    #    dash.should be_a(FnordMetric::Dashboard)
-    #  end
-    #  block_called.should be_true
-    end
-
+    it "should announce an event to the correct handler"
     it "should announce an event to multiple handlers"
     it "should announce an event to the wildcard handler"
-
   end
 
   it "should create a new session on announce if _session is set" do
     FnordMetric::Session.should_receive(:create).and_return(SessionMock.new)
     FnordMetric::Namespace.new(
       :myns_213, 
-      :redis_prefix => "fnordmetric"      
-    ).ready!(@redis_wrap).announce(
-      :_time => Time.now.to_i, 
+      :redis_prefix => "fnordmetric"
+    ).ready!(@redis_wrap, @redis).announce(
+      :_time => Time.now.to_i,
       :_type => "foobar", 
       :_session => "sess213"
     )
@@ -104,11 +93,11 @@ describe FnordMetric::Namespace do
   it "should add the event to the namespace-event-type-list" do
     FnordMetric::Namespace.new(
       :myns_215, 
-      :redis_prefix => "fnordmetric"      
-    ).ready!(@redis_wrap).announce(
+      :redis_prefix => "fnordmetric"
+    ).ready!(@redis_wrap, @redis).announce(
       :_eid => "35r2423",
-      :_time => Time.now.to_i, 
-      :_type => "fnordbar", 
+      :_time => Time.now.to_i,
+      :_type => "fnordbar",
       :_session => "sess213"
     )
     event_ids = @redis.lrange("fnordmetric-myns_215-type-fnordbar", 0, -1)

data/spec/util_spec.rb

@@ -0,0 +1,46 @@
+require ::File.expand_path('../spec_helper.rb', __FILE__)
+require 'irb'
+
+describe FnordMetric::Util do
+
+  describe "parse_time" do
+
+    it "should parse now" do
+      FnordMetric::Util.parse_time("now").should == Time.now.to_i
+    end
+
+    it "should parse a timestamp" do
+      FnordMetric::Util.parse_time("1360437813").should == 1360437813
+    end
+
+    it "should parse -secs" do
+      FnordMetric::Util.parse_time("-123").should == Time.now.to_i - 123
+    end
+
+    time_specs = {
+      "-5s" => 5,
+      "-5sec" => 5,
+      "-5secs" => 5,
+      "-5second" => 5,
+      "-5seconds" => 5,
+      "-5m" => (60 * 5),
+      "-5min" => (60 * 5),
+      "-5minute" => (60 * 5),
+      "-5minutes" => (60 * 5),
+      "-5h" => (3600 * 5),
+      "-5hour" => (3600 * 5),
+      "-5hours" => (3600 * 5),
+      "-5d" => (3600 * 24 * 5),
+      "-5day" => (3600 * 24 * 5),
+      "-5days" => (3600 * 24 * 5)
+    }
+
+    time_specs.each do |ts, ti|
+      it "should parse #{ts}" do
+        FnordMetric::Util.parse_time(ts).should == Time.now.to_i - ti
+      end
+    end
+
+  end
+
+end

data/web/.gitignore

@@ -0,0 +1,4 @@
+fnordmetric-core.js
+fnordmetric-core.css
+fnordmetric-ui.js
+fnordmetric-ui.css

data/web/build.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+cp ../../fnordmetric-ui/fnordmetric-ui.js ./
+cp ../../fnordmetric-ui/fnordmetric-ui.css ./
+
+(
+  echo "/* this is an automatically generated file, don't modify it... */"
+  cat vendor/jquery-ui.min.js
+  cat vendor/jquery.maskedinput.js
+  cat vendor/jquery.combobox.js
+  cat js/fnordmetric.js
+  cat js/fnordmetric.util.js
+  cat js/fnordmetric.ui.js
+  cat js/fnordmetric.timeline_widget.js
+  cat js/fnordmetric.numbers_widget.js
+  cat js/fnordmetric.bars_widget.js
+  cat js/fnordmetric.pie_widget.js
+  cat js/fnordmetric.toplist_widget.js
+  cat js/fnordmetric.html_widget.js
+  cat js/fnordmetric.realtime_timeline_widget.js
+  cat js/fnordmetric.timeseries_widget.js
+  cat js/fnordmetric.overview_view.js
+  cat js/fnordmetric.gauge_view.js
+  cat js/fnordmetric.dashboard_view.js
+  cat js/fnordmetric.session_view.js
+  cat js/fnordmetric.gauge_explorer.js
+) > fnordmetric-core.js
+
+(
+  echo "/* this is an automatically generated file, don't modify it... */"
+  cat vendor/font-awesome/css/font-awesome.css
+  cat css/fnordmetric.core.css
+) > fnordmetric-core.css
+

data/web/{fnordmetric.css → css/fnordmetric.core.css}

@@ -175,13 +175,13 @@ a.button.dark:active{
   background:#ccc;
 }
 
-.navbar a.button.datepicker{
+.navbar a.button.datepicker, a.button.datepicker_sa{
   padding-left:0;
   padding-right:10px;
   margin-right:15px;
 }
 
-.navbar a.button.datepicker .date{
+.navbar a.button.datepicker .date, a.button.datepicker_sa .date{
   background: white;
   padding: 0 13px;
   border-right: 1px solid #DDD;
@@ -192,12 +192,38 @@ a.button.dark:active{
   color:#555;
 }
 
-.navbar a.button.datepicker i{
+.navbar a.button.datepicker i, a.button.datepicker_sa i{
   font-size: 17px;
   float: right;
   margin-top: 0px;
 }
 
+a.button.datepicker_sa {
+  margin-top:0;
+  height: 35px;
+  float:none;
+  background-color: #F4F4F4;
+  background-image: -webkit-linear-gradient(top, #ffffff, #e9e9e9);
+  background-image: -moz-linear-gradient(top, #ffffff, #e9e9e9);
+  background-image: -ms-linear-gradient(top, #ffffff, #e9e9e9);
+  background-image: -o-linear-gradient(top, #ffffff, #e9e9e9);
+  background-image: linear-gradient(top, #ffffff, #e9e9e9);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#ffffff', EndColorStr='#e9e9e9');
+}
+
+a.button.datepicker_sa:hover {
+  background: #f4f4f4;
+}
+
+a.button.datepicker_sa .date {
+  height: 35px;
+  line-height: 37px;
+}
+
+a.button.datepicker_sa i {
+  margin-top:7px;
+}
+
 .navbar + h1{
   margin-top:22px;
 }
@@ -234,14 +260,14 @@ a.button.dark:active{
 .ui_value.left{ float:left; }
 
 .ui_toplist{ min-height:300px; }
-.ui_toplist.loading{ opacity:0.5; background:url('/loader.gif') no-repeat center center;  }
+.ui_toplist.loading{ opacity:0.5; background:url('/img/loader.gif') no-repeat center center;  }
 
 .ui_toplist .toplist_item{ border-bottom:1px solid #dedede; height:42px; display:block; }
 .ui_toplist .toplist_item:hover{ background:#fff; }
 .ui_toplist .toplist_item .title{ float:left; line-height:42px; margin-left:20px; font-size:13px; color:#333; }
 .ui_toplist .toplist_item .value{ float:right; line-height:42px; margin-right:20px; font-size:13px; font-weight:bold; width:70px; color:#666; }
 .ui_toplist .toplist_item .value.large{ width:110px; }
-.ui_toplist .toplist_item .percent{ float:right; line-height:42px; margin-right:30px; font-size:18px; font-weight:bold; color:#333; width:120px; white-space:nowrap; overflow:hidden; }
+.ui_toplist .toplist_item .percent{ float:right; line-height:42px; margin-right:30px; font-size:18px; font-weight:bold; color:#333; width:80px; white-space:nowrap; overflow:hidden; }
 
 .ui_toplist .toplist_item .trend{ float:right; line-height:42px; margin-right:30px; font-size:18px; font-weight:bold; color:#333; width:70px; white-space:nowrap; }
 
@@ -352,7 +378,7 @@ text-shadow: 1px 0px 2px rgba(255, 255, 255, 1);
 .number .value{ color:#444; font-size:20px; display:block; margin-bottom:5px; font-weight:bold; }
 .number .desc{ color:#999; font-size:12px; margin-bottom:5px; display:block;  white-space:nowrap; }
 .number:last-child{ border-right:none; }
-.numbers_container{ padding-right:0px; width:215px; float:left; margin:15px 0 -1px 20px; padding-bottom:5px; border-bottom:1px solid #dedede; }
+.numbers_container{ padding-right:0px; width:215px; float:left; margin:15px 0 -1px 20px; padding-bottom:5px; }
 
 .numbers_container.size_3{ width:258px; }
 .numbers_container.size_4{ width:358px; }
@@ -444,7 +470,7 @@ ul.ui_tabs li.active a{
   border: 1px solid #D0D0D0;
   border-bottom:none;
   color:#333;
-  background:#f4f4f4;
+  background-color: #F4F4F4;
 }
 
 .gauge_viewport{ margin-top:30px; }
@@ -467,56 +493,6 @@ h1.head{ margin-top:70px; }
 .gauge_viewport{ margin-top:30px; }
 
 
-.rickshaw_graph .y_ticks path { stroke:#fff; }
-.rickshaw_graph .y_grid .tick { stroke:rgba(0,0,0,.1); }
-
-.rickshaw_graph .x_tick {
-  border-left: none;
-}
-
-.rickshaw_graph .x_tick.glow .title, .rickshaw_graph .y_ticks.glow text{
-  font-size:14px;
-}
-
-.rickshaw_legend {
-font-family: "Gotham Narrow", Helvetica, sans-serif;
-font-size: 12px;
-color: #333;
-background: none;
-display: inline-block;
-padding: 12px 5px;
-border-radius: 2px;
-position: relative;
-}
-
-.rickshaw_legend .ui-sortable {
-  margin-left:-10px;
-}
-
-.rickshaw_legend li.line{
-   float:left;
-   clear:none;
-   padding-right:0;
-}
-
-.rickshaw_legend a.action{
-  margin-right:5px;
-  display:none;
-}
-
-
-.rickshaw_legend li.line .label{
-  font.size:14px;
-  margin-left:5px;
-  color:#333;
-  position:relative;
-  top:-1px;
-}
-
-
-.rickshaw_graph .y_grid .tick { stroke:rgba(0,0,0,.15); stroke-dasharray:0; }
-.rickshaw_graph .y_ticks text { fill:#333333; }
-
 .modal_backdrop {
   background-color: #000000;
   position: fixed;
@@ -589,7 +565,7 @@ position: relative;
 #sidebar ul li{ height:28px; line-height:28px; cursor:pointer; font-size:13px; padding-left:25px; }
 #sidebar ul li a{ color:#ccc; text-decoration:none; }
 /*#sidebar ul li:after{ content:'›'; display:block; float:right; margin-right:15px; color:#ccc; font-size:16px; line-height:27px; }*/
-#sidebar ul li i{ margin-right: 5px; color: #AAA; font-size: 11px; position: relative; left: -2px; top: -1px; display:none; }
+#sidebar ul li i{ margin-right: 1px; color: #AAA; font-size: 11px; position: relative; left: -2px; top: -1px; display:none; }
 #sidebar ul li:hover, #tabs ul li:hover:after{ color:#fff; }
 #sidebar ul li:hover .picto{ opacity:1; }
 #sidebar ul li.active i, #sidebar ul li.active a{ color:#eee; }
@@ -803,3 +779,90 @@ input.input.lopen{
 .widget_histogram_bars rect:hover {
   opacity: 0.9;
 }
+
+.ge_controlpanel {
+  height:85px;
+  padding:20px;
+  float:left;
+  border-right:1px solid #efefef;
+  margin-top:45px;
+}
+
+.ge_controlpanel label{
+  font-weight:bold;
+  display:block;
+  margin-bottom:5px;
+}
+
+.ui-autocomplete.ui-menu{
+  background:#fff;
+  border: 1px solid #bbb;
+  border-radius:3px;
+  box-shadow: 2px 0 4px rgba(0,0,0,.2);
+  float:left;
+  padding:0 0 0 0;
+}
+
+.ui-autocomplete.ui-menu li {
+  list-style-type:none;
+  line-height:30px;
+  font-size:110%;
+  padding-left:10px;
+  border-top:1px solid #fff;
+  border-bottom:1px solid #efefef;
+}
+
+.ui-autocomplete.ui-menu li:hover {
+  color:#fff;
+  cursor:pointer;
+
+  background: #7bb2ff; /* Old browsers */
+  background: -moz-linear-gradient(top, #7bb2ff 0%, #609ff8 44%, #4089ee 100%);
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7bb2ff), color-stop(44%,#609ff8), color-stop(100%,#4089ee)); /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #7bb2ff 0%,#609ff8 44%,#4089ee 100%);
+  background: -o-linear-gradient(top, #7bb2ff 0%,#609ff8 44%,#4089ee 100%);
+  background: -ms-linear-gradient(top, #7bb2ff 0%,#609ff8 44%,#4089ee 100%);
+  background: linear-gradient(top, #7bb2ff 0%,#609ff8 44%,#4089ee 100%);
+
+  border-top:1px solid #5F94DE;
+  border-bottom:1px solid #4E7DBF;
+}
+
+.ge_controlpanel .ui-helper-hidden-accessible {
+  display: none;
+}
+
+.ge_controlpanel .ui-combobox-input {
+  height:35px;
+  line-height:35px;
+  padding: 0 10px;
+  width:400px;
+  border-radius:3px;
+  border: 1px solid #979797;
+  box-shadow: 0 0 2px #ddd inset;
+}
+
+.ge_meta {
+  height:35px;
+  line-height:37px;
+  color:#999;
+}
+
+.ge_meta a {
+  margin-left: 10px;
+  font-size:110%;
+  color:#06c;
+  text-decoration:none;
+}
+
+.ge_meta a:hover {
+  text-decoration:underline;
+}
+
+.ge_empty {
+  display: block;
+  text-align: center;
+  line-height: 400px;
+  font-size: 16px;
+  color: #666;
+}

data/web/haml/app.haml

@@ -3,28 +3,10 @@
   %head
     %title FnordMetric
     %script{:src => "/vendor/jquery-1.6.2.min.js", :type => "text/javascript"}
-    %script{:src => "/vendor/jquery-ui.min.js", :type => "text/javascript"}
-    %script{:src => "/vendor/jquery.maskedinput.js", :type => "text/javascript"}
-    %script{:src => "/vendor/d3.v2.js", :type => "text/javascript"}
-    %script{:src => "/vendor/rickshaw.fnordmetric.js", :type => "text/javascript"}
-    %script{:src => "/js/fnordmetric.js", :type => "text/javascript"}
-    %script{:src => "/js/fnordmetric.util.js", :type => "text/javascript"}
-    %script{:src => "/js/fnordmetric.ui.js", :type => "text/javascript"}
-    %script{:src => "/js/fnordmetric.timeline_widget.js", :type => "text/javascript"}
-    %script{:src => "/js/fnordmetric.numbers_widget.js", :type => "text/javascript"}
-    %script{:src => "/js/fnordmetric.bars_widget.js", :type => "text/javascript"}
-    %script{:src => "/js/fnordmetric.pie_widget.js", :type => "text/javascript"}
-    %script{:src => "/js/fnordmetric.toplist_widget.js", :type => "text/javascript"}
-    %script{:src => "/js/fnordmetric.html_widget.js", :type => "text/javascript"}
-    %script{:src => "/js/fnordmetric.realtime_timeline_widget.js", :type => "text/javascript"}
-    %script{:src => "/js/fnordmetric.timeseries_widget.js", :type => "text/javascript"}
-    %script{:src => "/js/fnordmetric.overview_view.js", :type => "text/javascript"}
-    %script{:src => "/js/fnordmetric.gauge_view.js", :type => "text/javascript"}
-    %script{:src => "/js/fnordmetric.dashboard_view.js", :type => "text/javascript"}
-    %script{:src => "/js/fnordmetric.session_view.js", :type => "text/javascript"}
-    %link{:href => "/vendor/rickshaw.css", :rel => "stylesheet", :type => "text/css"}
-    %link{:href => "/vendor/font-awesome/css/font-awesome.css", :rel => "stylesheet", :type => "text/css"}
-    %link{:href => "/fnordmetric.css", :rel => "stylesheet", :type => "text/css"}
+    %script{:src => "/fnordmetric-ui.js", :type => "text/javascript"}
+    %link{:href => "/fnordmetric-ui.css", :rel => "stylesheet", :type => "text/css"}
+    %script{:src => "/fnordmetric-core.js", :type => "text/javascript"}
+    %link{:href => "/fnordmetric-core.css", :rel => "stylesheet", :type => "text/css"}
 
   %body
     #app.clearfix(style="overflow:hidden;")

data/web/js/fnordmetric.bars_widget.js

@@ -98,9 +98,9 @@ FnordMetric.widgets.barsWidget = function(){
         });
       }
 
-      graph = new Rickshaw.Graph(gconfig);
+      graph = new FnordMetric.rickshaw.Graph(gconfig);
 
-      new Rickshaw.Graph.Axis.Y({
+      new FnordMetric.rickshaw.Graph.Axis.Y({
         graph: graph,
       }).render();
 
@@ -111,7 +111,7 @@ FnordMetric.widgets.barsWidget = function(){
 
     function announce(evt){
       if(evt.widget_key == opts.widget_key){
-        if((evt.class == "widget_response") && (evt.cmd == "values_for")){
+        if((evt.type == "widget_response") && (evt.cmd == "values_for")){
           running_request = false;
           $(opts.elem).css('opacity', 1); 
           values = evt.values;