enable count in singlemetricview (b290ad69) · Commits · github_fork / Clip

fnordmetric-webui/fnordmetric-webui-layout.js

+0 −1

Original line number	Diff line number	Diff line
		@@ -86,7 +86,6 @@ FnordMetric.WebUI = function() {
		};

		function openUrl(raw_url, push_state) {
		console.log(raw_url);
		var url = FnordMetric.util.parseQueryString(raw_url);
		var query_params = url["query_params"];

+3 −2

Original line number	Diff line number	Diff line
		@@ -45,9 +45,11 @@ FnordMetric.util.MetricPreviewWidget = function(viewport, metric) {
		}

		function runQuery(querystr) {
		console.log("run query");
		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]);
		}
		@@ -169,8 +171,7 @@ FnordMetric.util.MetricPreviewWidget = function(viewport, metric) {
		aggr_group.appendChild(aggr_step);
		aggregate_options.map(function(opt) {
		var option = document.createElement("option");
		option.innerHTML = opt[0];
		option.setAttribute("id", opt[1]);
		option.innerHTML = opt;
		aggr_step.appendChild(option);
		});

+3 −2

Original line number	Diff line number	Diff line
		@@ -416,7 +416,7 @@ FnordMetric.util.createQuery = function(inputs, metric) {
		hasAggr = false;
		} else {
		hasAggr = true;
		show = (inputs.show + "(value) as y");
		show = ((inputs.show).toLowerCase() + "(value) as y");
		}

		query += draw + select + show + from;
		@@ -444,7 +444,7 @@ FnordMetric.util.createQuery = function(inputs, metric) {
		if (inputs.aggregation.time != null &&
		inputs.aggregation.step != null) {
		timewindow =
		" GROUP OVER TIMEWINDOW(" +
		" GROUP OVER TIMEWINDOW(time, " +
		inputs.aggregation.time + ", " +
		inputs.aggregation.step + ")";

		@@ -464,6 +464,7 @@ FnordMetric.util.createQuery = function(inputs, metric) {
		}

		query += ";";
		console.log(query);
		return query;
		}