Merge branch 'master' of github.com:grafana/grafana

9363c40a · Torkel Ödegaard · b6ce16eb · 2782ad09 · 9363c40a
Commit 9363c40a authored Jan 29, 2018 by Torkel Ödegaard
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

pkg/plugins/datasource/wrapper/datasource_plugin_wrapper.go
+5 -2

No files found.
--- a/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper.go
+++ b/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper.go
@@ -71,8 +71,11 @@ func (tw *DatasourcePluginWrapper) Query(ctx context.Context, ds *models.DataSou
 		qr := &tsdb.QueryResult{
 			RefId:  r.RefId,
 			Series: []*tsdb.TimeSeries{},
-			Error:       errors.New(r.Error),
-			ErrorString: r.Error,
+		}
+
+		if r.Error != "" {
+			qr.Error = errors.New(r.Error)
+			qr.ErrorString = r.Error
 		}

 		for _, s := range r.GetSeries() {