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

refactor: use timeRange instead of from, to

Browse Source
This commit is contained in:
Alexander Zobnin
2017-06-08 15:01:36 +03:00
parent 889f33f45f
commit 201c969e13
8 changed files with 100 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
dist/datasource-zabbix/datasource.js vendored
View File

@@ -271,8 +271,9 @@ System.register(['lodash', 'app/core/utils/datemath', './utils', './migrations',
timeFrom = time_from;
timeTo = time_to;
}
var timeRange = [timeFrom, timeTo];
var useTrends = _this.isUseTrends([timeFrom, timeTo]);
var useTrends = _this.isUseTrends(timeRange);
// Metrics or Text query mode
if (target.mode !== c.MODE_ITSERVICE) {
@@ -285,9 +286,9 @@ System.register(['lodash', 'app/core/utils/datemath', './utils', './migrations',
}
if (!target.mode || target.mode === c.MODE_METRICS) {
return _this.queryNumericData(target, timeFrom, timeTo, useTrends);
return _this.queryNumericData(target, timeRange, useTrends);
} else if (target.mode === c.MODE_TEXT) {
return _this.queryTextData(target, timeFrom, timeTo);
return _this.queryTextData(target, timeRange);
}
}
@@ -298,7 +299,7 @@ System.register(['lodash', 'app/core/utils/datemath', './utils', './migrations',
return [];
}
return _this.zabbix.getSLA(target.itservice.serviceid, timeFrom, timeTo).then(function (slaObject) {
return _this.zabbix.getSLA(target.itservice.serviceid, timeRange).then(function (slaObject) {
return responseHandler.handleSLAResponse(target.itservice, target.slaProperty, slaObject);
});
}
@@ -313,9 +314,13 @@ System.register(['lodash', 'app/core/utils/datemath', './utils', './migrations',
}
}, {
key: 'queryNumericData',
value: function queryNumericData(target, timeFrom, timeTo, useTrends) {
value: function queryNumericData(target, timeRange, useTrends) {
var _this2 = this;
var _timeRange = _slicedToArray(timeRange, 2),
timeFrom = _timeRange[0],
timeTo = _timeRange[1];
var options = {
itemtype: 'num'
};
@@ -418,9 +423,13 @@ System.register(['lodash', 'app/core/utils/datemath', './utils', './migrations',
}
}, {
key: 'queryTextData',
value: function queryTextData(target, timeFrom, timeTo) {
value: function queryTextData(target, timeRange) {
var _this3 = this;
var _timeRange2 = _slicedToArray(timeRange, 2),
timeFrom = _timeRange2[0],
timeTo = _timeRange2[1];
var options = {
itemtype: 'text'
};
@@ -645,9 +654,9 @@ System.register(['lodash', 'app/core/utils/datemath', './utils', './migrations',
}, {
key: 'isUseTrends',
value: function isUseTrends(timeRange) {
var _timeRange = _slicedToArray(timeRange, 2),
timeFrom = _timeRange[0],
timeTo = _timeRange[1];
var _timeRange3 = _slicedToArray(timeRange, 2),
timeFrom = _timeRange3[0],
timeTo = _timeRange3[1];
var useTrendsFrom = Math.ceil(dateMath.parse('now-' + this.trendsFrom) / 1000);
var useTrendsRange = Math.ceil(utils.parseInterval(this.trendsRange) / 1000);

2
dist/datasource-zabbix/datasource.js.map vendored
View File

File diff suppressed because one or more lines are too long

46
dist/datasource-zabbix/zabbixAPI.service.js vendored
View File

@@ -3,7 +3,7 @@
System.register(['angular', 'lodash', './utils', './zabbixAPICore.service'], function (_export, _context) {
"use strict";
var angular, _, utils, _createClass;
var angular, _, utils, _slicedToArray, _createClass;
function _classCallCheck(instance, Constructor) {
if (!(instance instanceof Constructor)) {
@@ -294,7 +294,11 @@ System.register(['angular', 'lodash', './utils', './zabbixAPICore.service'], fun
}
}, {
key: 'getSLA',
value: function getSLA(serviceids, timeFrom, timeTo) {
value: function getSLA(serviceids, timeRange) {
var _timeRange = _slicedToArray(timeRange, 2),
timeFrom = _timeRange[0],
timeTo = _timeRange[1];
var params = {
serviceids: serviceids,
intervals: [{
@@ -427,6 +431,44 @@ System.register(['angular', 'lodash', './utils', './zabbixAPICore.service'], fun
utils = _utils;
}, function (_zabbixAPICoreService) {}],
execute: function () {
_slicedToArray = function () {
function sliceIterator(arr, i) {
var _arr = [];
var _n = true;
var _d = false;
var _e = undefined;
try {
for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) {
_arr.push(_s.value);
if (i && _arr.length === i) break;
}
} catch (err) {
_d = true;
_e = err;
} finally {
try {
if (!_n && _i["return"]) _i["return"]();
} finally {
if (_d) throw _e;
}
}
return _arr;
}
return function (arr, i) {
if (Array.isArray(arr)) {
return arr;
} else if (Symbol.iterator in Object(arr)) {
return sliceIterator(arr, i);
} else {
throw new TypeError("Invalid attempt to destructure non-iterable instance");
}
};
}();
_createClass = function () {
function defineProperties(target, props) {
for (var i = 0; i < props.length; i++) {

2
dist/datasource-zabbix/zabbixAPI.service.js.map vendored
View File

File diff suppressed because one or more lines are too long

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

@@ -144,8 +144,9 @@ var ZabbixAPIDatasource = function () {
timeFrom = time_from;
timeTo = time_to;
}
var timeRange = [timeFrom, timeTo];
var useTrends = _this.isUseTrends([timeFrom, timeTo]);
var useTrends = _this.isUseTrends(timeRange);
// Metrics or Text query mode
if (target.mode !== c.MODE_ITSERVICE) {
@@ -158,9 +159,9 @@ var ZabbixAPIDatasource = function () {
}
if (!target.mode || target.mode === c.MODE_METRICS) {
return _this.queryNumericData(target, timeFrom, timeTo, useTrends);
return _this.queryNumericData(target, timeRange, useTrends);
} else if (target.mode === c.MODE_TEXT) {
return _this.queryTextData(target, timeFrom, timeTo);
return _this.queryTextData(target, timeRange);
}
}
@@ -171,7 +172,7 @@ var ZabbixAPIDatasource = function () {
return [];
}
return _this.zabbix.getSLA(target.itservice.serviceid, timeFrom, timeTo).then(function (slaObject) {
return _this.zabbix.getSLA(target.itservice.serviceid, timeRange).then(function (slaObject) {
return _responseHandler2.default.handleSLAResponse(target.itservice, target.slaProperty, slaObject);
});
}
@@ -186,9 +187,13 @@ var ZabbixAPIDatasource = function () {
}
}, {
key: 'queryNumericData',
value: function queryNumericData(target, timeFrom, timeTo, useTrends) {
value: function queryNumericData(target, timeRange, useTrends) {
var _this2 = this;
var _timeRange = _slicedToArray(timeRange, 2),
timeFrom = _timeRange[0],
timeTo = _timeRange[1];
var options = {
itemtype: 'num'
};
@@ -291,9 +296,13 @@ var ZabbixAPIDatasource = function () {
}
}, {
key: 'queryTextData',
value: function queryTextData(target, timeFrom, timeTo) {
value: function queryTextData(target, timeRange) {
var _this3 = this;
var _timeRange2 = _slicedToArray(timeRange, 2),
timeFrom = _timeRange2[0],
timeTo = _timeRange2[1];
var options = {
itemtype: 'text'
};
@@ -552,9 +561,9 @@ var ZabbixAPIDatasource = function () {
}, {
key: 'isUseTrends',
value: function isUseTrends(timeRange) {
var _timeRange = _slicedToArray(timeRange, 2),
timeFrom = _timeRange[0],
timeTo = _timeRange[1];
var _timeRange3 = _slicedToArray(timeRange, 2),
timeFrom = _timeRange3[0],
timeTo = _timeRange3[1];
var useTrendsFrom = Math.ceil(dateMath.parse('now-' + this.trendsFrom) / 1000);
var useTrendsRange = Math.ceil(utils.parseInterval(this.trendsRange) / 1000);

8
dist/test/datasource-zabbix/zabbixAPI.service.js vendored
View File

@@ -1,5 +1,7 @@
'use strict';
var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
var _angular = require('angular');
@@ -364,7 +366,11 @@ function ZabbixAPIServiceFactory(alertSrv, zabbixAPICoreService) {
}
}, {
key: 'getSLA',
value: function getSLA(serviceids, timeFrom, timeTo) {
value: function getSLA(serviceids, timeRange) {
var _timeRange = _slicedToArray(timeRange, 2),
timeFrom = _timeRange[0],
timeTo = _timeRange[1];
var params = {
serviceids: serviceids,
intervals: [{

15
src/datasource-zabbix/datasource.js
View File

@@ -89,8 +89,9 @@ class ZabbixAPIDatasource {
timeFrom = time_from;
timeTo = time_to;
}
let timeRange = [timeFrom, timeTo];
let useTrends = this.isUseTrends([timeFrom, timeTo]);
let useTrends = this.isUseTrends(timeRange);
// Metrics or Text query mode
if (target.mode !== c.MODE_ITSERVICE) {
@@ -103,9 +104,9 @@ class ZabbixAPIDatasource {
}
if (!target.mode || target.mode === c.MODE_METRICS) {
return this.queryNumericData(target, timeFrom, timeTo, useTrends);
return this.queryNumericData(target, timeRange, useTrends);
} else if (target.mode === c.MODE_TEXT) {
return this.queryTextData(target, timeFrom, timeTo);
return this.queryTextData(target, timeRange);
}
}
@@ -116,7 +117,7 @@ class ZabbixAPIDatasource {
return [];
}
return this.zabbix.getSLA(target.itservice.serviceid, timeFrom, timeTo)
return this.zabbix.getSLA(target.itservice.serviceid, timeRange)
.then(slaObject => {
return responseHandler.handleSLAResponse(target.itservice, target.slaProperty, slaObject);
});
@@ -134,7 +135,8 @@ class ZabbixAPIDatasource {
});
}
queryNumericData(target, timeFrom, timeTo, useTrends) {
queryNumericData(target, timeRange, useTrends) {
let [timeFrom, timeTo] = timeRange;
let options = {
itemtype: 'num'
};
@@ -231,7 +233,8 @@ class ZabbixAPIDatasource {
}
}
queryTextData(target, timeFrom, timeTo) {
queryTextData(target, timeRange) {
let [timeFrom, timeTo] = timeRange;
let options = {
itemtype: 'text'
};

3
src/datasource-zabbix/zabbixAPI.service.js
View File

@@ -323,7 +323,8 @@ function ZabbixAPIServiceFactory(alertSrv, zabbixAPICoreService) {
return this.request('service.get', params);
}
getSLA(serviceids, timeFrom, timeTo) {
getSLA(serviceids, timeRange) {
let [timeFrom, timeTo] = timeRange;
var params = {
serviceids: serviceids,
intervals: [{