From 483e2aaa83387aa56de7718cb0fadb71717d8117 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Wed, 25 Aug 2021 16:12:22 +0300 Subject: [PATCH] Fix sortSeries() function, fixes #1274 --- pkg/datasource/functions.go | 5 ++--- pkg/timeseries/sort.go | 12 ++++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/pkg/datasource/functions.go b/pkg/datasource/functions.go index 8512e08..7c9c258 100644 --- a/pkg/datasource/functions.go +++ b/pkg/datasource/functions.go @@ -353,9 +353,8 @@ func applySortSeries(series []*timeseries.TimeSeriesData, params ...interface{}) return nil, errParsingFunctionParam(err) } - aggFunc := timeseries.AggAvg - sorted := timeseries.SortBy(series, order, aggFunc) - return sorted, nil + timeseries.SortByName(series, order) + return series, nil } func applyTimeShiftPre(query *QueryModel, items []*zabbix.Item, params ...interface{}) error { diff --git a/pkg/timeseries/sort.go b/pkg/timeseries/sort.go index a862596..4220ba8 100644 --- a/pkg/timeseries/sort.go +++ b/pkg/timeseries/sort.go @@ -50,3 +50,15 @@ func SortByItem(series []*TimeSeriesData) []*TimeSeriesData { return series } + +func SortByName(series []*TimeSeriesData, order string) []*TimeSeriesData { + sort.Slice(series, func(i, j int) bool { + if order == "desc" { + return series[i].Meta.Name > series[j].Meta.Name + } else { + return series[i].Meta.Name < series[j].Meta.Name + } + }) + + return series +}