achieved basic backwards compatibilitiy (b4f0917b) · Commits · github_fork / Clip

haml/app.haml

0 → 100644

+35 −0

Original line number	Diff line number	Diff line
		!!!
		%html
		%head
		%title FnordMetric
		%script{:src => "vendor/jquery-1.6.1.min.js", :type => "text/javascript"}
		%script{:src => "vendor/highcharts.js", :type => "text/javascript"}
		%script{:src => "vendor/raphael.min.js", :type => "text/javascript"}
		%script{:src => "vendor/raphael.util.js", :type => "text/javascript"}
		%script{:src => "vendor/d3.v2.js", :type => "text/javascript"}
		%script{:src => "fnordmetric.js", :type => "text/javascript"}
		%script{:src => "fnordmetric.util.js", :type => "text/javascript"}
		%script{:src => "fnordmetric.ui.js", :type => "text/javascript"}
		%script{:src => "fnordmetric.timeline_widget.js", :type => "text/javascript"}
		%script{:src => "fnordmetric.numbers_widget.js", :type => "text/javascript"}
		%script{:src => "fnordmetric.bars_widget.js", :type => "text/javascript"}
		%script{:src => "fnordmetric.pie_widget.js", :type => "text/javascript"}
		%script{:src => "fnordmetric.toplist_widget.js", :type => "text/javascript"}
		%script{:src => "fnordmetric.html_widget.js", :type => "text/javascript"}
		%script{:src => "fnordmetric.realtime_value_widget.js", :type => "text/javascript"}
		%script{:src => "fnordmetric.overview_view.js", :type => "text/javascript"}
		%script{:src => "fnordmetric.gauge_view.js", :type => "text/javascript"}
		%script{:src => "fnordmetric.dashboard_view.js", :type => "text/javascript"}
		%script{:src => "fnordmetric.session_view.js", :type => "text/javascript"}
		%link{:href => "fnordmetric.css", :rel => "stylesheet", :type => "text/css"}
		%body
		:javascript
		//
		$(document).ready(function(){
		window.setTimeout(function(){
		console.log(1);
		FnordMetric.renderDashboard('TrafficChannels');
		}, 300);
		FnordMetric.init($('body'), '#{current_namespace.token}', 'ws://localhost:4243');
		});
		//
		No newline at end of file

lib/fnordmetric.rb

+10 −7

Original line number	Diff line number	Diff line
		@@ -123,7 +123,10 @@ end
		require "fnordmetric/remote_gauge"
		require "fnordmetric/multi_gauge"
		require "fnordmetric/event_handler"

		require "fnordmetric/gauge_calculations"
		require "fnordmetric/gauge_modifiers"
		require "fnordmetric/gauge"
		require "fnordmetric/context"

		require "fnordmetric/backends/redis_backend"
		require "fnordmetric/backends/memory_backend"
		@@ -132,6 +135,9 @@ require "fnordmetric/acceptors/acceptor"
		require "fnordmetric/acceptors/tcp_acceptor"
		require "fnordmetric/acceptors/udp_acceptor"




		require "fnordmetric/gauges/dummy_gauge"
		require "fnordmetric/gauges/numeric_gauge"
		require "fnordmetric/gauges/realtime_gauge"
		@@ -141,9 +147,6 @@ require "fnordmetric/widgets/timeline_widget"
		require "fnordmetric/widgets/numbers_widget"
		require "fnordmetric/widgets/realtime_value_widget"

		require "fnordmetric/metrics/redis_metric_calculations"
		require "fnordmetric/metrics/redis_metric_modifiers"
		require "fnordmetric/metrics/redis_metric"

		require "fnordmetric/web/web"
		require "fnordmetric/web/namespace"
		@@ -164,9 +167,9 @@ require "fnordmetric/logger"

		# require "fnordmetric/"
		# require "fnordmetric/numbers_widget"
		# require "fnordmetric/bars_widget"
		# require "fnordmetric/toplist_widget"
		# require "fnordmetric/pie_widget"
		require "fnordmetric/bars_widget"
		require "fnordmetric/toplist_widget"
		require "fnordmetric/pie_widget"
		# require "fnordmetric/html_widget"

		# require "fnordmetric/namespace"

lib/fnordmetric/metrics/redis_metric.rb→lib/fnordmetric/gauge.rb

+3 −3

Original line number	Diff line number	Diff line
		class FnordMetric::RedisMetric
		class FnordMetric::Gauge

		include FnordMetric::RedisMetricCalculations
		include FnordMetric::RedisMetricModifiers
		include FnordMetric::GaugeCalculations
		include FnordMetric::GaugeModifiers

		def initialize(opts)
		opts.fetch(:key) && opts.fetch(:key_prefix)

lib/fnordmetric/metrics/redis_metric_calculations.rb→lib/fnordmetric/gauge_calculations.rb

+1 −1

Original line number	Diff line number	Diff line
		module FnordMetric::RedisMetricCalculations
		module FnordMetric::GaugeCalculations

		@@avg_per_session_proc = proc{ \|_v, _t\|
		(_v.to_f / (sync_redis.get(tick_key(_t, :"sessions-count"))\|\|1).to_i)

lib/fnordmetric/metrics/redis_metric_modifiers.rb→lib/fnordmetric/gauge_modifiers.rb

+1 −1

Original line number	Diff line number	Diff line
		module FnordMetric::RedisMetricModifiers
		module FnordMetric::GaugeModifiers

		def incr(time, value=1)
		assure_two_dimensional!(self)

Admin message