Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fixed a bug where multiple SLA queries not handled correctly (#1910)

Browse Source 
* fixed a bug where multiple SLA queries not handled correctly

* added test
This commit is contained in:
Sriram
2024-11-12 09:38:27 +00:00
committed by GitHub
parent ccb89c5cab
commit b27194930c
2 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/datasource/responseHandler.spec.ts Normal file
View File

@@ -0,0 +1,28 @@
import { FieldType, MutableDataFrame, TIME_SERIES_TIME_FIELD_NAME } from '@grafana/data';
import { convertToWide } from './responseHandler';
describe('convertToWide', () => {
it('merge multiple SLI frames correctly', () => {
let frames = convertToWide([
new MutableDataFrame({
name: 'SLI',
fields: [
{ name: TIME_SERIES_TIME_FIELD_NAME, values: [1], type: FieldType.time },
{ name: TIME_SERIES_TIME_FIELD_NAME, values: [1.1], type: FieldType.number },
],
}),
new MutableDataFrame({
name: 'SLI',
fields: [
{ name: TIME_SERIES_TIME_FIELD_NAME, values: [1], type: FieldType.time },
{ name: TIME_SERIES_TIME_FIELD_NAME, values: [1.2], type: FieldType.number },
],
}),
]);
expect(frames.length).toStrictEqual(1);
expect(frames[0].fields.length).toStrictEqual(3);
expect(frames[0].fields[0].values.at(0)).toStrictEqual(1);
expect(frames[0].fields[1].values.at(0)).toStrictEqual(1.1);
expect(frames[0].fields[2].values.at(0)).toStrictEqual(1.2);
});
});

5
src/datasource/responseHandler.ts
View File

@@ -377,7 +377,10 @@ export function convertToWide(data: MutableDataFrame[]): DataFrame[] {
const fields: MutableField[] = [timeField];
for (let i = 0; i < data.length; i++) {
const valueField = data[i].fields.find((f) => f.name === TIME_SERIES_VALUE_FIELD_NAME);
let valueField = data[i].fields.find((f) => f.name === TIME_SERIES_VALUE_FIELD_NAME);
if (data[i].name === 'SLI') {
valueField = data[i].fields.find((f) => f.type === FieldType.number);
}
if (!valueField) {
continue;
}