Merge remote-tracking branch 'laura/adminui_testing' (1d2e108e) · Commits · github_fork / Clip

fnordmetric-webui/.gitignore

+1 −0

Original line number	Diff line number	Diff line
		fnordmetric-webui.js
		tests/

fnordmetric-webui/fnordmetric-webui-datepicker.js

+15 −5

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@ if (FnordMetric.views === undefined) {
		}

		/* generate html for time input and handle input */
		FnordMetric.util.timeInput = function(selectedTimestamp, elem) {
		FnordMetric.util.timeInput = function(selectedTimestamp, elem, callback) {
		var selectedMinutes =
		FnordMetric.util.appendLeadingZero(
		selectedTimestamp.getMinutes());
		@@ -45,13 +45,14 @@ FnordMetric.util.timeInput = function(selectedTimestamp, elem) {

		hour_input.addEventListener('focus', function(e) {
		e.preventDefault();
		FnordMetric.util.validatedTimeInput(this, "hour");
		FnordMetric.util.validatedTimeInput(this, "hour", callback);
		}, false);

		minute_input.addEventListener('focus', function(e) {
		e.preventDefault();
		FnordMetric.util.validatedTimeInput(this, "minute");
		FnordMetric.util.validatedTimeInput(this, "minute", callback);
		}, false);

		}

		function getValues() {
		@@ -67,7 +68,7 @@ FnordMetric.util.timeInput = function(selectedTimestamp, elem) {

		return {
		"render" : render,
		"getValues" : getValues
		"getValues" : getValues,
		}
		}

		@@ -146,7 +147,15 @@ FnordMetric.util.DatePicker = function(elem, dp_input, viewport, callback) {
		return name;
		}


		function onSelect(date, month, year) {
		/* fallback for time inputs */
		var date = (date == undefined) ?
		selectedDate : date;
		var month = (month == undefined)?
		selectedMonth : month;
		var year = (year == undefined) ?
		selectedYear : year;
		var inputs = timeInput.getValues();
		var hours = inputs.hours;
		var minutes = inputs.minutes;
		@@ -297,7 +306,8 @@ FnordMetric.util.DatePicker = function(elem, dp_input, viewport, callback) {

		dp_widget.innerHTML = "";
		dp_widget.className += " active";
		timeInput = FnordMetric.util.timeInput(selectedTimestamp, dp_widget);
		timeInput = FnordMetric.util.timeInput(
		selectedTimestamp, dp_widget, onSelect);
		timeInput.render();
		renderCalendar(currYear, currMonth);
		}

fnordmetric-webui/fnordmetric-webui-metriclist.js

+1 −2

Original line number	Diff line number	Diff line
		@@ -79,8 +79,7 @@ FnordMetric.views.MetricList = function() {
		for (i in metrics) {
		table_view.addRow([
		metrics[i]["key"],
		FnordMetric.util.convertArrayToString(
		metrics[i]["labels"]),
		metrics[i]["labels"].join(", "),
		FnordMetric.util.parseTimestamp(
		metrics[i]["last_insert"]),
		metrics[i]["total_bytes"]]);

fnordmetric-webui/fnordmetric-webui-metricpreviewwidget.js

+19 −13

Original line number	Diff line number	Diff line
		@@ -56,12 +56,16 @@ FnordMetric.util.MetricPreviewWidget = function(viewport, query_params) {

		/* checks if required url params are misssing and adds those if so */
		function addRequiredURLParamsForView(value) {
		if (value == "count" \|\| value == "sum" \|\| value == "mean") {
		if (value == "count" \|\|
		value == "sum" \|\|
		value == "mean" \|\|
		value == "min" \|\|
		value == "max") {

		var time_step = query_params.t_step;
		if (time_step == undefined) {
		time_step = defaults.t_step;
		updateURLParams("t_step", time_step);
		var time_window = query_params.t_window;
		if (time_window == undefined) {
		time_window = defaults.t_window;
		updateURLParams("t_window", time_window);
		}
		}
		var group_by = query_params.by;
		@@ -456,10 +460,10 @@ FnordMetric.util.MetricPreviewWidget = function(viewport, query_params) {

		prev_timespan.addEventListener('click', function(e) {
		e.preventDefault();
		var end = end_time;
		end_time = start_time;
		var diff = end - start_time;
		start_time = start_time - diff;
		var end = query_params.end_time;
		end_time = query_params.start_time;
		var diff = end - query_params.start_time;
		start_time = query_params.start_time - diff;
		updateURLParams("end_time", end_time);
		updateURLParams("start_time", start_time);
		updateDateTimeElems(
		@@ -469,11 +473,13 @@ FnordMetric.util.MetricPreviewWidget = function(viewport, query_params) {

		next_timespan.addEventListener('click', function(e) {
		e.preventDefault();
		var start = start_time;
		var end = parseInt(end_time ,10) + (end_time - start);
		var start = query_params.start_time;
		var end =
		parseInt(query_params.end_time ,10) +
		(query_params.end_time - start);

		if (end <= now) {
		start_time = end_time;
		start_time = query_params.end_time;
		end_time = end;
		updateURLParams("start_time", start_time);
		updateURLParams("end_time", end_time);

fnordmetric-webui/fnordmetric-webui-unittests.js

0 → 100644

+221 −0

Original line number	Diff line number	Diff line
		/**
		* This file is part of the "FnordMetric" project
		* Copyright (c) 2014 Laura Schlimmer
		* Copyright (c) 2014 Paul Asmuth, Google Inc.
		*
		* FnordMetric is free software: you can redistribute it and/or modify it under
		* the terms of the GNU General Public License v3.0. You should have received a
		* copy of the GNU General Public License along with this program. If not, see
		* <http://www.gnu.org/licenses/>.
		*/
		if (FnordMetric === undefined) {
		FnordMetric = {};
		}

		if (FnordMetric.util === undefined) {
		FnordMetric.util = {};
		}

		/* Unit Tests for FnordMetric.util functions */
		FnordMetric.UnitTests = function() {
		console.log("make unit tests");
		var results = {
		total : 0,
		bad : 0
		}

		var testParseQueryString = function() {
		function test(querystr, expected) {
		results.total++;
		var result = FnordMetric.util.parseQueryString(querystr);
		result = JSON.stringify(result);
		expected = JSON.stringify(expected);
		if (result != expected) {
		results.bad++;
		console.log("Testing parseQueryString expected "
		+ expected + ", but was " + result);
		}
		}
		test("metric_list?metric=/osx/load_avg_15m&view=value",
		{path : "metric_list",
		query_params : {
		innerView : "metric",
		innerViewValue : "/osx/load_avg_15m",
		view : "value"}});

		test("metric_list", {path : "metric_list", query_params : {}});
		test("query_playground?sql_query=select%20*%20from%20http_status_codes%3B",
		{path : "query_playground",
		query_params : {
		innerView : "sql_query",
		innerViewValue : decodeURIComponent("select%20*%20from%20http_status_codes%3B")}});
		test("", {path : "", query_params: {}});
		test("undefined", {path: "", query_params:{}});
		}();

		var testSetUrlQueryString = function() {
		function test(hash, query_params, encode, push_state, expected) {
		results.total++;
		FnordMetric.util.setURLQueryString(hash, query_params, encode, push_state);
		var result = window.location.hash;
		if (result != expected) {
		results.bad++;
		console.log("Testing setURLQueryString expected "
		+ expected + ", but was " + result);
		}
		}
		test("metric_list", {}, false, false, "#metric_list");
		test(undefined,
		{innerView : "metric",
		innerViewValue : "http_status_codes"},
		false,
		false,
		"");

		test("metric_list",
		{innerView : undefined,
		innerViewValue : "http_status_codes"},
		false,
		false,
		"#metric_list");

		test("query_playground",
		{innerView : "sql_query",
		innerViewValue : "SELECT * FROM `http_status_codes`;"},
		true,
		true,
		"#query_playground?sql_query=SELECT%20*%20FROM%20%60http_status_codes%60%3B");
		test("", {}, false, false, "");
		}();

		var testParseTimestamp = function() {
		function test(timestamp, expected) {
		results.total++;
		var result = FnordMetric.util.parseTimestamp(timestamp);
		if (result.substr(0,13) != expected) {
		results.bad++;
		console.log("Testing parseTimestamp expected " +
		expected + ", but was " + result.substr(0,12));
		}
		}
		var now = Date.now();
		test(now, "0 seconds ago");
		test(now *1000, "0 seconds ago")
		test(Math.floor(now / 1000), "0 seconds ago");
		}();

		var testSortMetricList = function() {
		function test(metrics, column_index, order, expected) {
		results.total++;
		FnordMetric.util.sortMetricList(metrics, column_index, order);
		var result = metrics;
		if (result[0][column_index] != expected[0][column_index]) {
		results.bad++;
		console.log("Testing sortMetricList expected "
		+ expected[0][column_index] + ", but was " + result[0][column_index]);
		}
		}
		var metric1 = [
		"/osx/load_avg_15m", "host", "5 hours ago - Nov 18 2014 11:33:11", 10693668];
		var metric2 = [
		"/osx/load_avg_5m", "", "5 hours ago - Nov 18 2014 11:33:12", 10693669];

		test([metric1, metric2], 0, "asc", [metric1, metric2]);
		test([metric1, metric2], 0, "desc", [metric2, metric1]);
		test([metric1, metric1], 0, "asc", [metric1, metric1]);
		test([metric1, metric2], 2, "desc", [metric2, metric1]);
		test([metric1, metric2], 2, "asc", [metric1, metric2]);
		test([metric1, metric2], 1, "desc", [metric1, metric2]);

		}();

		var testSearchMetricList = function() {
		function test(metrics, search_item, expected) {
		results.total++;
		var result = FnordMetric.util.searchMetricList(metrics, search_item);
		for (var i = 0; i < result.length; i++) {
		if (JSON.stringify(result[i]) != JSON.stringify(expected[i])) {
		results.bad++;
		console.log("Testing setURLQueryString expected "
		+ expected[i] + ", but was " + result[i]);
		}
		}
		}
		var m1 = {key : "/osx/load_avg_15m", labels : "", last_insert : 123};
		var m2 = {key : "/osx/load 15m", labels : "" };
		var m3 = {key : undefined, labels : ""};
		var metrics = [m1, m2, m3];

		test(metrics, "15", [m1, m2]);
		test(metrics, 15, [m1, m2]);

		}();

		var testGenerateSQLQueryFromParams = function() {
		function test(params, expected) {
		var result = FnordMetric.util.generateSQLQueryFromParams(params);
		result = result.replace(/(\n\r\|\n\|\r\|\s)/gm, "");
		if (result != expected) {
		results.bad++;
		console.log("Testing generateSQLQueryFromParams expected "
		+ expected + ", but was " + result);
		}
		}
		// test XDOMAIN and WHERE clause
		test(
		{innerView : "metric",
		innerViewValue : "status_codes",
		view : "value",
		by : "host",
		columns : "host",
		end_time : "1416263880000",
		start_time : "1416260280000"},
		"DRAWLINECHARTXDOMAINFROM_TIMESTAMP(1416260280),FROM_TIMESTAMP(1416263880)" +
		"AXISBOTTOMAXISLEFTLEGENDTOPRIGHTINSIDE;SELECTtimeASx,valueASy,hostASseriesFROM`status_codes`" +
		"WHEREtime>FROM_TIMESTAMP(1416260280)ANDtime<FROM_TIMESTAMP(1416263880);");

		// test rollup without columns
		test(
		{innerViewValue : "status_codes",
		view : "rollup_mean"},
		"DRAWBARCHARTAXISBOTTOMAXISLEFTLEGENDTOPRIGHTINSIDE;SELECT'total'ASX,mean(value)ASYFROM`status_codes`;");

		// test rollup with one column
		test(
		{innerViewValue : "status_codes",
		view : "rollup_count",
		columns : "host"},
		"DRAWBARCHARTAXISBOTTOMAXISLEFTLEGENDTOPRIGHTINSIDE;SELECT`host`ASX,count(value)ASYFROM`status_codes`;");

		// test rollup with multiple columns
		test(
		{innerViewValue : "status_codes",
		view : "rollup_sum",
		columns : "host,server"},
		"DRAWBARCHARTAXISBOTTOMAXISLEFTLEGENDTOPRIGHTINSIDE;SELECT`host`ASX,sum(value)ASYFROM`status_codes`;");

		// test GROUP OVER timewindow with window and step
		test(
		{innerViewValue : "status_codes",
		view : "max",
		by : "host",
		t_step : "20000",
		t_window : "5000"},
		"DRAWLINECHARTAXISBOTTOMAXISLEFTLEGENDTOPRIGHTINSIDE;SELECTtimeASx,max(value)ASY,hostASseriesFROM`status_codes`GROUPOVERTIMEWINDOW(time,5,20)BYhost;");

		// test GROUP OVER TIMEWINDO with window only and without BY stm
		test(
		{innerViewValue : "status_codes",
		view : "min",
		t_window : "5000"},
		"DRAWLINECHARTAXISBOTTOMAXISLEFTLEGENDTOPRIGHTINSIDE;SELECTtimeASx,min(value)ASYFROM`status_codes`GROUPOVERTIMEWINDOW(time,5,5);");


		}();
		if (results.bad == 0) {
		console.log("Yeah, all " + results.total + " tests passed :-) ");
		} else {
		console.log(results.bad + " tests of " + results.totak + " failed.");
		}

		}

Admin message