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

SSE/InfluxDB: Change InfluxQL to work with server side expressions (#31691)

Browse Source 
* SSE/InfluxDB: Change InfluxQL to work with server side expressions
updates the request to handle EpochMS as the time range (which is what expressions sends)
and the response to use millisecond timestamps instead of seconds.
fixes #31604
similar to https://github.com/grafana/grafana/pull/31455
This commit is contained in:
Kyle Brandt 2021-03-18 08:02:37 -04:00 committed by GitHub
parent 52c1d7301f
commit 026bf1f9ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkg/tsdb/influxdb/query.go
View File

@ -78,7 +78,29 @@ func (query *Query) renderTags() []string {
return res
}
func isTimeRangeNumeric(tr *plugins.DataTimeRange) bool {
if _, err := strconv.ParseInt(tr.From, 10, 64); err != nil {
return false
}
if _, err := strconv.ParseInt(tr.To, 10, 64); err != nil {
return false
}
return true
}
func (query *Query) renderTimeFilter(queryContext plugins.DataQuery) string {
// If from expressions
if isTimeRangeNumeric(queryContext.TimeRange) {
from, to, err := epochMStoInfluxTime(queryContext.TimeRange)
if err == nil {
return fmt.Sprintf(" time > %s and time < %s ", from, to)
}
// on error fallback to original time range processing.
glog.Warn("failed to parse expected time range in query, falling back to non-expression time range processing", "error", err)
}
// else from dashboard alerting
from := "now() - " + queryContext.TimeRange.From
to := ""
@ -162,3 +184,17 @@ func (query *Query) renderTz() string {
}
return fmt.Sprintf(" tz('%s')", tz)
}
func epochMStoInfluxTime(tr *plugins.DataTimeRange) (string, string, error) {
from, err := strconv.ParseInt(tr.From, 10, 64)
if err != nil {
return "", "", err
}
to, err := strconv.ParseInt(tr.To, 10, 64)
if err != nil {
return "", "", err
}
return fmt.Sprintf("%dms", from), fmt.Sprintf("%dms", to), nil
}

2
pkg/tsdb/influxdb/response_parser.go
View File

@ -127,7 +127,7 @@ func (rp *ResponseParser) parseTimepoint(valuePair []interface{}, valuePosition
return plugins.DataTimePoint{}, err
}
return plugins.DataTimePoint{value, null.FloatFrom(timestamp)}, nil
return plugins.DataTimePoint{value, null.FloatFrom(timestamp * 1000)}, nil
}
func (rp *ResponseParser) parseValue(value interface{}) null.Float {