From 3873c5e7b50ccc35fe8ddc92f5f04d2f996bc454 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Farkas?= <gabor.farkas@gmail.com>
Date: Tue, 1 Feb 2022 13:34:03 +0100
Subject: [PATCH] loki: alerting: better error-handling (#44700)

---
 pkg/tsdb/loki/loki.go | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkg/tsdb/loki/loki.go b/pkg/tsdb/loki/loki.go
index 536aa3fdc38..3cadf7bc66b 100644
--- a/pkg/tsdb/loki/loki.go
+++ b/pkg/tsdb/loki/loki.go
@@ -99,7 +99,6 @@ func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.Inst
 
 func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
 	result := backend.NewQueryDataResponse()
-	queryRes := backend.DataResponse{}
 
 	dsInfo, err := s.getDSInfo(req.PluginContext)
 	if err != nil {
@@ -132,10 +131,15 @@ func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest)
 		defer span.End()
 
 		frames, err := runQuery(client, query)
+
+		queryRes := backend.DataResponse{}
+
 		if err != nil {
-			return result, err
+			queryRes.Error = err
+		} else {
+			queryRes.Frames = frames
 		}
-		queryRes.Frames = frames
+
 		result.Responses[query.RefID] = queryRes
 	}
 	return result, nil