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

Fix timeshift() function with multiple targets, closes #338

Browse Source
This commit is contained in:
Alexander Zobnin
2017-05-16 12:02:49 +03:00
parent ea59983721
commit 48d21837b4
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -235,13 +235,6 @@ System.register(['lodash', 'app/core/utils/datemath', './utils', './migrations',
value: function query(options) {
var _this = this;
var timeFrom = Math.ceil(dateMath.parse(options.range.from) / 1000);
var timeTo = Math.ceil(dateMath.parse(options.range.to) / 1000);
var useTrendsFrom = Math.ceil(dateMath.parse('now-' + this.trendsFrom) / 1000);
var useTrendsRange = Math.ceil(utils.parseInterval(this.trendsRange) / 1000);
var useTrends = this.trends && (timeFrom <= useTrendsFrom || timeTo - timeFrom >= useTrendsRange);
// Get alerts for current panel
if (this.alertingEnabled) {
this.alertQuery(options).then(function (alert) {
@@ -258,6 +251,9 @@ System.register(['lodash', 'app/core/utils/datemath', './utils', './migrations',
// Create request for each target
var promises = _.map(options.targets, function (target) {
var timeFrom = Math.ceil(dateMath.parse(options.range.from) / 1000);
var timeTo = Math.ceil(dateMath.parse(options.range.to) / 1000);
// Prevent changes of original object
target = _.cloneDeep(target);
_this.replaceTargetVariables(target, options);
@@ -274,6 +270,10 @@ System.register(['lodash', 'app/core/utils/datemath', './utils', './migrations',
timeTo = time_to;
}
var useTrendsFrom = Math.ceil(dateMath.parse('now-' + _this.trendsFrom) / 1000);
var useTrendsRange = Math.ceil(utils.parseInterval(_this.trendsRange) / 1000);
var useTrends = _this.trends && (timeFrom <= useTrendsFrom || timeTo - timeFrom >= useTrendsRange);
// Metrics or Text query mode
if (target.mode !== 1) {
// Migrate old targets

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

File diff suppressed because one or more lines are too long

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

@@ -106,13 +106,6 @@ var ZabbixAPIDatasource = function () {
value: function query(options) {
var _this = this;
var timeFrom = Math.ceil(dateMath.parse(options.range.from) / 1000);
var timeTo = Math.ceil(dateMath.parse(options.range.to) / 1000);
var useTrendsFrom = Math.ceil(dateMath.parse('now-' + this.trendsFrom) / 1000);
var useTrendsRange = Math.ceil(utils.parseInterval(this.trendsRange) / 1000);
var useTrends = this.trends && (timeFrom <= useTrendsFrom || timeTo - timeFrom >= useTrendsRange);
// Get alerts for current panel
if (this.alertingEnabled) {
this.alertQuery(options).then(function (alert) {
@@ -129,6 +122,9 @@ var ZabbixAPIDatasource = function () {
// Create request for each target
var promises = _lodash2.default.map(options.targets, function (target) {
var timeFrom = Math.ceil(dateMath.parse(options.range.from) / 1000);
var timeTo = Math.ceil(dateMath.parse(options.range.to) / 1000);
// Prevent changes of original object
target = _lodash2.default.cloneDeep(target);
_this.replaceTargetVariables(target, options);
@@ -145,6 +141,10 @@ var ZabbixAPIDatasource = function () {
timeTo = time_to;
}
var useTrendsFrom = Math.ceil(dateMath.parse('now-' + _this.trendsFrom) / 1000);
var useTrendsRange = Math.ceil(utils.parseInterval(_this.trendsRange) / 1000);
var useTrends = _this.trends && (timeFrom <= useTrendsFrom || timeTo - timeFrom >= useTrendsRange);
// Metrics or Text query mode
if (target.mode !== 1) {
// Migrate old targets

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

@@ -58,16 +58,6 @@ class ZabbixAPIDatasource {
* @return {Object} Grafana metrics object with timeseries data for each target.
*/
query(options) {
let timeFrom = Math.ceil(dateMath.parse(options.range.from) / 1000);
let timeTo = Math.ceil(dateMath.parse(options.range.to) / 1000);
let useTrendsFrom = Math.ceil(dateMath.parse('now-' + this.trendsFrom) / 1000);
let useTrendsRange = Math.ceil(utils.parseInterval(this.trendsRange) / 1000);
let useTrends = this.trends && (
(timeFrom <= useTrendsFrom) ||
(timeTo - timeFrom >= useTrendsRange)
);
// Get alerts for current panel
if (this.alertingEnabled) {
this.alertQuery(options).then(alert => {
@@ -84,6 +74,9 @@ class ZabbixAPIDatasource {
// Create request for each target
let promises = _.map(options.targets, target => {
let timeFrom = Math.ceil(dateMath.parse(options.range.from) / 1000);
let timeTo = Math.ceil(dateMath.parse(options.range.to) / 1000);
// Prevent changes of original object
target = _.cloneDeep(target);
this.replaceTargetVariables(target, options);
@@ -96,6 +89,13 @@ class ZabbixAPIDatasource {
timeTo = time_to;
}
let useTrendsFrom = Math.ceil(dateMath.parse('now-' + this.trendsFrom) / 1000);
let useTrendsRange = Math.ceil(utils.parseInterval(this.trendsRange) / 1000);
let useTrends = this.trends && (
(timeFrom <= useTrendsFrom) ||
(timeTo - timeFrom >= useTrendsRange)
);
// Metrics or Text query mode
if (target.mode !== 1) {
// Migrate old targets