opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-01 21:32:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

add moving average to query builder

Browse Source
This commit is contained in:
Sven Klemm
2018-08-03 07:44:36 +02:00
parent 0b57e88f9e
commit dabfd88cd9
3 changed files with 58 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
public/app/plugins/datasource/postgres/query_ctrl.ts
View File

@ -138,6 +138,7 @@ export class PostgresQueryCtrl extends QueryCtrl {
{ text: 'Increase', value: 'increase' },
{ text: 'Rate', value: 'rate' },
{ text: 'Sum', value: 'sum' },
{ text: 'Moving Average', value: 'avg', type: 'moving_window' },
],
};
this.selectMenu.push(windows);
@ -263,14 +264,22 @@ export class PostgresQueryCtrl extends QueryCtrl {
return _.findIndex(selectParts, (p: any) => p.def.type === 'aggregate' || p.def.type === 'percentile');
}
findWindowIndex(selectParts) {
return _.findIndex(selectParts, (p: any) => p.def.type === 'window' || p.def.type === 'moving_window');
}
addSelectPart(selectParts, item, subItem) {
let partModel = sqlPart.create({ type: item.value });
let partType = item.value;
if (subItem && subItem.type) {
partType = subItem.type;
}
let partModel = sqlPart.create({ type: partType });
if (subItem) {
partModel.params = [subItem.value];
}
let addAlias = false;
switch (item.value) {
switch (partType) {
case 'column':
let parts = _.map(selectParts, function(part: any) {
return sqlPart.create({ type: part.def.type, params: _.clone(part.params) });
@ -295,8 +304,10 @@ export class PostgresQueryCtrl extends QueryCtrl {
addAlias = true;
}
break;
case 'moving_window':
partModel.params.push('5');
case 'window':
let windowIndex = _.findIndex(selectParts, (p: any) => p.def.type === 'window');
let windowIndex = this.findWindowIndex(selectParts);
if (windowIndex !== -1) {
// replace current window function
selectParts[windowIndex] = partModel;