IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

loki: query chunking: consider refId when merging frames (#64103)

Browse Source
This commit is contained in:
Gábor Farkas 2023-03-03 10:06:25 +01:00 committed by GitHub
parent 76bc288d67
commit fdc4973b77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/app/plugins/datasource/loki/queryUtils.ts
View File

@ -315,13 +315,21 @@ export function requestSupportsPartitioning(allQueries: LokiQuery[]) {
return queries.length > 0; return queries.length > 0;
} }
function shouldCombine(frame1: DataFrame, frame2: DataFrame): boolean {
if (frame1.refId !== frame2.refId) {
return false;
}
return frame1.name === frame2.name;
}
export function combineResponses(currentResult: DataQueryResponse | null, newResult: DataQueryResponse) { export function combineResponses(currentResult: DataQueryResponse | null, newResult: DataQueryResponse) {
if (!currentResult) { if (!currentResult) {
return cloneQueryResponse(newResult); return cloneQueryResponse(newResult);
} }
newResult.data.forEach((newFrame) => { newResult.data.forEach((newFrame) => {
const currentFrame = currentResult.data.find((frame) => frame.name === newFrame.name); const currentFrame = currentResult.data.find((frame) => shouldCombine(frame, newFrame));
if (!currentFrame) { if (!currentFrame) {
currentResult.data.push(cloneDataFrame(newFrame)); currentResult.data.push(cloneDataFrame(newFrame));
return; return;