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

groupBy: fill empty intervals by null, closes #388

Browse Source
This commit is contained in:
Alexander Zobnin
2017-07-03 12:03:17 +03:00
parent 007ddbf72f
commit badc5e4cb9
4 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dist/datasource-zabbix/timeseries.js vendored
View File

@@ -96,10 +96,16 @@ System.register(['lodash', './utils'], function (_export, _context) {
point_frame_ts = getPointTimeFrame(point[POINT_TIMESTAMP], ms_interval); point_frame_ts = getPointTimeFrame(point[POINT_TIMESTAMP], ms_interval);
if (point_frame_ts === frame_ts) { if (point_frame_ts === frame_ts) {
frame_values.push(point[POINT_VALUE]); frame_values.push(point[POINT_VALUE]);
} else { } else if (point_frame_ts > frame_ts) {
frame_value = groupByCallback(frame_values); frame_value = groupByCallback(frame_values);
grouped_series.push([frame_value, frame_ts]); grouped_series.push([frame_value, frame_ts]);
frame_ts = point_frame_ts;
// Move frame window to next non-empty interval and fill empty by null
frame_ts += ms_interval;
while (frame_ts < point_frame_ts) {
grouped_series.push([null, frame_ts]);
frame_ts += ms_interval;
}
frame_values = [point[POINT_VALUE]]; frame_values = [point[POINT_VALUE]];
} }
} }

2
dist/datasource-zabbix/timeseries.js.map vendored
View File

File diff suppressed because one or more lines are too long

10
dist/test/datasource-zabbix/timeseries.js vendored
View File

@@ -121,10 +121,16 @@ function groupBy_perf(datapoints, interval, groupByCallback) {
point_frame_ts = getPointTimeFrame(point[POINT_TIMESTAMP], ms_interval); point_frame_ts = getPointTimeFrame(point[POINT_TIMESTAMP], ms_interval);
if (point_frame_ts === frame_ts) { if (point_frame_ts === frame_ts) {
frame_values.push(point[POINT_VALUE]); frame_values.push(point[POINT_VALUE]);
} else { } else if (point_frame_ts > frame_ts) {
frame_value = groupByCallback(frame_values); frame_value = groupByCallback(frame_values);
grouped_series.push([frame_value, frame_ts]); grouped_series.push([frame_value, frame_ts]);
frame_ts = point_frame_ts;
// Move frame window to next non-empty interval and fill empty by null
frame_ts += ms_interval;
while (frame_ts < point_frame_ts) {
grouped_series.push([null, frame_ts]);
frame_ts += ms_interval;
}
frame_values = [point[POINT_VALUE]]; frame_values = [point[POINT_VALUE]];
} }
} }

10
src/datasource-zabbix/timeseries.js
View File

@@ -108,10 +108,16 @@ function groupBy_perf(datapoints, interval, groupByCallback) {
point_frame_ts = getPointTimeFrame(point[POINT_TIMESTAMP], ms_interval); point_frame_ts = getPointTimeFrame(point[POINT_TIMESTAMP], ms_interval);
if (point_frame_ts === frame_ts) { if (point_frame_ts === frame_ts) {
frame_values.push(point[POINT_VALUE]); frame_values.push(point[POINT_VALUE]);
} else { } else if (point_frame_ts > frame_ts) {
frame_value = groupByCallback(frame_values); frame_value = groupByCallback(frame_values);
grouped_series.push([frame_value, frame_ts]); grouped_series.push([frame_value, frame_ts]);
frame_ts = point_frame_ts;
// Move frame window to next non-empty interval and fill empty by null
frame_ts += ms_interval;
while (frame_ts < point_frame_ts) {
grouped_series.push([null, frame_ts]);
frame_ts += ms_interval;
}
frame_values = [point[POINT_VALUE]]; frame_values = [point[POINT_VALUE]];
} }
} }