From 2cce94c70dec1e42daadfc6ddef0262819454fcd Mon Sep 17 00:00:00 2001
From: Sven Grossmann <sven.grossmann@grafana.com>
Date: Wed, 26 Apr 2023 13:42:04 +0200
Subject: [PATCH] [v9.5.x] Loki: Fix log samples using `instant` queries
 (#67271) (#67275)

Loki: Fix log samples using `instant` queries (#67271)

change log samples queryType to always be `range`

(cherry picked from commit d51e63520cad6779728cf53bfaaf89048cfea9a7)
---
 public/app/plugins/datasource/loki/datasource.test.ts | 5 ++---
 public/app/plugins/datasource/loki/datasource.ts      | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/app/plugins/datasource/loki/datasource.test.ts b/public/app/plugins/datasource/loki/datasource.test.ts
index 1ff0e55149b..4c710d0814b 100644
--- a/public/app/plugins/datasource/loki/datasource.test.ts
+++ b/public/app/plugins/datasource/loki/datasource.test.ts
@@ -982,8 +982,7 @@ describe('LokiDatasource', () => {
           })
         ).toEqual({
           expr: 'sum by (level) (count_over_time({label=value}[$__interval]))',
-          instant: false,
-          queryType: 'range',
+          queryType: LokiQueryType.Range,
           refId: 'log-volume-A',
           supportingQueryType: SupportingQueryType.LogsVolume,
         });
@@ -1035,7 +1034,7 @@ describe('LokiDatasource', () => {
           })
         ).toEqual({
           expr: '{label=value}',
-          queryType: 'instant',
+          queryType: LokiQueryType.Range,
           refId: 'log-sample-A',
           maxLines: 100,
         });
diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts
index 76e5d3aa7b0..99576f12dbe 100644
--- a/public/app/plugins/datasource/loki/datasource.ts
+++ b/public/app/plugins/datasource/loki/datasource.ts
@@ -195,7 +195,7 @@ export class LokiDatasource
         return {
           ...normalizedQuery,
           refId: `${REF_ID_STARTER_LOG_VOLUME}${normalizedQuery.refId}`,
-          instant: false,
+          queryType: LokiQueryType.Range,
           supportingQueryType: SupportingQueryType.LogsVolume,
           expr: `sum by (level) (count_over_time(${expr}[$__interval]))`,
         };
@@ -208,6 +208,7 @@ export class LokiDatasource
         }
         return {
           ...normalizedQuery,
+          queryType: LokiQueryType.Range,
           refId: `${REF_ID_STARTER_LOG_SAMPLE}${normalizedQuery.refId}`,
           expr: getLogQueryFromMetricsQuery(expr),
           maxLines: 100,