From 0e092ba6a12890213f58998c4cef622645dd8d1e Mon Sep 17 00:00:00 2001
From: "grafana-delivery-bot[bot]"
 <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
Date: Fri, 30 Jun 2023 12:44:48 +0300
Subject: [PATCH] [v10.0.x] Loki: Fix wrong query expression with inline
 comments (#70948)

Loki: Fix wrong query expression with inline comments (#70947)

fix remove comments from query

(cherry picked from commit 13dd821961999642d4746c4abf1cbf3c3ede7c93)

Co-authored-by: Sven Grossmann <sven.grossmann@grafana.com>
---
 public/app/plugins/datasource/loki/modifyQuery.test.ts | 1 +
 public/app/plugins/datasource/loki/modifyQuery.ts      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/public/app/plugins/datasource/loki/modifyQuery.test.ts b/public/app/plugins/datasource/loki/modifyQuery.test.ts
index 608fc610992..b3c77cf69dd 100644
--- a/public/app/plugins/datasource/loki/modifyQuery.test.ts
+++ b/public/app/plugins/datasource/loki/modifyQuery.test.ts
@@ -156,6 +156,7 @@ describe('removeCommentsFromQuery', () => {
     ${'{job="grafana", bar="baz"} |="test" | logfmt | label_format level=lvl #hello'} | ${'{job="grafana", bar="baz"} |="test" | logfmt | label_format level=lvl '}
     ${`#sum(rate(\n{host="containers"}\n#[1m]))`}                                     | ${`\n{host="containers"}\n`}
     ${`#sum(rate(\n{host="containers"}\n#| logfmt\n#[1m]))`}                          | ${`\n{host="containers"}\n\n`}
+    ${'{job="grafana"}\n#hello\n| logfmt'}                                            | ${'{job="grafana"}\n\n| logfmt'}
   `('strips comments in log query:  {$query}', ({ query, expectedResult }) => {
     expect(removeCommentsFromQuery(query)).toBe(expectedResult);
   });
diff --git a/public/app/plugins/datasource/loki/modifyQuery.ts b/public/app/plugins/datasource/loki/modifyQuery.ts
index 8f8ee3a880c..4fb0674cf24 100644
--- a/public/app/plugins/datasource/loki/modifyQuery.ts
+++ b/public/app/plugins/datasource/loki/modifyQuery.ts
@@ -131,6 +131,7 @@ export function removeCommentsFromQuery(query: string): string {
     newQuery = newQuery + query.substring(prev, lineCommentPosition.from);
     prev = lineCommentPosition.to;
   }
+  newQuery = newQuery + query.substring(prev);
   return newQuery;
 }