Skip to content

N
nexpie-grafana-theme
Commit 63fa9f45 by Torkel Ödegaard
Options

InfluxDB: Fix handling of empty array in templating variable query, Fixes #1298

parent d4c3463f
Showing with 5 additions and 0 deletions
CHANGELOG.md
...@@ -4,6 +4,9 @@ ...@@ -4,6 +4,9 @@
- [Issue #1297](https://github.com/grafana/grafana/issues/1297). Graphite: Added cumulative and minimumBelow graphite functions - [Issue #1297](https://github.com/grafana/grafana/issues/1297). Graphite: Added cumulative and minimumBelow graphite functions
- [Issue #1296](https://github.com/grafana/grafana/issues/1296). InfluxDB: Auto escape column names with special characters. Thanks @steven-aerts - [Issue #1296](https://github.com/grafana/grafana/issues/1296). InfluxDB: Auto escape column names with special characters. Thanks @steven-aerts
**Fixes**
- [Issue #1298](https://github.com/grafana/grafana/issues/1298). InfluxDB: Fix handling of empty array in templating variable query
# 1.9.1 (2014-12-29) # 1.9.1 (2014-12-29)
**Enhancements** **Enhancements**
......
src/app/features/influxdb/datasource.js
...@@ -117,6 +117,8 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) { ...@@ -117,6 +117,8 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) {
return this._seriesQuery(interpolated) return this._seriesQuery(interpolated)
.then(function (results) { .then(function (results) {
if (!results || results.length === 0) { return []; }
return _.map(results[0].points, function (metric) { return _.map(results[0].points, function (metric) {
return { return {
text: metric[1], text: metric[1],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment