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

Fix conversion to wide data frame, fixes #1309

Browse Source
This commit is contained in:
Alexander Zobnin
2021-09-22 14:57:38 +03:00
parent b65a638b0d
commit d3bf7eb74e
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/datasource-zabbix/responseHandler.ts
View File

@@ -316,7 +316,8 @@ export function alignFrames(data: MutableDataFrame[]): MutableDataFrame[] {
} }
export function convertToWide(data: MutableDataFrame[]): DataFrame[] { export function convertToWide(data: MutableDataFrame[]): DataFrame[] {
const timeField = data[0].fields.find(f => f.type === FieldType.time); const maxLengthIndex = getLongestFrame(data);
const timeField = data[maxLengthIndex].fields.find(f => f.type === FieldType.time);
if (!timeField) { if (!timeField) {
return []; return [];
} }
@@ -347,6 +348,20 @@ export function convertToWide(data: MutableDataFrame[]): DataFrame[] {
return [frame]; return [frame];
} }
function getLongestFrame(data: MutableDataFrame[]): number {
let maxLengthIndex = 0;
let maxLength = 0;
for (let i = 0; i < data.length; i++) {
const timeField = data[i].fields.find(f => f.type === FieldType.time);
if (timeField.values.length > maxLength) {
maxLength = timeField.values.length;
maxLengthIndex = i;
}
}
return maxLengthIndex;
}
function sortTimeseries(timeseries) { function sortTimeseries(timeseries) {
// Sort trend data, issue #202 // Sort trend data, issue #202
_.forEach(timeseries, series => { _.forEach(timeseries, series => {