Merge branch 'master' of https://github.com/alexanderzobnin/grafana-z…

…abbix into hotfix/ack-severity-color
memfiz · Jan 13, 2020 · 16c5d95 · 16c5d95
2 parents 2cf5262 + fe0c5cf
commit 16c5d95
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -56,6 +56,6 @@ First, [configure](https://alexanderzobnin.github.io/grafana-zabbix/configuratio
 - Need additional support? Contact me for details [[email protected]](mailto:[email protected])
 
 ---
-:copyright: 2015-2019 Alexander Zobnin [email protected]
+:copyright: 2015-2020 Alexander Zobnin [email protected]
 
 Licensed under the Apache 2.0 License
diff --git a/src/datasource-zabbix/dataProcessor.js b/src/datasource-zabbix/dataProcessor.js
@@ -121,9 +121,11 @@ function aggregateWrapper(groupByCallback, interval, datapoints) {
 }
 
 function percentile(interval, n, datapoints) {
-  var flattenedPoints = ts.flattenDatapoints(datapoints);
-  var groupByCallback = _.partial(PERCENTILE, n);
-  return groupBy(flattenedPoints, interval, groupByCallback);
+  const flattenedPoints = ts.flattenDatapoints(datapoints);
+  // groupBy_perf works with sorted series only
+  const sortedPoints = ts.sortByTime(flattenedPoints);
+  let groupByCallback = _.partial(PERCENTILE, n);
+  return groupBy(sortedPoints, interval, groupByCallback);
 }
 
 function timeShift(interval, range) {