opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-25 23:54:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix rate special function when using group by

Browse Source
This commit is contained in:
Sven Klemm
2018-07-15 15:14:12 +02:00
parent c3c20ef2e2
commit 6e824e81bf
4 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,17 +27,17 @@ export class PostgresDatasource {
return value;
}
var quotedValues = _.map(value, function(val) {
let quotedValues = _.map(value, function(val) {
return "'" + val + "'";
});
return quotedValues.join(',');
}
query(options) {
var queries = _.filter(options.targets, target => {
let queries = _.filter(options.targets, target => {
return target.hide !== true;
}).map(target => {
var queryModel = new PostgresQuery(target, this.templateSrv, options.scopedVars);
let queryModel = new PostgresQuery(target, this.templateSrv, options.scopedVars);
return {
refId: target.refId,

4
public/app/plugins/datasource/postgres/postgres_query.ts
View File

@ -154,6 +154,10 @@ export default class PostgresQuery {
break;
case 'rate':
let timeColumn = this.target.timeColumn;
if (aggregate) {
timeColumn = 'min(' + timeColumn + ')';
}
let curr = query;
let prev = 'lag(' + curr + ') OVER (' + over + ')';
query = '(CASE WHEN ' + curr + ' >= ' + prev + ' THEN ' + curr + ' - ' + prev + ' ELSE ' + curr + ' END)';

4
public/app/plugins/datasource/postgres/sql_part.ts
View File

@ -1,9 +1,9 @@
import { SqlPartDef, SqlPart } from 'app/core/components/sql_part/sql_part';
var index = [];
let index = [];
function createPart(part): any {
var def = index[part.type];
let def = index[part.type];
if (!def) {
return null;
}