Merge pull request #147 from GoshPosh/pm_fix_timeshift_and_moving_ave…

…rage PM fix timeshift and moving average
GoshPosh · Mar 8, 2022 · fecbe8a · fecbe8a
2 parents 52153ee + a973a2e
commit fecbe8a
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 10 deletions.
diff --git a/dist/datasource.js b/dist/datasource.js
@@ -71,12 +71,11 @@ function (angular, _, dateMath, moment) {
       var targetsByRefId = {};
       var sets;
 
-      if (typeof (options.targets[0].datasource) === 'object') {
+     if (typeof (options.targets[0].datasource) === 'object') {
         sets = _.groupBy(options.targets, target => target.datasource.uid);
       } else {
         sets = _.groupBy(options.targets, 'datasource');
       }
-
       _.forEach(sets, function (targets, dsName) {
       // Grafana (8.x.x) sends datasource name as undefined with mixed plugin made as default datasource
       // https://github.com/grafana/grafana/issues/36508
@@ -229,7 +228,13 @@ function (angular, _, dateMath, moment) {
                 return timeshift(options.targets[0], options, targetsByRefId, datasourceSrv, metaTarget.outputMetricName)
             }
             else{
-                return ds.query(options)
+                var ds_res = ds.query(options);
+                if(ds_res.then){
+                    return ds_res;
+                }
+                else{
+                    return ds_res.toPromise();
+                }
             }
         });
         promise  = metaTargetPromise.then(function (result) {
@@ -298,7 +303,13 @@ function (angular, _, dateMath, moment) {
             }
 
             else{
-                return ds.query(options)
+                var ds_res = ds.query(options);
+                if(ds_res.then){
+                    return ds_res;
+                }
+                else{
+                    return ds_res.toPromise();
+                }
             }
         });
 

diff --git a/dist/plugin.json b/dist/plugin.json
@@ -12,7 +12,7 @@
   },
 
   "info": {
-    "version": "0.0.8",
+    "version": "0.0.9",
     "author": {
       "name": "Gaurav Shah",
       "url": "https://github.com/GoshPosh/grafana-meta-queries"

diff --git a/src/datasource.js b/src/datasource.js
@@ -71,12 +71,11 @@ function (angular, _, dateMath, moment) {
       var targetsByRefId = {};
       var sets;
 
-      if (typeof (options.targets[0].datasource) === 'object') {
+     if (typeof (options.targets[0].datasource) === 'object') {
         sets = _.groupBy(options.targets, target => target.datasource.uid);
       } else {
         sets = _.groupBy(options.targets, 'datasource');
       }
-
       _.forEach(sets, function (targets, dsName) {
       // Grafana (8.x.x) sends datasource name as undefined with mixed plugin made as default datasource
       // https://github.com/grafana/grafana/issues/36508
@@ -229,7 +228,13 @@ function (angular, _, dateMath, moment) {
                 return timeshift(options.targets[0], options, targetsByRefId, datasourceSrv, metaTarget.outputMetricName)
             }
             else{
-                return ds.query(options)
+                var ds_res = ds.query(options);
+                if(ds_res.then){
+                    return ds_res;
+                }
+                else{
+                    return ds_res.toPromise();
+                }
             }
         });
         promise  = metaTargetPromise.then(function (result) {
@@ -298,7 +303,13 @@ function (angular, _, dateMath, moment) {
             }
 
             else{
-                return ds.query(options)
+                var ds_res = ds.query(options);
+                if(ds_res.then){
+                    return ds_res;
+                }
+                else{
+                    return ds_res.toPromise();
+                }
             }
         });
 

diff --git a/src/plugin.json b/src/plugin.json
@@ -12,7 +12,7 @@
   },
 
   "info": {
-    "version": "0.0.8",
+    "version": "0.0.9",
     "author": {
       "name": "Gaurav Shah",
       "url": "https://github.com/GoshPosh/grafana-meta-queries"