From e04d27c0b0d18cf2f92190e6f09ad564b46161c1 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 11 Nov 2016 08:46:52 +0100
Subject: [PATCH] fix(influxdb): return internal influxdb errors

ref #6523
---
 pkg/tsdb/influxdb/influxdb.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkg/tsdb/influxdb/influxdb.go b/pkg/tsdb/influxdb/influxdb.go
index 4efb495dd05..5043a2deffc 100644
--- a/pkg/tsdb/influxdb/influxdb.go
+++ b/pkg/tsdb/influxdb/influxdb.go
@@ -82,6 +82,10 @@ func (e *InfluxDBExecutor) Execute(ctx context.Context, queries tsdb.QuerySlice,
 		return result.WithError(err)
 	}
 
+	if response.Err != nil {
+		return result.WithError(response.Err)
+	}
+
 	result.QueryResults = make(map[string]*tsdb.QueryResult)
 	result.QueryResults["A"] = e.ResponseParser.Parse(&response, query)