Commit 781fed10 by Torkel Ödegaard

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

parent ebb373ee
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
* **Graph Panel**: Fixed issue with axis labels overlapping Y-axis, fixes [#4626](https://github.com/grafana/grafana/issues/4626) * **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) * **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) * **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) # 3.0.0-beta2 (2016-04-04)
......
...@@ -252,8 +252,12 @@ class MetricsPanelCtrl extends PanelCtrl { ...@@ -252,8 +252,12 @@ class MetricsPanelCtrl extends PanelCtrl {
} }
addDataQuery(datasource) { addDataQuery(datasource) {
var target = { var target: any = {};
};
if (datasource) {
target.datasource = datasource.name;
}
this.panel.targets.push(target); this.panel.targets.push(target);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment