parse human time to milli seconds (d6457c48) · Commits · github_fork / Clip

fnordmetric-webui/fnordmetric-webui-metricpreviewwidget.js

+9 −9

Original line number	Diff line number	Diff line
		@@ -49,7 +49,6 @@ FnordMetric.util.MetricPreviewWidget = function(viewport, metric) {
		FnordMetric.httpPost("/query", querystr, function(r) {
		if (r.status == 200) {
		var json = JSON.parse(r.response);
		console.log(json);
		if (json.charts != undefined) {
		renderChart(json.charts[0]);
		}
		@@ -65,8 +64,8 @@ FnordMetric.util.MetricPreviewWidget = function(viewport, metric) {
		var inputs = {
		"show" : null,
		"aggregation" : {
		"time" : null,
		"step" : null
		"time" : 1000,
		"step" : 1000
		},
		"time" : {
		"start" : null,
		@@ -82,12 +81,12 @@ FnordMetric.util.MetricPreviewWidget = function(viewport, metric) {
		}, false);

		elems.aggregation.window.addEventListener('change', function() {
		inputs.aggregation.time = this.value;
		inputs.aggregation.time = FnordMetric.util.toMilliSeconds(this.value);
		runQuery(FnordMetric.util.createQuery(inputs, metric));
		}, false);

		elems.aggregation.step.addEventListener('change', function() {
		inputs.aggregation.step = this.value;
		inputs.aggregation.step = FnordMetric.util.toMilliSeconds(this.value);
		runQuery(FnordMetric.util.createQuery(inputs, metric));
		}, false);

		@@ -175,7 +174,8 @@ FnordMetric.util.MetricPreviewWidget = function(viewport, metric) {
		aggr_group.appendChild(aggr_step);
		aggregate_options.map(function(opt) {
		var option = document.createElement("option");
		option.innerHTML = opt;
		option.innerHTML = opt[0];
		option.setAttribute("id", opt[1]);
		aggr_step.appendChild(option);
		});

		@@ -263,13 +263,13 @@ FnordMetric.util.MetricPreviewWidget = function(viewport, metric) {

		var end_time = FnordMetric.util.humanDateToMikroTS(
		datepicker.value);
		var start_time = end_time - (timespan_select.value * 1000);
		var start_time = end_time - 30000;

		runQuery(FnordMetric.util.createQuery({
		"show" : null,
		"aggregation" : {
		"time" : null,
		"step" : null
		"time" : 1000,
		"step" : 1000
		},
		"time" : {
		"start" : start_time,

fnordmetric-webui/fnordmetric-webui-util.js

+14 −1

Original line number	Diff line number	Diff line
		@@ -372,6 +372,18 @@ FnordMetric.util.filterStringArray = function(strings, filter) {
		return data;
		}

		FnordMetric.util.toMilliSeconds = function(timestr) {
		var time = timestr.split(/([a-z])/);
		var conversion = {
		"s" : 1000,
		"m" : 60000,
		"h" : 360000
		}

		var seconds = time[0] * conversion[time[1]];
		return seconds;
		}


		/*
		Inputs Object with default values
		@@ -389,6 +401,7 @@ FnordMetric.util.filterStringArray = function(strings, filter) {
		}
		*/
		FnordMetric.util.createQuery = function(inputs, metric) {
		console.log(inputs);
		var query = "";
		var timewindow = null;
		var where = null;
		@@ -427,7 +440,7 @@ FnordMetric.util.createQuery = function(inputs, metric) {

		//query += where;


		console.log("has agrr " + hasAggr);
		if (hasAggr) {
		/* group over timewindow needs a time and step info */
		if (inputs.aggregation.time != null &&

Admin message