fix gauge titles (efbce9ef) · Commits · github_fork / Clip

lib/fnordmetric/widgets/numbers_widget.rb

+2 −1

Original line number	Diff line number	Diff line
		@@ -44,6 +44,7 @@ class FnordMetric::NumbersWidget < FnordMetric::Widget
		def data
		super.merge(
		:series => gauges.map(&:name),
		:series_titles => gauges.map(&:title),
		:offsets => (@opts[:offsets] \|\| [0, 1, "s30"]),
		:autoupdate => (@opts[:autoupdate] \|\| 60)
		)

+8 −6

Original line number	Diff line number	Diff line
		@@ -5,8 +5,9 @@ class FnordMetric::TimeseriesWidget < FnordMetric::Widget
		{
		:cmd => :values_at,
		:gauges => event["gauges"].map{ \|gkey\|
		vals = namespace.gauges[gkey.to_sym].values_in(event["since"]..event["until"])
		{ :key => gkey, :vals => vals }
		_gauge = namespace.gauges[gkey.to_sym]
		vals = _gauge.values_in(event["since"]..event["until"])
		{ :key => gkey, :vals => vals, :title => _gauge.title }
		}
		}
		end
		@@ -39,6 +40,7 @@ class FnordMetric::TimeseriesWidget < FnordMetric::Widget
		gauges.map do \|gauge\|
		{
		:name => gauge.name,
		:title => gauge.title,
		:data => [{:x => ticks.first, :y => 0}],
		:color => colors.unshift(colors.pop).first
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,6 @@ Todos
		=====

		→ bugfix: widgets w/o gauges
		→ bugfix: gauge titles
		→ fancy topbar daterange picker for legacy dashboards
		→ exceptions gauge
		→ option to turn off per-widget daterangepicker (makes them smaller)
		@@ -19,3 +18,4 @@ Done
		→ added :scale_by option for gauges
		→ added fyrehose acceptor
		→ explicit dashboard initialization with options -> dashboard grouping
		→ bugfix: gauge titles

+2 −6

Original line number	Diff line number	Diff line
		@@ -15,19 +15,15 @@ FnordMetric.widgets.numbersWidget = function(){
		});

		if(!opts.series_titles){
		opts.series_titles = {};
		opts.series_titles = opts.series;
		}

		for(k in opts.series){

		if (!opts.series_titles[opts.series[k]]){
		opts.series_titles[opts.series[k]] = opts.series[k];
		}

		var container = $('<div></div>')
		.addClass('numbers_container')
		.attr('rel', opts.series[k])
		.append($('<div class="title">').html(opts.series_titles[opts.series[k]]));
		.append($('<div class="title">').html(opts.series_titles[k]));

		opts.elem.append(container);
		}

+11 −11

Original line number	Diff line number	Diff line
		@@ -319,7 +319,7 @@ FnordMetric.widgets.timeseriesWidget = function(){
		for(var ind = 0; ind < dgauges.length; ind++){

		gconfig.series.push({
		name: dgauges[ind].key,
		name: dgauges[ind].title,
		color: opts.series[ind].color,
		data: []
		});

+1 −1

File changed.

Contains only whitespace changes.