From 3f77f14d05df9251bdcb5b8c03fb2b7b96c2fc52 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Wed, 15 Sep 2021 17:14:35 +0300
Subject: [PATCH] Sort trend data, fixes #1300

---
 pkg/datasource/zabbix.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkg/datasource/zabbix.go b/pkg/datasource/zabbix.go
index cff7983..c3a0954 100644
--- a/pkg/datasource/zabbix.go
+++ b/pkg/datasource/zabbix.go
@@ -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) {
 	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
-	useTrend := ds.isUseTrend(query.TimeRange)
 	disableDataAlignment := query.Options.DisableDataAlignment || ds.Settings.DisableDataAlignment || query.QueryType == MODE_ITSERVICE
 	if !disableDataAlignment {
 		if useTrend {