fix: support grafana 8.3.x

GoshPosh · Feb 16, 2022 · ef6ba7b · ef6ba7b
1 parent 32c373c
commit ef6ba7b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/dist/datasource.js b/dist/datasource.js
@@ -48,10 +48,17 @@ function (angular, _, dateMath, moment) {
       console.log(options);
 
       var _this = this;
-      var sets = _.groupBy(options.targets, 'datasource');
       var promisesByRefId = {};
       var promises = [];
       var targetsByRefId = {};
+      var sets;
+
+      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

diff --git a/src/datasource.js b/src/datasource.js
@@ -48,10 +48,17 @@ function (angular, _, dateMath, moment) {
       console.log(options);
 
       var _this = this;
-      var sets = _.groupBy(options.targets, 'datasource');
       var promisesByRefId = {};
       var promises = [];
       var targetsByRefId = {};
+      var sets;
+
+      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