Sort trend data, fixes #202

dist/datasource-zabbix/constants.js

@@ -3,7 +3,7 @@
 System.register([], function (_export, _context) {
   "use strict";
 
-  var MODE_METRICS, MODE_TEXT, MODE_ITSERVICE, SEV_NOT_CLASSIFIED, SEV_INFORMATION, SEV_WARNING, SEV_AVERAGE, SEV_HIGH, SEV_DISASTER, SHOW_ALL_TRIGGERS, SHOW_ALL_EVENTS, SHOW_OK_EVENTS;
+  var MODE_METRICS, MODE_TEXT, MODE_ITSERVICE, SEV_NOT_CLASSIFIED, SEV_INFORMATION, SEV_WARNING, SEV_AVERAGE, SEV_HIGH, SEV_DISASTER, SHOW_ALL_TRIGGERS, SHOW_ALL_EVENTS, SHOW_OK_EVENTS, DATAPOINT_VALUE, DATAPOINT_TS;
   return {
     setters: [],
     execute: function () {
@@ -54,6 +54,14 @@ System.register([], function (_export, _context) {
       _export("SHOW_OK_EVENTS", SHOW_OK_EVENTS = 1);
 
       _export("SHOW_OK_EVENTS", SHOW_OK_EVENTS);
+
+      _export("DATAPOINT_VALUE", DATAPOINT_VALUE = 0);
+
+      _export("DATAPOINT_VALUE", DATAPOINT_VALUE);
+
+      _export("DATAPOINT_TS", DATAPOINT_TS = 1);
+
+      _export("DATAPOINT_TS", DATAPOINT_TS);
     }
   };
 });

dist/datasource-zabbix/constants.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/datasource-zabbix/constants.js"],"names":["MODE_METRICS","MODE_TEXT","MODE_ITSERVICE","SEV_NOT_CLASSIFIED","SEV_INFORMATION","SEV_WARNING","SEV_AVERAGE","SEV_HIGH","SEV_DISASTER","SHOW_ALL_TRIGGERS","SHOW_ALL_EVENTS","SHOW_OK_EVENTS"],"mappings":";;;;;;;;;8BACaA,Y,GAAe,C;;;;2BACfC,S,GAAY,C;;;;gCACZC,c,GAAiB,C;;;;oCAGjBC,kB,GAAqB,C;;;;iCACrBC,e,GAAkB,C;;;;6BAClBC,W,GAAc,C;;;;6BACdC,W,GAAc,C;;;;0BACdC,Q,GAAW,C;;;;8BACXC,Y,GAAe,C;;;;mCAEfC,iB,GAAoB,CAAC,CAAD,EAAI,CAAJ,C;;;;iCACpBC,e,GAAkB,CAAC,CAAD,EAAI,CAAJ,C;;;;gCAClBC,c,GAAiB,C","file":"constants.js","sourcesContent":["// Editor modes\nexport const MODE_METRICS = 0;\nexport const MODE_TEXT = 2;\nexport const MODE_ITSERVICE = 1;\n\n// Triggers severity\nexport const SEV_NOT_CLASSIFIED = 0;\nexport const SEV_INFORMATION = 1;\nexport const SEV_WARNING = 2;\nexport const SEV_AVERAGE = 3;\nexport const SEV_HIGH = 4;\nexport const SEV_DISASTER = 5;\n\nexport const SHOW_ALL_TRIGGERS = [0, 1];\nexport const SHOW_ALL_EVENTS = [0, 1];\nexport const SHOW_OK_EVENTS = 1;\n"]}
+{"version":3,"sources":["../../src/datasource-zabbix/constants.js"],"names":["MODE_METRICS","MODE_TEXT","MODE_ITSERVICE","SEV_NOT_CLASSIFIED","SEV_INFORMATION","SEV_WARNING","SEV_AVERAGE","SEV_HIGH","SEV_DISASTER","SHOW_ALL_TRIGGERS","SHOW_ALL_EVENTS","SHOW_OK_EVENTS","DATAPOINT_VALUE","DATAPOINT_TS"],"mappings":";;;;;;;;;8BACaA,Y,GAAe,C;;;;2BACfC,S,GAAY,C;;;;gCACZC,c,GAAiB,C;;;;oCAGjBC,kB,GAAqB,C;;;;iCACrBC,e,GAAkB,C;;;;6BAClBC,W,GAAc,C;;;;6BACdC,W,GAAc,C;;;;0BACdC,Q,GAAW,C;;;;8BACXC,Y,GAAe,C;;;;mCAEfC,iB,GAAoB,CAAC,CAAD,EAAI,CAAJ,C;;;;iCACpBC,e,GAAkB,CAAC,CAAD,EAAI,CAAJ,C;;;;gCAClBC,c,GAAiB,C;;;;iCAGjBC,e,GAAkB,C;;;;8BAClBC,Y,GAAe,C","file":"constants.js","sourcesContent":["// Editor modes\nexport const MODE_METRICS = 0;\nexport const MODE_TEXT = 2;\nexport const MODE_ITSERVICE = 1;\n\n// Triggers severity\nexport const SEV_NOT_CLASSIFIED = 0;\nexport const SEV_INFORMATION = 1;\nexport const SEV_WARNING = 2;\nexport const SEV_AVERAGE = 3;\nexport const SEV_HIGH = 4;\nexport const SEV_DISASTER = 5;\n\nexport const SHOW_ALL_TRIGGERS = [0, 1];\nexport const SHOW_ALL_EVENTS = [0, 1];\nexport const SHOW_OK_EVENTS = 1;\n\n// Data point\nexport const DATAPOINT_VALUE = 0;\nexport const DATAPOINT_TS = 1;\n"]}

dist/datasource-zabbix/datasource.js

@@ -332,6 +332,15 @@ System.register(['lodash', 'app/core/utils/datemath', './utils', './migrations',
                   var valueType = _this2.getTrendValueType(target);
                   getHistoryPromise = _this2.zabbix.getTrend(items, timeFrom, timeTo).then(function (history) {
                     return responseHandler.handleTrends(history, items, valueType);
+                  }).then(function (timeseries) {
+                    // Sort trend data, issue #202
+                    _.forEach(timeseries, function (series) {
+                      series.datapoints = _.sortBy(series.datapoints, function (point) {
+                        return point[c.DATAPOINT_TS];
+                      });
+                    });
+
+                    return timeseries;
                   });
                 })();
               } else {

dist/test/datasource-zabbix/constants.js

@@ -19,3 +19,7 @@ var SEV_DISASTER = exports.SEV_DISASTER = 5;
 var SHOW_ALL_TRIGGERS = exports.SHOW_ALL_TRIGGERS = [0, 1];
 var SHOW_ALL_EVENTS = exports.SHOW_ALL_EVENTS = [0, 1];
 var SHOW_OK_EVENTS = exports.SHOW_OK_EVENTS = 1;
+
+// Data point
+var DATAPOINT_VALUE = exports.DATAPOINT_VALUE = 0;
+var DATAPOINT_TS = exports.DATAPOINT_TS = 1;

dist/test/datasource-zabbix/datasource.js

@@ -205,6 +205,15 @@ var ZabbixAPIDatasource = function () {
             var valueType = _this2.getTrendValueType(target);
             getHistoryPromise = _this2.zabbix.getTrend(items, timeFrom, timeTo).then(function (history) {
               return _responseHandler2.default.handleTrends(history, items, valueType);
+            }).then(function (timeseries) {
+              // Sort trend data, issue #202
+              _lodash2.default.forEach(timeseries, function (series) {
+                series.datapoints = _lodash2.default.sortBy(series.datapoints, function (point) {
+                  return point[c.DATAPOINT_TS];
+                });
+              });
+
+              return timeseries;
             });
           })();
         } else {

src/datasource-zabbix/constants.js

@@ -14,3 +14,7 @@ export const SEV_DISASTER = 5;
 export const SHOW_ALL_TRIGGERS = [0, 1];
 export const SHOW_ALL_EVENTS = [0, 1];
 export const SHOW_OK_EVENTS = 1;
+
+// Data point
+export const DATAPOINT_VALUE = 0;
+export const DATAPOINT_TS = 1;

src/datasource-zabbix/datasource.js

@@ -147,15 +147,23 @@ class ZabbixAPIDatasource {
       if (useTrends) {
         let valueType = this.getTrendValueType(target);
         getHistoryPromise = this.zabbix.getTrend(items, timeFrom, timeTo)
-          .then(history => {
+        .then(history => {
-            return responseHandler.handleTrends(history, items, valueType);
+          return responseHandler.handleTrends(history, items, valueType);
+        })
+        .then(timeseries => {
+          // Sort trend data, issue #202
+          _.forEach(timeseries, series => {
+            series.datapoints = _.sortBy(series.datapoints, point => point[c.DATAPOINT_TS]);
           });
+
+          return timeseries;
+        });
       } else {
         // Use history
         getHistoryPromise = this.zabbix.getHistory(items, timeFrom, timeTo)
-          .then(history => {
+        .then(history => {
-            return responseHandler.handleHistory(history, items);
+          return responseHandler.handleHistory(history, items);
-          });
+        });
       }
 
       return getHistoryPromise.then(timeseries_data => {