From 48686cf9f79eeda78967543be575fb9bc00f1438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 25 Aug 2015 09:11:39 +0200 Subject: [PATCH] fix(influxdb_09): fix for handling empty series object in response from influxdb, fixes #2413 --- CHANGELOG.md | 1 + public/app/plugins/datasource/influxdb/datasource.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea0f5bb7e29..176531fbf05 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ it allows you to add queries of differnet data source types & instances to the s - [Issue #1186](https://github.com/grafana/grafana/issues/1186). Time Picker: New option `today`, will set time range from midnight to now **Fixes** +- [Issue #2413](https://github.com/grafana/grafana/issues/2413). InfluxDB 0.9: Fix for handling empty series object in response from influxdb - [Issue #2574](https://github.com/grafana/grafana/issues/2574). Snapshot: Fix for snapshot with expire 7 days option, 7 days option not correct, was 7 hours - [Issue #2568](https://github.com/grafana/grafana/issues/2568). AuthProxy: Fix for server side rendering of panel when using auth proxy - [Issue #2490](https://github.com/grafana/grafana/issues/2490). Graphite: Dashboard import was broken in 2.1 and 2.1.1, working now diff --git a/public/app/plugins/datasource/influxdb/datasource.js b/public/app/plugins/datasource/influxdb/datasource.js index 71714b7b40c..7a37bac2a7f 100644 --- a/public/app/plugins/datasource/influxdb/datasource.js +++ b/public/app/plugins/datasource/influxdb/datasource.js @@ -52,7 +52,7 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) { // replace templated variables allQueries = templateSrv.replace(allQueries, options.scopedVars); return this._seriesQuery(allQueries).then(function(data) { - if (!data || !data.results || !data.results[0].series) { + if (!data || !data.results) { return []; }