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

Update example console templates to new HTTP API. 

Fixes #1819
This commit is contained in:
Brian Brazil 2016-07-18 20:28:21 +01:00
parent 6f19e418e1
commit d458ecd4b9
2 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
web/ui/bindata.go
View File

File diff suppressed because one or more lines are too long

16
web/ui/static/js/prom_console.js
View File

@ -438,11 +438,11 @@ PromConsole.Graph.prototype._render = function(data) {
// Get the data into the right format. // Get the data into the right format.
var seriesLen = 0; var seriesLen = 0;
for (var e = 0; e < data.length; e++) { for (var e = 0; e < data.length; e++) {
for (var i = 0; i < data[e].value.length; i++) { for (var i = 0; i < data[e].data.result.length; i++) {
series[seriesLen++] = { series[seriesLen++] = {
data: data[e].value[i].values.map(function(s) { return {x: s[0], y: self._parseValue(s[1])}; }), data: data[e].data.result[i].values.map(function(s) { return {x: s[0], y: self._parseValue(s[1])}; }),
color: palette.color(), color: palette.color(),
name: self._escapeHTML(nameFuncs[e](data[e].value[i].metric)), name: self._escapeHTML(nameFuncs[e](data[e].data.result[i].metric)),
}; };
} }
} }
@ -519,9 +519,9 @@ PromConsole.Graph.prototype.dispatch = function() {
var pending_requests = this.params.expr.length; var pending_requests = this.params.expr.length;
for (var i = 0; i < this.params.expr.length; ++i) { for (var i = 0; i < this.params.expr.length; ++i) {
var endTime = this.params.endTime; var endTime = this.params.endTime;
var url = PATH_PREFIX + "/api/query_range?expr=" + encodeURIComponent(this.params.expr[i]) + var url = PATH_PREFIX + "/api/v1/query_range?query=" + encodeURIComponent(this.params.expr[i]) +
"&step=" + this.params.duration / this.graphTd.offsetWidth + "&step=" + this.params.duration / this.graphTd.offsetWidth +
"&range=" + this.params.duration + "&end=" + endTime; "&start=" + (endTime - this.params.duration) + "&end=" + endTime;
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.open('get', url, true); xhr.open('get', url, true);
xhr.responseType = 'json'; xhr.responseType = 'json';
@ -596,12 +596,12 @@ PromConsole._chooseNameFunction = function(data) {
// If only one label varies, use that value. // If only one label varies, use that value.
var labelValues = {}; var labelValues = {};
for (var e = 0; e < data.length; e++) { for (var e = 0; e < data.length; e++) {
for (var i = 0; i < data[e].value.length; i++) { for (var i = 0; i < data[e].data.result.length; i++) {
for (var label in data[e].value[i].metric) { for (var label in data[e].data.result[i].metric) {
if (!(label in labelValues)) { if (!(label in labelValues)) {
labelValues[label] = {}; labelValues[label] = {};
} }
labelValues[label][data[e].value[i].metric[label]] = 1; labelValues[label][data[e].data.result[i].metric[label]] = 1;
} }
} }
} }