Commit 8ae1c9eb authored by Paul Asmuth's avatar Paul Asmuth
Browse files

Merge branch 'master' of github.com:paulasmuth/fnordmetric

parents b9217c26 335c65e0
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -285,6 +285,9 @@ Contributors

+ Simon Menke (http://github.com/fd)
+ Bruno Michel (http://github.com/nono)
+ Marco Borromeo (http://github.com/mborromeo)
+ Leo Lou (http://github.com/l4u)
+ Andy Lindeman (http://github.com/alindeman)

To contribute, please fork this repository, make your changes and run the specs, commit them to your github repository and send me a pull request.

@@ -317,9 +320,8 @@ Todos
* funnel-widget
* combine/calculation gauges via opts_gauge({}, &block) (+calculate ctr)
* timeline_widget: 'compare mode': compate gauge to yesterday
* fix include_current
* numbers_widget: handle decreasing vals
* make redis-addr and redis-prefix + listen-ports configurable
* make listen-ports configurable
* referal tracking fu (parse googlequeries)  
* trend detection
* opt_event options: :increment => gauge_name
+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@
      FnordMetric.p = '#{path_prefix}';

  %body
    .topbar
    .topbar{:class => namespaces.count > 1 ? 'shown' : 'hidden'}
      %ul
        -namespaces.each do |key,namespace|
          %li{:class => namespace.token == current_namespace.token ? 'active' : nil}
@@ -48,6 +48,7 @@

    $('#tabs li.sessions').click(function(){
      FnordMetric.renderSessionView();
      window.location.hash = '';
    });

    $('#tabs li').click(function(){
+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ module FnordMetric
  
  def self.default_options(opts)

    opts[:redis_uri] = "redis://localhost:6379"
    opts[:redis_url] ||= "redis://localhost:6379"
    opts[:redis_prefix] ||= "fnordmetric"            

    opts[:inbound_stream] ||= ["0.0.0.0", "1337"]
+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ class FnordMetric::App < Sinatra::Base

  def initialize(namespaces, opts)
    @namespaces = {}
    @redis = Redis.new
    @redis = Redis.connect(:url => opts[:redis_url])
    @opts = opts
    namespaces.each do |key, block|
      @namespaces[key] = FnordMetric::Namespace.new(key, opts.clone)
+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ class FnordMetric::InboundStream < EventMachine::Connection
  end

  def post_init
    @redis = Redis.new
    @redis = Redis.connect(:url => opts[:redis_url])
    @events_buffered = 0
    @streaming = true
    @buffer = ""
Loading