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

Correctly handle empty data set in the console view (#3521) 

When there is an empty result set, the Prometheus server replies with

{"status":"success","data":{"resultType":"vector","result":null}}

That "null" reply was not handled correctly by the graphing library.
This commit handles that case and shows "no data" in the UI console view
instead of throwing an error in the browser javascript console.

Fixes #3515

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
This commit is contained in:
Julien Pivotto 2017-11-30 11:04:02 +01:00 committed by Brian Brazil
parent b3ff5f6b0e
commit 52c0121890
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/ui/bindata.go
View File

@ -465,7 +465,7 @@ func webUiStaticJsGraphJs() (*asset, error) {
return nil, err return nil, err
} }
info := bindataFileInfo{name: "web/ui/static/js/graph.js", size: 29862, mode: os.FileMode(420), modTime: time.Unix(1511639377, 0)} info := bindataFileInfo{name: "web/ui/static/js/graph.js", size: 29928, mode: os.FileMode(420), modTime: time.Unix(1512035831, 0)}
a := &asset{bytes: bytes, info: info} a := &asset{bytes: bytes, info: info}
return a, nil return a, nil
} }

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

@ -451,7 +451,7 @@ Prometheus.Graph.prototype.submitQuery = function() {
if (xhr.responseJSON.data !== undefined) { if (xhr.responseJSON.data !== undefined) {
if (xhr.responseJSON.data.resultType === "scalar") { if (xhr.responseJSON.data.resultType === "scalar") {
totalTimeSeries = 1; totalTimeSeries = 1;
} else { } else if(xhr.responseJSON.data.result !== null) {
totalTimeSeries = xhr.responseJSON.data.result.length; totalTimeSeries = xhr.responseJSON.data.result.length;
} }
} }
@ -720,7 +720,7 @@ Prometheus.Graph.prototype.handleConsoleResponse = function(data, textStatus) {
switch(data.resultType) { switch(data.resultType) {
case "vector": case "vector":
if (data.result.length === 0) { if (data.result === null || data.result.length === 0) {
tBody.append("<tr><td colspan='2'><i>no data</i></td></tr>"); tBody.append("<tr><td colspan='2'><i>no data</i></td></tr>");
return; return;
} }