From 70521f0756c24a3e5ed64afb32d5737861d2ab55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Fri, 25 Jul 2014 12:14:15 +0200
Subject: [PATCH] InfluxDB: support for InfluxDB v0.8 'list series' response
 schema, Fixes #610

---
 CHANGELOG.md                                    |  1 +
 src/app/services/influxdb/influxdbDatasource.js | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0da543b6929..ef0f2d4259b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - [Issue #525](https://github.com/grafana/grafana/issues/525). InfluxDB: Enhanced series aliasing (legend names) with pattern replacements
 - [Issue #581](https://github.com/grafana/grafana/issues/581). InfluxDB: Add continuous query in series results (series typeahead).
 - [Issue #584](https://github.com/grafana/grafana/issues/584). InfluxDB: Support for alias & alias patterns when using raw query mode
+- [Issue #610](https://github.com/grafana/grafana/issues/610). InfluxDB: Support for InfluxdB v0.8 list series response schemea (series typeahead)
 
 **Changes**
 - [Issue #536](https://github.com/grafana/grafana/issues/536). Graphite: Use unix epoch for Graphite from/to for absolute time ranges
diff --git a/src/app/services/influxdb/influxdbDatasource.js b/src/app/services/influxdb/influxdbDatasource.js
index 5f3eda44a76..b75d0df4391 100644
--- a/src/app/services/influxdb/influxdbDatasource.js
+++ b/src/app/services/influxdb/influxdbDatasource.js
@@ -127,9 +127,20 @@ function (angular, _, kbn, InfluxSeries) {
 
     InfluxDatasource.prototype.listSeries = function() {
       return this.doInfluxRequest('list series').then(function(data) {
-        return _.map(data, function(series) {
-          return series.name;
-        });
+        if (!data || data.length === 0) {
+          return [];
+        }
+        // influxdb >= 1.8
+        if (data[0].columns) {
+          return _.map(data[0].points, function(point) {
+            return point[1];
+          });
+        }
+        else { // influxdb <= 1.7
+          return _.map(data, function(series) {
+            return series.name; // influxdb < 1.7
+          });
+        }
       });
     };