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

Merge remote-tracking branch 'upstream/master' into postgres-query-builder

Browse Source
This commit is contained in:
Sven Klemm
2018-08-02 16:39:27 +02:00
parent 7e9c9199c1 5cca478656
commit 67edb9e9fe
35 changed files with 203 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -151,7 +151,8 @@ Macros:
- $__timeEpoch -> extract(epoch from column) as "time"
- $__timeFilter(column) -> column BETWEEN '2017-04-21T05:01:17Z' AND '2017-04-21T05:01:17Z'
- $__unixEpochFilter(column) -> column >= 1492750877 AND column <= 1492750877
- $__timeGroup(column,'5m') -> (extract(epoch from column)/300)::bigint*300 AS time
- $__timeGroup(column,'5m') -> (extract(epoch from column)/300)::bigint*300
- $__timeGroupAlias(column,'5m') -> (extract(epoch from column)/300)::bigint*300 AS "time"
Example of group by and order by with $__timeGroup:
SELECT