From 8cd3d1bfda5f61f5cd72b5ee75f1d08fc0e41d91 Mon Sep 17 00:00:00 2001 From: Matias Chomicki Date: Fri, 10 Feb 2023 18:19:17 +0100 Subject: [PATCH] Loki Range splitting: Ignore hidden queries (#63250) Range splitting: ignore hidden queries --- public/app/plugins/datasource/loki/querySplitting.ts | 3 ++- public/app/plugins/datasource/loki/queryUtils.ts | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/public/app/plugins/datasource/loki/querySplitting.ts b/public/app/plugins/datasource/loki/querySplitting.ts index e852057edda..bccc8ce0490 100644 --- a/public/app/plugins/datasource/loki/querySplitting.ts +++ b/public/app/plugins/datasource/loki/querySplitting.ts @@ -58,8 +58,9 @@ export function partitionTimeRange( export function runPartitionedQuery(datasource: LokiDatasource, request: DataQueryRequest) { let mergedResponse: DataQueryResponse | null; + const queries = request.targets.filter((query) => !query.hide); // we assume there is just a single query in the request - const query = request.targets[0]; + const query = queries[0]; const partition = partitionTimeRange( isLogsQuery(query.expr), request.range, diff --git a/public/app/plugins/datasource/loki/queryUtils.ts b/public/app/plugins/datasource/loki/queryUtils.ts index 4db491e7e76..7bd98d72634 100644 --- a/public/app/plugins/datasource/loki/queryUtils.ts +++ b/public/app/plugins/datasource/loki/queryUtils.ts @@ -297,9 +297,10 @@ export function getStreamSelectorsFromQuery(query: string): string[] { return labelMatchers; } -export function requestSupportsPartitioning(queries: LokiQuery[]) { +export function requestSupportsPartitioning(allQueries: LokiQuery[]) { + const queries = allQueries.filter((query) => !query.hide); /* - * For now, we would not split when more than 1 query is requested. + * For now, we will not split when more than 1 query is requested. */ if (queries.length > 1) { return false;