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

make sure opentsdb takes dashboard timezone into consideration

Browse Source
This commit is contained in:
Marcus Efraimsson
2019-02-11 13:13:38 +01:00
parent 519dfd0899
commit b9c36e5301
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
public/app/plugins/datasource/opentsdb/datasource.ts
View File

@@ -33,8 +33,8 @@ export default class OpenTsDatasource {
// Called once per panel (graph)
query(options) {
const start = this.convertToTSDBTime(options.rangeRaw.from, false);
const end = this.convertToTSDBTime(options.rangeRaw.to, true);
const start = this.convertToTSDBTime(options.rangeRaw.from, false, options.timezone);
const end = this.convertToTSDBTime(options.rangeRaw.to, true, options.timezone);
const qs = [];
_.each(options.targets, target => {
@@ -86,8 +86,8 @@ export default class OpenTsDatasource {
}
annotationQuery(options) {
const start = this.convertToTSDBTime(options.rangeRaw.from, false);
const end = this.convertToTSDBTime(options.rangeRaw.to, true);
const start = this.convertToTSDBTime(options.rangeRaw.from, false, options.timezone);
const end = this.convertToTSDBTime(options.rangeRaw.to, true, options.timezone);
const qs = [];
const eventList = [];
@@ -484,12 +484,12 @@ export default class OpenTsDatasource {
});
}
convertToTSDBTime(date, roundUp) {
convertToTSDBTime(date, roundUp, timezone) {
if (date === 'now') {
return null;
}
date = dateMath.parse(date, roundUp);
date = dateMath.parse(date, roundUp, timezone);
return date.valueOf();
}
}