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

mysql: graph showing

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-03-31 13:57:10 +02:00
parent a7babfb7cf
commit 5af81b974e
5 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,6 +58,13 @@ func InsertSqlTestData(cmd *m.InsertSqlTestDataCommand) error {
sqlog.Info("SQL TestData: Truncate done", "rows", rows)
sqlRandomWalk("server1", "frontend", 100, 1.123, sess)
sqlRandomWalk("server2", "frontend", 100, 1.123, sess)
sqlRandomWalk("server3", "frontend", 100, 1.123, sess)
sqlRandomWalk("server1", "backend", 100, 1.123, sess)
sqlRandomWalk("server2", "backend", 100, 1.123, sess)
sqlRandomWalk("server3", "backend", 100, 1.123, sess)
sqlRandomWalk("db-server1", "backend", 100, 1.123, sess)
return err
})

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

@@ -93,20 +93,15 @@ func (e *MysqlExecutor) Execute(ctx context.Context, queries tsdb.QuerySlice, co
rows, err := db.Query(rawSql)
if err != nil {
result.Error = err
return result
result.QueryResults[query.RefId] = &tsdb.QueryResult{Error: err}
continue
}
defer rows.Close()
result.QueryResults[query.RefId] = e.TransformToTimeSeries(query, rows)
}
for _, value := range result.QueryResults {
if value.Error != nil {
e.log.Error("error", "error", value.Error)
}
}
return result
}
@@ -190,7 +185,6 @@ func (s *stringStringScan) Update(rows *sql.Rows) error {
for i := 0; i < s.columnCount; i++ {
if rb, ok := s.rowPtrs[i].(*sql.RawBytes); ok {
s.rowValues[i] = string(*rb)
fmt.Printf("column %s = %s", s.columnNames[i], s.rowValues[i])
switch s.columnNames[i] {
case "time_sec":
@@ -202,9 +196,7 @@ func (s *stringStringScan) Update(rows *sql.Rows) error {
s.value = null.FloatFrom(value)
}
case "metric":
if value, err := strconv.ParseFloat(s.rowValues[i], 64); err == nil {
s.value = null.FloatFrom(value)
}
s.metric = s.rowValues[i]
}
*rb = nil // reset pointer to discard current value to avoid a bug