fnordmetric-ui: implemented data-since and data-until for timeseries widget (5e938c21) · Commits · github_fork / Clip

fnordmetric-core/lib/fnordmetric/widgets/timeseries_widget.rb

+5 −2

Original line number	Diff line number	Diff line
		class FnordMetric::TimeseriesWidget < FnordMetric::Widget

		def self.execute(namespace, event)
		puts event.inspect
		resp = if event["cmd"] == "values_at"
		{
		:cmd => :values_at,
		@@ -10,7 +9,11 @@ class FnordMetric::TimeseriesWidget < FnordMetric::Widget
		unless _gauge
		return { :error => "gauge not found: #{gkey}" }
		end
		vals = _gauge.values_in(event["since"]..event["until"])

		t_since = FnordMetric::Util.parse_time(event["since"].to_s)
		t_until = FnordMetric::Util.parse_time(event["until"].to_s)

		vals = _gauge.values_in(t_since..t_until)
		{ :key => gkey, :vals => vals, :title => _gauge.title }
		}
		}

+8 −2

Original line number	Diff line number	Diff line
		@@ -25,6 +25,12 @@ FnordMetric.widgets.timeseries = function(elem){
		if (!elem.attr('data-gauges'))
		return console.log("[FnordMetric] element is missing the data-gauges attribute");

		if (!elem.attr('data-since'))
		return console.log("[FnordMetric] element is missing the data-since attribute");

		if (!elem.attr('data-until'))
		return console.log("[FnordMetric] element is missing the data-since attribute");

		gauges = elem.attr("data-gauges").split(",");

		if (elem.attr('data-colors'))
		@@ -178,8 +184,8 @@ FnordMetric.widgets.timeseries = function(elem){
		"gauges": gauges,
		"cmd": "values_at",
		"tick": 30,
		"since": (((new Date()).getTime() / 1000)- 3600),
		"until": ((new Date()).getTime() / 1000),
		"since": elem.attr("data-since"),
		"until": elem.attr("data-until"),
		"widget_key": widget_key
		});
		}

+10 −2

Original line number	Diff line number	Diff line
		@@ -53,7 +53,8 @@
		data-fnordmetric="timeseries"
		data-chart-style="line"
		data-height="400"
		data-time-range="16000"
		data-since="-1h"
		data-until="now"
		data-autoupdate="10"
		data-gauges="identity_requests_per_second"
		style="width:900px; "></div>
		@@ -62,7 +63,8 @@
		data-fnordmetric="timeseries"
		data-chart-style="line"
		data-height="240"
		data-time-range="16000"
		data-since="-4h"
		data-until="now"
		data-legend="off"
		data-autoupdate="10"
		data-gauges="order_sum"
		@@ -73,6 +75,8 @@
		data-chart-style="area"
		data-height="240"
		data-autoupdate="10"
		data-since="-1h"
		data-until="now"
		data-gauges="user_logins,user_logins_failed"
		data-colors="#00ff00,#ff0000"
		style="width:600px; "></div>
		@@ -82,6 +86,8 @@
		data-chart-style="area"
		data-height="240"
		data-autoupdate="10"
		data-since="-2h"
		data-until="now"
		data-gauges="user_logins,user_logins_failed"
		style=""></div>

		@@ -91,6 +97,8 @@
		data-height="300"
		data-autoupdate="10"
		data-gauges="useronline_total"
		data-since="-15minutes"
		data-until="now"
		style="width:600px; "></div>

		<script>