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

use timeSrv in metricFindQuery as timeRange

Browse Source
This commit is contained in:
thatsparesh
2019-02-09 14:57:20 -06:00
parent 716db35fae
commit 105879ab5d
2 changed files with 50 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/app/plugins/datasource/mssql/datasource.ts
View File

@@ -8,7 +8,7 @@ export class MssqlDatasource {
interval: string;
/** @ngInject */
constructor(instanceSettings, private backendSrv, private $q, private templateSrv) {
constructor(instanceSettings, private backendSrv, private $q, private templateSrv, private timeSrv) {
this.name = instanceSettings.name;
this.id = instanceSettings.id;
this.responseParser = new ResponseParser(this.$q);
@@ -107,19 +107,13 @@ export class MssqlDatasource {
format: 'table',
};
const range = this.timeSrv.timeRange();
const data = {
queries: [interpolatedQuery],
from: range.from.valueOf().toString(),
to: range.to.valueOf().toString(),
};
if (optionalOptions && optionalOptions.range) {
if (optionalOptions.range.from) {
data['from'] = optionalOptions.range.from.valueOf().toString();
}
if (optionalOptions.range.to) {
data['to'] = optionalOptions.range.to.valueOf().toString();
}
}
return this.backendSrv
.datasourceRequest({
url: '/api/tsdb/query',