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

TimeSeries: Fix leading null-fill for missing intervals (#67570)

Browse Source
This commit is contained in:
Leon Sorokin 2023-04-28 23:35:32 -05:00 committed by GitHub
parent 8d1c32488b
commit e5aeb7c322
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.test.ts
View File

@ -152,6 +152,34 @@ describe('nullInsertThreshold Transformer', () => {
]); ]);
}); });
// this tests that intervals at 24hr but starting not at 12am UTC are not always snapped to 12am UTC
test('should insert leading null at beginning +interval when timeRange.from.valueOf() exceeds threshold 11PM UTC', () => {
const df = new MutableDataFrame({
refId: 'A',
fields: [
{
name: 'Time',
type: FieldType.time,
config: { interval: 86400000 },
values: [1679439600000, 1679526000000, 1679612400000, 1679698800000, 1679785200000],
},
{ name: 'One', type: FieldType.number, values: [0, 1, 2, 3, 4] },
],
});
const result = applyNullInsertThreshold({
frame: df,
refFieldName: null,
refFieldPseudoMin: 1679320395828,
refFieldPseudoMax: 1679815217157,
});
expect(result.fields[0].values).toEqual([
1679266800000, 1679353200000, 1679439600000, 1679526000000, 1679612400000, 1679698800000, 1679785200000,
]);
expect(result.fields[1].values).toEqual([null, null, 0, 1, 2, 3, 4]);
});
test('should insert trailing null at end +interval when timeRange.to.valueOf() exceeds threshold', () => { test('should insert trailing null at end +interval when timeRange.to.valueOf() exceeds threshold', () => {
const df = new MutableDataFrame({ const df = new MutableDataFrame({
refId: 'A', refId: 'A',

11
packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.ts
View File

@ -1,4 +1,4 @@
import { DataFrame, FieldType, incrRoundDn } from '@grafana/data'; import { DataFrame, FieldType } from '@grafana/data';
type InsertMode = (prev: number, next: number, threshold: number) => number; type InsertMode = (prev: number, next: number, threshold: number) => number;
@ -108,11 +108,11 @@ function nullInsertThreshold(
const len = refValues.length; const len = refValues.length;
const refValuesNew: number[] = []; const refValuesNew: number[] = [];
// Continiuously subtract the threshold from the first data // Continuously subtract the threshold from the first data point, filling in insert values accordingly
// point filling in insert values accordingly
if (refFieldPseudoMin != null && refFieldPseudoMin < refValues[0]) { if (refFieldPseudoMin != null && refFieldPseudoMin < refValues[0]) {
let preFillCount = Math.ceil((refValues[0] - refFieldPseudoMin) / threshold);
// this will be 0 or 1 threshold increment left of visible range // this will be 0 or 1 threshold increment left of visible range
let prevSlot = incrRoundDn(refFieldPseudoMin, threshold); let prevSlot = refValues[0] - preFillCount * threshold;
while (prevSlot < refValues[0]) { while (prevSlot < refValues[0]) {
// (prevSlot - threshold) is used to simulate the previous 'real' data point, as getInsertValue expects // (prevSlot - threshold) is used to simulate the previous 'real' data point, as getInsertValue expects
@ -126,8 +126,7 @@ function nullInsertThreshold(
let prevValue: number = refValues[0]; let prevValue: number = refValues[0];
// Fill nulls when a value is greater than // Fill nulls when a value is greater than the threshold value
// the threshold value
for (let i = 1; i < len; i++) { for (let i = 1; i < len; i++) {
const curValue = refValues[i]; const curValue = refValues[i];