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

Sort trend data, fixes #202

Browse Source
This commit is contained in:
Alexander Zobnin
2017-06-15 22:31:00 +03:00
parent 8f7c0701b1
commit 7d97dfbef9
8 changed files with 50 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dist/test/datasource-zabbix/constants.js vendored
View File

@@ -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;

9
dist/test/datasource-zabbix/datasource.js vendored
View File

@@ -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 {