mirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-11-09 21:01:19 +01:00
Code Issues Projects Releases Wiki Activity

Parse custom step parameter correctly. (#2928)

Browse Source 
Backport of 6a767b736be5cd4ddf72a8bc6024ac8115713e7d.
Refs #2827, #2861.
This commit is contained in:
Alexey Palazhchenko 2017-07-10 22:05:40 +03:00 committed by Julius Volz
parent 3afb3fffa3
commit b6f89a1982
2 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
web/ui/bindata.go
View File

File diff suppressed because one or more lines are too long

2
web/ui/static/js/graph.js
View File

@ -364,7 +364,7 @@ Prometheus.Graph.prototype.submitQuery = function() {
var startTime = new Date().getTime(); var startTime = new Date().getTime();
var rangeSeconds = self.parseDuration(self.rangeInput.val()); var rangeSeconds = self.parseDuration(self.rangeInput.val());
var resolution = self.queryForm.find("input[name=step_input]").val() || Math.max(Math.floor(rangeSeconds / 250), 1); var resolution = parseInt(self.queryForm.find("input[name=step_input]").val()) || Math.max(Math.floor(rangeSeconds / 250), 1);
var endDate = self.getEndDate() / 1000; var endDate = self.getEndDate() / 1000;
if (self.queryXhr) { if (self.queryXhr) {