Skip to content

Commit b271949

Browse files
authored
fixed a bug where multiple SLA queries not handled correctly (#1910)
* fixed a bug where multiple SLA queries not handled correctly * added test
1 parent ccb89c5 commit b271949

File tree

2 files changed

+32
-1
lines changed

2 files changed

+32
-1
lines changed
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import { FieldType, MutableDataFrame, TIME_SERIES_TIME_FIELD_NAME } from '@grafana/data';
2+
import { convertToWide } from './responseHandler';
3+
4+
describe('convertToWide', () => {
5+
it('merge multiple SLI frames correctly', () => {
6+
let frames = convertToWide([
7+
new MutableDataFrame({
8+
name: 'SLI',
9+
fields: [
10+
{ name: TIME_SERIES_TIME_FIELD_NAME, values: [1], type: FieldType.time },
11+
{ name: TIME_SERIES_TIME_FIELD_NAME, values: [1.1], type: FieldType.number },
12+
],
13+
}),
14+
new MutableDataFrame({
15+
name: 'SLI',
16+
fields: [
17+
{ name: TIME_SERIES_TIME_FIELD_NAME, values: [1], type: FieldType.time },
18+
{ name: TIME_SERIES_TIME_FIELD_NAME, values: [1.2], type: FieldType.number },
19+
],
20+
}),
21+
]);
22+
expect(frames.length).toStrictEqual(1);
23+
expect(frames[0].fields.length).toStrictEqual(3);
24+
expect(frames[0].fields[0].values.at(0)).toStrictEqual(1);
25+
expect(frames[0].fields[1].values.at(0)).toStrictEqual(1.1);
26+
expect(frames[0].fields[2].values.at(0)).toStrictEqual(1.2);
27+
});
28+
});

src/datasource/responseHandler.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,10 @@ export function convertToWide(data: MutableDataFrame[]): DataFrame[] {
377377
const fields: MutableField[] = [timeField];
378378

379379
for (let i = 0; i < data.length; i++) {
380-
const valueField = data[i].fields.find((f) => f.name === TIME_SERIES_VALUE_FIELD_NAME);
380+
let valueField = data[i].fields.find((f) => f.name === TIME_SERIES_VALUE_FIELD_NAME);
381+
if (data[i].name === 'SLI') {
382+
valueField = data[i].fields.find((f) => f.type === FieldType.number);
383+
}
381384
if (!valueField) {
382385
continue;
383386
}

0 commit comments

Comments
 (0)