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

Fix parse duration for day (#36942)

Browse Source
This commit is contained in:
idafurjes 2021-07-21 16:16:10 +02:00 committed by GitHub
parent b6a7156300
commit 1a52dd57cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/tsdb/calculator.go
View File

@ -7,6 +7,7 @@ import (
"time"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana/pkg/components/gtime"
"github.com/grafana/grafana/pkg/tsdb/interval"
)
@ -90,7 +91,7 @@ func GetIntervalFrom(dsInterval, queryInterval string, queryIntervalMS int64, de
if isPureNum {
interval += "s"
}
parsedInterval, err := time.ParseDuration(interval)
parsedInterval, err := gtime.ParseDuration(interval)
if err != nil {
return time.Duration(0), err
}

3
pkg/tsdb/interval/interval.go
View File

@ -6,6 +6,7 @@ import (
"strings"
"time"
"github.com/grafana/grafana/pkg/components/gtime"
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/plugins"
@ -97,7 +98,7 @@ func GetIntervalFrom(dsInfo *models.DataSource, queryModel *simplejson.Json, def
if isPureNum {
interval += "s"
}
parsedInterval, err := time.ParseDuration(interval)
parsedInterval, err := gtime.ParseDuration(interval)
if err != nil {
return time.Duration(0), err
}