opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-03 01:42:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Combine responses: add support for frames with repeated field names (#90650)

Browse Source 
* Combine responses: add support for frames with repeated field names

* Formatting
This commit is contained in:
Matias Chomicki
2024-07-19 16:26:06 +02:00
committed by GitHub
parent 892d5d1b20
commit 66fb4d5f1a
2 changed files with 156 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
packages/grafana-o11y-ds-frontend/src/combineResponses.test.ts
View File

@ -525,6 +525,147 @@ describe('combineResponses', () => {
data: [metricFrameA, metricFrameB],
});
});
it('when fields with the same name are present, uses labels to find the right field to combine', () => {
const { metricFrameA, metricFrameB } = getMockFrames();
metricFrameA.fields.push({
name: 'Value',
type: FieldType.number,
config: {},
values: [9, 8],
labels: {
test: 'true',
},
});
metricFrameB.fields.push({
name: 'Value',
type: FieldType.number,
config: {},
values: [11, 10],
labels: {
test: 'true',
},
});
const responseA: DataQueryResponse = {
data: [metricFrameA],
};
const responseB: DataQueryResponse = {
data: [metricFrameB],
};
expect(combineResponses(responseA, responseB)).toEqual({
data: [
{
fields: [
{
config: {},
name: 'Time',
type: 'time',
values: [1000000, 2000000, 3000000, 4000000],
},
{
config: {},
name: 'Value',
type: 'number',
values: [6, 7, 5, 4],
labels: {
level: 'debug',
},
},
{
config: {},
name: 'Value',
type: 'number',
values: [11, 10, 9, 8],
labels: {
test: 'true',
},
},
],
length: 4,
meta: {
type: 'timeseries-multi',
stats: [
{
displayName: 'Summary: total bytes processed',
unit: 'decbytes',
value: 33,
},
],
},
refId: 'A',
},
],
});
});
it('when fields with the same name are present and labels are not present, falls back to indexes', () => {
const { metricFrameA, metricFrameB } = getMockFrames();
delete metricFrameA.fields[1].labels;
delete metricFrameB.fields[1].labels;
metricFrameA.fields.push({
name: 'Value',
type: FieldType.number,
config: {},
values: [9, 8],
});
metricFrameB.fields.push({
name: 'Value',
type: FieldType.number,
config: {},
values: [11, 10],
});
const responseA: DataQueryResponse = {
data: [metricFrameA],
};
const responseB: DataQueryResponse = {
data: [metricFrameB],
};
expect(combineResponses(responseA, responseB)).toEqual({
data: [
{
fields: [
{
config: {},
name: 'Time',
type: 'time',
values: [1000000, 2000000, 3000000, 4000000],
},
{
config: {},
name: 'Value',
type: 'number',
values: [6, 7, 5, 4],
},
{
config: {},
name: 'Value',
type: 'number',
values: [11, 10, 9, 8],
},
],
length: 4,
meta: {
type: 'timeseries-multi',
stats: [
{
displayName: 'Summary: total bytes processed',
unit: 'decbytes',
value: 33,
},
],
},
refId: 'A',
},
],
});
});
});
describe('combinePanelData', () => {