From 781fed1079f54316d3f0c389c0413d4af47bdd7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 9 Apr 2016 14:44:50 -0400 Subject: [PATCH] fix(mixed data source): fixed issue with mixed data sources in same graph, fixes #4604 --- CHANGELOG.md | 1 + public/app/features/panel/metrics_panel_ctrl.ts | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 041381409ee..a0741e2e0ec 100644 --- 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 index 4e610e3ed05..fc98719392e 100644 --- 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); } }