IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: metrics_panel and time range issue introduced earlier today, fixes #7849

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-03-16 12:20:23 +01:00
parent 32f89f65da
commit 7856e2f16b
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
public/app/features/panel/metrics_panel_ctrl.ts
View File

@@ -93,6 +93,7 @@ class MetricsPanelCtrl extends PanelCtrl {
// load datasource service
this.setTimeQueryStart();
this.datasourceSrv.get(this.panel.datasource)
.then(this.updateTimeRange.bind(this))
.then(this.issueQueries.bind(this))
.then(this.handleQueryResult.bind(this))
.catch(err => {
@@ -119,7 +120,8 @@ class MetricsPanelCtrl extends PanelCtrl {
this.timing.queryEnd = new Date().getTime();
}
updateTimeRange() {
updateTimeRange(datasource?) {
this.datasource = datasource || this.datasource;
this.range = this.timeSrv.timeRange();
this.rangeRaw = this.range.raw;
@@ -132,6 +134,8 @@ class MetricsPanelCtrl extends PanelCtrl {
}
this.calculateInterval();
return this.datasource;
};
calculateInterval() {
@@ -194,7 +198,6 @@ class MetricsPanelCtrl extends PanelCtrl {
issueQueries(datasource) {
this.datasource = datasource;
this.updateTimeRange();
if (!this.panel.targets || this.panel.targets.length === 0) {
return this.$q.when([]);