From 63fa9f453557cf4654706d79ad09ad2d6e831d61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 6 Jan 2015 17:32:39 +0100 Subject: [PATCH] InfluxDB: Fix handling of empty array in templating variable query, Fixes #1298 --- CHANGELOG.md | 3 +++ src/app/features/influxdb/datasource.js | 2 ++ 2 files changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9564f1d932d..da346aa2836 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ - [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 +**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) **Enhancements** diff --git a/src/app/features/influxdb/datasource.js b/src/app/features/influxdb/datasource.js index 3de499ff40e..cef933d8d42 100644 --- a/src/app/features/influxdb/datasource.js +++ b/src/app/features/influxdb/datasource.js @@ -117,6 +117,8 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) { return this._seriesQuery(interpolated) .then(function (results) { + if (!results || results.length === 0) { return []; } + return _.map(results[0].points, function (metric) { return { text: metric[1],