IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

set default for timeGroup in query builder to $__interval

Browse Source
This commit is contained in:
Sven Klemm 2018-08-30 14:16:42 +02:00
parent 483f6cc5e1
commit 015909dbff
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -481,7 +481,7 @@ export class PostgresQueryCtrl extends QueryCtrl {
addGroup(partType, value) { addGroup(partType, value) {
let params = [value]; let params = [value];
if (partType === 'time') { if (partType === 'time') {
params = ['1m', 'none']; params = ['$__interval', 'none'];
} }
let partModel = sqlPart.create({ type: partType, params: params }); let partModel = sqlPart.create({ type: partType, params: params });
@ -618,7 +618,7 @@ export class PostgresQueryCtrl extends QueryCtrl {
.then(tags => { .then(tags => {
var options = []; var options = [];
if (!this.queryModel.hasTimeGroup()) { if (!this.queryModel.hasTimeGroup()) {
options.push(this.uiSegmentSrv.newSegment({ type: 'time', value: 'time(1m,none)' })); options.push(this.uiSegmentSrv.newSegment({ type: 'time', value: 'time($__interval,none)' }));
} }
for (let tag of tags) { for (let tag of tags) {
options.push(this.uiSegmentSrv.newSegment({ type: 'column', value: tag.text })); options.push(this.uiSegmentSrv.newSegment({ type: 'column', value: tag.text }));