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

opstrip · May 16, 2017 · 48d2183 · 48d2183
1 parent ea59983
commit 48d2183
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 25 deletions.
diff --git a/dist/datasource-zabbix/datasource.js b/dist/datasource-zabbix/datasource.js
diff --git a/dist/datasource-zabbix/datasource.js.map b/dist/datasource-zabbix/datasource.js.map
diff --git a/dist/test/datasource-zabbix/datasource.js b/dist/test/datasource-zabbix/datasource.js
@@ -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

diff --git a/src/datasource-zabbix/datasource.js b/src/datasource-zabbix/datasource.js
@@ -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