From 1067bf9025dd4ca41b485e31b550fac84f0a8acc Mon Sep 17 00:00:00 2001
From: Sven Grossmann <sven.grossmann@grafana.com>
Date: Thu, 20 Mar 2025 22:50:18 +0100
Subject: [PATCH] Loki: Remove range options from query builder (#102566)

* Loki: Remove range options from query builder

* Loki: Improve description

* Loki: Fix test

* Loki: Add default `$__auto`

* Loki: Fix test
---
 .../datasource/loki/components/LokiQueryEditor.test.tsx     | 6 +++---
 .../plugins/datasource/loki/querybuilder/operationUtils.ts  | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx b/public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx
index a821cdf8c38..9ab6f7cc667 100644
--- a/public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx
@@ -151,7 +151,7 @@ describe('LokiQueryEditorSelector', () => {
   it('parses query when changing to builder mode', async () => {
     const { rerender } = renderWithProps({
       refId: 'A',
-      expr: 'rate({instance="host.docker.internal:3000"}[$__interval])',
+      expr: 'rate({instance="host.docker.internal:3000"}[$__auto])',
       editorMode: QueryEditorMode.Code,
     });
     await expectCodeEditor();
@@ -161,7 +161,7 @@ describe('LokiQueryEditorSelector', () => {
         {...defaultProps}
         query={{
           refId: 'A',
-          expr: 'rate({instance="host.docker.internal:3000"}[$__interval])',
+          expr: 'rate({instance="host.docker.internal:3000"}[$__auto])',
           editorMode: QueryEditorMode.Builder,
         }}
       />
@@ -169,7 +169,7 @@ describe('LokiQueryEditorSelector', () => {
 
     await screen.findByText('host.docker.internal:3000');
     expect(screen.getByText('Rate')).toBeInTheDocument();
-    expect(screen.getByText('$__interval')).toBeInTheDocument();
+    expect(screen.getByText('$__auto')).toBeInTheDocument();
   });
 
   it('renders the label browser button', async () => {
diff --git a/public/app/plugins/datasource/loki/querybuilder/operationUtils.ts b/public/app/plugins/datasource/loki/querybuilder/operationUtils.ts
index a3eb6702008..416f0e4c5fd 100644
--- a/public/app/plugins/datasource/loki/querybuilder/operationUtils.ts
+++ b/public/app/plugins/datasource/loki/querybuilder/operationUtils.ts
@@ -336,11 +336,14 @@ export function getLineFilterRenderer(operation: string, caseInsensitive?: boole
     return `${innerExpr} ${operation} ${delimiter}${params.join(`${delimiter} or ${delimiter}`)}${delimiter}`;
   };
 }
+
 function getRangeVectorParamDef(): QueryBuilderOperationParamDef {
   return {
     name: 'Range',
     type: 'string',
-    options: ['$__auto', '1m', '5m', '10m', '1h', '24h'],
+    options: ['$__auto'],
+    description:
+      'Use the default value "$__auto". Change the "step" value in the query options to change the bucket size.',
   };
 }