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

Merge branch 'master' into postgres-query-builder

Browse Source
This commit is contained in:
Sven Klemm
2018-08-31 19:02:46 +02:00
parent 650e2faf01 abbb6f933c
commit 265d5daf57
183 changed files with 1048 additions and 2225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@ export class PostgresDatasource {
responseParser: ResponseParser;
queryModel: PostgresQuery;
/** @ngInject **/
/** @ngInject */
constructor(instanceSettings, private backendSrv, private $q, private templateSrv, private timeSrv) {
this.name = instanceSettings.name;
this.id = instanceSettings.id;
@ -41,7 +41,7 @@ export class PostgresDatasource {
const queries = _.filter(options.targets, target => {
return target.hide !== true;
}).map(target => {
let queryModel = new PostgresQuery(target, this.templateSrv, options.scopedVars);
const queryModel = new PostgresQuery(target, this.templateSrv, options.scopedVars);
return {
refId: target.refId,
@ -110,7 +110,7 @@ export class PostgresDatasource {
format: 'table',
};
let range = this.timeSrv.timeRange();
const range = this.timeSrv.timeRange();
const data = {
queries: [interpolatedQuery],
from: range.from.valueOf().toString(),