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

Merge branch 'day_rounding' of https://github.com/ctide/grafana into ctide-day_rounding2

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-10-02 16:20:23 +02:00
parent d4e5a7d3f0 3e0b92d6fe
commit 42a0e9ebdf
4 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/features/dashboard/time_srv.ts
View File

@@ -195,10 +195,11 @@ class TimeSrv {
from: moment.isMoment(this.time.from) ? moment(this.time.from) : this.time.from,
to: moment.isMoment(this.time.to) ? moment(this.time.to) : this.time.to,
};
var timezone = this.dashboard && this.dashboard.getTimezone ? this.dashboard.getTimezone() : 'local';
return {
from: dateMath.parse(raw.from, false),
to: dateMath.parse(raw.to, true),
from: dateMath.parse(raw.from, false, timezone),
to: dateMath.parse(raw.to, true, timezone),
raw: raw
};
}

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

@@ -217,7 +217,10 @@ class MetricsPanelCtrl extends PanelCtrl {
"__interval_ms": {text: this.intervalMs, value: this.intervalMs},
});
var timezone = this.dashboard.getTimezone ? this.dashboard.getTimezone() : 'local';
var metricsQuery = {
timezone: timezone,
panelId: this.panel.id,
range: this.range,
rangeRaw: this.range.raw,