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

Explore: Ensure logs volume data points are in order (#77268)

Browse Source 
* Ensure logs volume data points are ordered

* Add a test for data points order
This commit is contained in:
Piotr Jamróz 2023-10-30 13:40:44 +01:00 committed by GitHub
parent 107cf0dc04
commit 03ca9c7c66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
public/app/features/logs/utils.test.ts
View File

@ -407,6 +407,33 @@ describe('mergeLogsVolumeDataFrames', () => {
]); ]);
expect(maximum).toBe(6); expect(maximum).toBe(6);
}); });
it('produces merged results order by time', () => {
const frame1 = mockLogVolume('info', [1600000000001, 1600000000009], [1, 1]);
const frame2 = mockLogVolume('info', [1600000000000, 1600000000005], [1, 1]);
const { dataFrames: merged } = mergeLogsVolumeDataFrames([frame1, frame2]);
expect(merged).toMatchObject([
{
fields: [
{
name: 'Time',
type: FieldType.time,
values: [1600000000000, 1600000000001, 1600000000005, 1600000000009],
},
{
name: 'Value',
type: FieldType.number,
values: [1, 1, 1, 1],
config: {
displayNameFromDS: 'info',
},
},
],
},
]);
});
}); });
describe('getLogsVolumeDimensions', () => { describe('getLogsVolumeDimensions', () => {

7
public/app/features/logs/utils.ts
View File

@ -243,13 +243,14 @@ export const mergeLogsVolumeDataFrames = (dataFrames: DataFrame[]): { dataFrames
levelDataFrame.addField({ name: 'Time', type: FieldType.time, config: timeFieldConfig }); levelDataFrame.addField({ name: 'Time', type: FieldType.time, config: timeFieldConfig });
levelDataFrame.addField({ name: 'Value', type: FieldType.number, config: valueFieldConfig }); levelDataFrame.addField({ name: 'Value', type: FieldType.number, config: valueFieldConfig });
for (const time in aggregated[level]) { Object.entries(aggregated[level])
const value = aggregated[level][time]; .sort((a, b) => Number(a[0]) - Number(b[0]))
.forEach(([time, value]) => {
levelDataFrame.add({ levelDataFrame.add({
Time: Number(time), Time: Number(time),
Value: value, Value: value,
}); });
} });
results.push(levelDataFrame); results.push(levelDataFrame);
}); });