RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-1.2'

This commit is contained in:
beorn7 2016-10-25 12:15:41 +02:00
parent 72e4f1caa3 233a25a060
commit 7e4d005ee1
2 changed files with 149 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
web/ui/bindata.go
View File

File diff suppressed because one or more lines are too long

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

@ -779,9 +779,8 @@ Prometheus.Page.QueryParamHelper.prototype.parseQueryParamsOfOneGraph = function
queryParams.forEach(function(tuple) {
var optionNameAndValue = tuple.split('=');
var optionName = optionNameAndValue[0];
var optionValue = decodeURIComponent(optionNameAndValue[1]);
optionValue = optionValue.replace(/\+/g, " "); // $.param turns spaces into pluses
var optionValue = decodeURIComponent(optionNameAndValue[1].replace(/\+/g, " "));
if (optionName == "tab") {
optionValue = parseInt(optionValue); // tab is integer