opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-26 00:14:37 +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-18 11:54:39 +02:00
parent 4acf4f9d36 da2822c88d
commit 998bb6ebe3
27 changed files with 789 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/plugins/datasource/postgres/partials/query.editor.html
View File

@ -155,6 +155,8 @@ Macros:
by setting fillvalue grafana will fill in missing values according to the interval
fillvalue can be either a literal value, NULL or previous; previous will fill in the previous seen value or NULL if none has been seen yet
- $__timeGroupAlias(column,'5m') -> (extract(epoch from column)/300)::bigint*300 AS "time"
- $__unixEpochGroup(column,'5m') -> floor(column/300)*300
- $__unixEpochGroupAlias(column,'5m') -> floor(column/300)*300 AS "time"
Example of group by and order by with $__timeGroup:
SELECT