opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-06 20:59:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

send timerange with metricFindQuery

Browse Source
This commit is contained in:
Sven Klemm
2018-07-13 09:31:39 +02:00
parent bf21f1bf76
commit 693efda4d5
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@ export class PostgresDatasource {
responseParser: ResponseParser;
/** @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);
@ -106,17 +106,13 @@ export class PostgresDatasource {
format: 'table',
};
var data = {
let range = this.timeSrv.timeRange();
let data = {
queries: [interpolatedQuery],
from: range.from.valueOf().toString(),
to: range.to.valueOf().toString(),
};
if (optionalOptions && optionalOptions.range && optionalOptions.range.from) {
data['from'] = optionalOptions.range.from.valueOf().toString();
}
if (optionalOptions && optionalOptions.range && optionalOptions.range.to) {
data['to'] = optionalOptions.range.to.valueOf().toString();
}
return this.backendSrv
.datasourceRequest({
url: '/api/tsdb/query',

1
public/app/plugins/datasource/postgres/query_builder.ts
View File

@ -46,6 +46,7 @@ export class PostgresQueryBuilder {
buildValueQuery(column: string) {
var query = 'SELECT DISTINCT quote_literal(' + column + ')';
query += ' FROM ' + this.target.schema + '.' + this.target.table;
query += ' WHERE $__timeFilter(' + this.target.timeColumn + ')';
query += ' ORDER BY 1 LIMIT 100';
return query;
}