From b4dba8d14eaae251bd3d0b57227236826e7ead7d Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Mon, 13 Jun 2022 02:50:50 -0400
Subject: [PATCH] logs: histogram: handle backend-mode queries (#50535)
 (#50650)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit a0e5a4eba28f11552d389aa0c208d307c5037858)

Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
---
 public/app/core/logs_model.ts | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/public/app/core/logs_model.ts b/public/app/core/logs_model.ts
index 7ab66c6f587..48facc8143f 100644
--- a/public/app/core/logs_model.ts
+++ b/public/app/core/logs_model.ts
@@ -702,7 +702,17 @@ export function queryLogsVolume<T extends DataQuery>(
         observer.complete();
       },
       next: (dataQueryResponse: DataQueryResponse) => {
-        rawLogsVolume = rawLogsVolume.concat(dataQueryResponse.data.map(toDataFrame));
+        const { error } = dataQueryResponse;
+        if (error !== undefined) {
+          observer.next({
+            state: LoadingState.Error,
+            error,
+            data: [],
+          });
+          observer.error(error);
+        } else {
+          rawLogsVolume = rawLogsVolume.concat(dataQueryResponse.data.map(toDataFrame));
+        }
       },
       error: (error) => {
         observer.next({