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

Fix data processing when trend data fetched from DB, closes #1445

Browse Source
This commit is contained in:
Alexander Zobnin
2022-05-06 12:43:46 +03:00
parent daaf2b634d
commit 7153a83926
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/datasource/zabbix.go
View File

@@ -118,11 +118,14 @@ func (ds *ZabbixDatasourceInstance) applyDataProcessing(ctx context.Context, que
// Align time series data if possible // Align time series data if possible
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 && !DBPostProcessing { if useTrend {
// Skip if data fetched directly from DB (it already contains nulls)
if !DBPostProcessing {
for _, s := range series { for _, s := range series {
// Trend data is already aligned (by 1 hour interval), but null values should be added // Trend data is already aligned (by 1 hour interval), but null values should be added
s.TS = s.TS.FillTrendWithNulls() s.TS = s.TS.FillTrendWithNulls()
} }
}
} else { } else {
for _, s := range series { for _, s := range series {
// Skip unnecessary data alignment if item interval less than query interval // Skip unnecessary data alignment if item interval less than query interval