Commit 42a0e9eb by Torkel Ödegaard

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

parents d4e5a7d3 3e0b92d6
......@@ -5,7 +5,7 @@ import moment from 'moment';
var units = ['y', 'M', 'w', 'd', 'h', 'm', 's'];
export function parse(text, roundUp?) {
export function parse(text, roundUp?, timezone?) {
if (!text) { return undefined; }
if (moment.isMoment(text)) { return text; }
if (_.isDate(text)) { return moment(text); }
......@@ -16,7 +16,11 @@ export function parse(text, roundUp?) {
var parseString;
if (text.substring(0, 3) === 'now') {
time = moment();
if (timezone === 'utc') {
time = moment.utc();
} else {
time = moment();
}
mathString = text.substring('now'.length);
} else {
index = text.indexOf('||');
......
......@@ -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
};
}
......
......@@ -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,
......
......@@ -46,6 +46,14 @@ describe("DateMath", () => {
expect(startOfDay).to.be(expected.getTime());
});
it("now/d on a utc dashboard should be start of the current day in UTC time", () => {
var today = new Date();
var expected = new Date(Date.UTC(today.getFullYear(), today.getMonth(), today.getDate(), 0, 0, 0, 0));
var startOfDay = dateMath.parse('now/d', false, 'utc').valueOf();
expect(startOfDay).to.be(expected.getTime());
});
describe('subtraction', () => {
var now;
var anchored;
......
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