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

mysql: minor update

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-03-31 12:49:05 +02:00
parent d6d2080f11
commit e5a5bef200
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/services/sqlstore/sql_test_data.go
View File

@ -14,8 +14,8 @@ func init() {
func sqlRandomWalk(m1 string, m2 string, intWalker int64, floatWalker float64, sess *session) error {
timeWalker := time.Now().Add(time.Hour * -1)
now := time.Now()
timeWalker := time.Now().UTC().Add(time.Hour * -1)
now := time.Now().UTC()
step := time.Minute
row := &m.SqlTestData{

2
pkg/tsdb/mysql/mysql.go
View File

@ -61,7 +61,7 @@ func (e *MysqlExecutor) initEngine() error {
}
}
cnnstr := fmt.Sprintf("%s:%s@%s(%s)/%s?charset=utf8mb4", e.datasource.User, e.datasource.Password, "tcp", e.datasource.Url, e.datasource.Database)
cnnstr := fmt.Sprintf("%s:%s@%s(%s)/%s?charset=utf8mb4&parseTime=true&loc=UTC", e.datasource.User, e.datasource.Password, "tcp", e.datasource.Url, e.datasource.Database)
e.log.Debug("getEngine", "connection", cnnstr)
engine, err := xorm.NewEngine("mysql", cnnstr)