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

ui: handle null response properly (#6071)

Browse Source 
* web/ui: handle null case

The call might sometimes return /api/v1/label/__name__/values the
following:

```
{"status":"success","data":null}
```

Then the `index.js` file assumes that `data` is not `null`. However,
that assumption fails and then we get this error in the console:

```
graph.js?v=foo:317 Uncaught TypeError: Cannot read property 'length' of null
    at Object.success (graph.js?v=foo:317)
...
```

Then it becomes impossible to, for example, send a simple query like
`time()` and graph the results.

Fix it by using an empty array as the result if it is `null`.

Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com>

* ui: update static assets data

Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com>
This commit is contained in:
Giedrius Statkevičius 2019-10-09 04:52:12 +03:00 committed by Chris Marchbanks
parent 84ff928606
commit ad58fc4765
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/ui/assets_vfsdata.go
View File

File diff suppressed because one or more lines are too long

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

@ -271,7 +271,7 @@ Prometheus.Graph.prototype.populateInsertableMetrics = function() {
return; return;
} }
pageConfig.allMetrics = json.data; // todo: do we need self.allMetrics? Or can it just live on the page pageConfig.allMetrics = json.data || []; // todo: do we need self.allMetrics? Or can it just live on the page
for (var i = 0; i < pageConfig.allMetrics.length; i++) { for (var i = 0; i < pageConfig.allMetrics.length; i++) {
self.insertMetric[0].options.add(new Option(pageConfig.allMetrics[i], pageConfig.allMetrics[i])); self.insertMetric[0].options.add(new Option(pageConfig.allMetrics[i], pageConfig.allMetrics[i]));
} }