Przeglądaj źródła

fix(metrics tab): Fix for missing datasource name in datasource selector, fixes #4540

Torkel Ödegaard 9 lat temu
rodzic
commit
f35eb0f148
2 zmienionych plików z 2 dodań i 1 usunięć
  1. 1 0
      CHANGELOG.md
  2. 1 1
      public/app/features/panel/metrics_panel_ctrl.ts

+ 1 - 0
CHANGELOG.md

@@ -9,6 +9,7 @@
 * **Dashboard**: Fixed dashboard panel layout for mobile devices, fixes [#4529](https://github.com/grafana/grafana/issues/4529)
 * **Table Panel**: Fixed issue with table panel sort, fixes [#4532](https://github.com/grafana/grafana/issues/4532)
 * **Page Load Crash**: A Datasource with null jsonData would make Grafana fail to load page, fixes [#4536](https://github.com/grafana/grafana/issues/4536)
+* **Metrics tab**: Fix for missing datasource name in datasource selector, fixes [#4540](https://github.com/grafana/grafana/issues/4540)
 
 # 3.0.0-beta1 (2016-03-31)
 

+ 1 - 1
public/app/features/panel/metrics_panel_ctrl.ts

@@ -165,6 +165,7 @@ class MetricsPanelCtrl extends PanelCtrl {
 
   issueQueries(datasource) {
     this.updateTimeRange();
+    this.datasource = datasource;
 
     if (!this.panel.targets || this.panel.targets.length === 0) {
       return this.$q.when([]);
@@ -251,7 +252,6 @@ class MetricsPanelCtrl extends PanelCtrl {
 
   addDataQuery(datasource) {
     var target = {
-      datasource: datasource ? datasource.name : undefined
     };
     this.panel.targets.push(target);
   }