fix(mixed data source): fixed issue with mixed data sources in same graph, fixes grafana#4604

torkelo · torkelo · commit 781fed1079f5 · 2016-04-09T14:44:50.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@
 * **Graph Panel**: Fixed issue with axis labels overlapping Y-axis, fixes [#4626](https://github.com/grafana/grafana/issues/4626)
 * **InfluxDB**: Fixed issue with templating query containing template variable, fixes [#4602](https://github.com/grafana/grafana/issues/4602)
 * **Graph Panel**: Fixed issue with hiding series and stacking, fixes [#4557](https://github.com/grafana/grafana/issues/4557)
+* **Mixed Datasources**: Fixed issue with mixing many datasources in same graph, fixes [#4604](https://github.com/grafana/grafana/issues/4604)
 
 # 3.0.0-beta2 (2016-04-04)
 
diff --git a/public/app/features/panel/metrics_panel_ctrl.ts b/public/app/features/panel/metrics_panel_ctrl.ts
@@ -252,8 +252,12 @@ class MetricsPanelCtrl extends PanelCtrl {
   }
 
   addDataQuery(datasource) {
-    var target = {
-    };
+    var target: any = {};
+
+    if (datasource) {
+      target.datasource = datasource.name;
+    }
+
     this.panel.targets.push(target);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -252,8 +252,12 @@ class MetricsPanelCtrl extends PanelCtrl {`
`252`	`252`	`}`
`253`	`253`
`254`	`254`	`addDataQuery(datasource) {`
`255`		`- var target = {`
`256`		`- };`
	`255`	`+ var target: any = {};`
	`256`	`+`
	`257`	`+ if (datasource) {`
	`258`	`+ target.datasource = datasource.name;`
	`259`	`+ }`
	`260`	`+`
`257`	`261`	`this.panel.targets.push(target);`
`258`	`262`	`}`
`259`	`263`	`}`