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

update filter macro on time column change

Browse Source
This commit is contained in:
Sven Klemm
2018-08-29 09:04:33 +02:00
parent 30fce34d9c
commit 84ec1ce624
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,9 +215,25 @@ export class PostgresQueryCtrl extends QueryCtrl {
this.target.timeColumn = this.timeColumnSegment.value; this.target.timeColumn = this.timeColumnSegment.value;
this.datasource.metricFindQuery(this.metaBuilder.buildDatatypeQuery(this.target.timeColumn)).then(result => { this.datasource.metricFindQuery(this.metaBuilder.buildDatatypeQuery(this.target.timeColumn)).then(result => {
if (result.length === 1) { if (result.length === 1) {
this.target.timeColumnType = result[0].text; if (this.target.timeColumnType !== result[0].text) {
this.target.timeColumnType = result[0].text;
let partModel;
if (this.queryModel.hasUnixEpochTimecolumn()) {
partModel = sqlPart.create({ type: 'macro', name: '$__unixEpochFilter', params: [] });
} else {
partModel = sqlPart.create({ type: 'macro', name: '$__timeFilter', params: [] });
}
if (this.whereParts.length >= 1 && this.whereParts[0].def.type === 'macro') {
// replace current macro
this.whereParts[0] = partModel;
} else {
this.whereParts.splice(0, 0, partModel);
}
}
} }
}); });
this.updatePersistedParts();
this.panelCtrl.refresh(); this.panelCtrl.refresh();
} }