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

move timeFrom, timeTo, unixEpochFrom and unixEpochTo macros to sql_engine

Browse Source
This commit is contained in:
Sven Klemm
2018-10-02 20:19:34 +02:00
parent 6cdfff52f7
commit 94d6d51726
8 changed files with 33 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/tsdb/sql_engine.go
View File

@ -184,6 +184,10 @@ var Interpolate = func(query *Query, timeRange *TimeRange, sql string) (string,
sql = strings.Replace(sql, "$__interval_ms", strconv.FormatInt(interval.Milliseconds(), 10), -1)
sql = strings.Replace(sql, "$__interval", interval.Text, -1)
sql = strings.Replace(sql, "$__timeFrom()", fmt.Sprintf("'%s'", timeRange.GetFromAsTimeUTC().Format(time.RFC3339)), -1)
sql = strings.Replace(sql, "$__timeTo()", fmt.Sprintf("'%s'", timeRange.GetToAsTimeUTC().Format(time.RFC3339)), -1)
sql = strings.Replace(sql, "$__unixEpochFrom()", fmt.Sprintf("%d", timeRange.GetFromAsSecondsEpoch()), -1)
sql = strings.Replace(sql, "$__unixEpochTo()", fmt.Sprintf("%d", timeRange.GetToAsSecondsEpoch()), -1)
return sql, nil
}