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

Sort trend data, fixes #1300

Browse Source
This commit is contained in:
Alexander Zobnin
2021-09-15 17:14:35 +03:00
parent 2f08ed13ff
commit 3f77f14d05
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/datasource/zabbix.go
View File

@@ -107,9 +107,14 @@ func (ds *ZabbixDatasourceInstance) queryNumericDataForItems(ctx context.Context
func (ds *ZabbixDatasourceInstance) applyDataProcessing(ctx context.Context, query *QueryModel, series []*timeseries.TimeSeriesData) ([]*data.Frame, error) { func (ds *ZabbixDatasourceInstance) applyDataProcessing(ctx context.Context, query *QueryModel, series []*timeseries.TimeSeriesData) ([]*data.Frame, error) {
consolidateBy := ds.getConsolidateBy(query) consolidateBy := ds.getConsolidateBy(query)
useTrend := ds.isUseTrend(query.TimeRange)
// Sort trend data (in some cases Zabbix API returns it unsorted)
if useTrend {
sortSeriesPoints(series)
}
// Align time series data if possible // Align time series data if possible
useTrend := ds.isUseTrend(query.TimeRange)
disableDataAlignment := query.Options.DisableDataAlignment || ds.Settings.DisableDataAlignment || query.QueryType == MODE_ITSERVICE disableDataAlignment := query.Options.DisableDataAlignment || ds.Settings.DisableDataAlignment || query.QueryType == MODE_ITSERVICE
if !disableDataAlignment { if !disableDataAlignment {
if useTrend { if useTrend {