mysql: minor update

pkg/api/api.go

@@ -252,6 +252,7 @@ func (hs *HttpServer) registerRoutes() {
 		// metrics
 		// metrics
 		r.Post("/tsdb/query", bind(dtos.MetricRequest{}), wrap(QueryMetrics))
 		r.Post("/tsdb/query", bind(dtos.MetricRequest{}), wrap(QueryMetrics))
 		r.Get("/tsdb/testdata/scenarios", wrap(GetTestDataScenarios))
 		r.Get("/tsdb/testdata/scenarios", wrap(GetTestDataScenarios))
+		r.Get("/tsdb/testdata/gensql", reqGrafanaAdmin, wrap(GenerateSqlTestData))
 
 
 		// metrics
 		// metrics
 		r.Get("/metrics", wrap(GetInternalMetrics))
 		r.Get("/metrics", wrap(GetInternalMetrics))

pkg/api/metrics.go

@@ -126,3 +126,12 @@ func GenerateError(c *middleware.Context) Response {
 	var array []string
 	var array []string
 	return Json(200, array[20])
 	return Json(200, array[20])
 }
 }
+
+// GET /api/tsdb/testdata/gensql
+func GenerateSqlTestData(c *middleware.Context) Response {
+	if err := bus.Dispatch(&models.InsertSqlTestDataCommand{}); err != nil {
+		return ApiError(500, "Failed to insert test data", err)
+	}
+
+	return Json(200, &util.DynMap{"message": "OK"})
+}

pkg/models/test_data.go

@@ -11,6 +11,7 @@ type SqlTestData struct {
 	Metric2       string
 	Metric2       string
 	ValueBigInt   int64
 	ValueBigInt   int64
 	ValueDouble   float64
 	ValueDouble   float64
+	ValueFloat    float32
 	ValueInt      int
 	ValueInt      int
 	TimeEpoch     int64
 	TimeEpoch     int64
 	TimeDateTime  time.Time
 	TimeDateTime  time.Time

pkg/services/sqlstore/migrations/stats_mig.go

@@ -41,7 +41,7 @@ func addTestDataMigrations(mg *Migrator) {
 			{Name: "id", Type: DB_Int, IsPrimaryKey: true, IsAutoIncrement: true},
 			{Name: "id", Type: DB_Int, IsPrimaryKey: true, IsAutoIncrement: true},
 			{Name: "metric1", Type: DB_Varchar, Length: 20, Nullable: true},
 			{Name: "metric1", Type: DB_Varchar, Length: 20, Nullable: true},
 			{Name: "metric2", Type: DB_NVarchar, Length: 150, Nullable: true},
 			{Name: "metric2", Type: DB_NVarchar, Length: 150, Nullable: true},
-			{Name: "value_big_ing", Type: DB_BigInt, Nullable: true},
+			{Name: "value_big_int", Type: DB_BigInt, Nullable: true},
 			{Name: "value_double", Type: DB_Double, Nullable: true},
 			{Name: "value_double", Type: DB_Double, Nullable: true},
 			{Name: "value_float", Type: DB_Float, Nullable: true},
 			{Name: "value_float", Type: DB_Float, Nullable: true},
 			{Name: "value_int", Type: DB_Int, Nullable: true},
 			{Name: "value_int", Type: DB_Int, Nullable: true},

pkg/services/sqlstore/sql_test_data.go

 package sqlstore
 package sqlstore
 
 
 import (
 import (
+	"time"
+
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/bus"
 	m "github.com/grafana/grafana/pkg/models"
 	m "github.com/grafana/grafana/pkg/models"
 )
 )
@@ -12,10 +14,17 @@ func init() {
 func InsertSqlTestData(cmd *m.InsertSqlTestDataCommand) error {
 func InsertSqlTestData(cmd *m.InsertSqlTestDataCommand) error {
 	return inTransaction2(func(sess *session) error {
 	return inTransaction2(func(sess *session) error {
 
 
-		// create user
-		user := &m.SqlTestData{}
+		row := &m.SqlTestData{
+			Metric1:      "server1",
+			Metric2:      "frontend",
+			ValueBigInt:  123123,
+			ValueDouble:  3.14159265359,
+			ValueFloat:   3.14159265359,
+			TimeEpoch:    time.Now().Unix(),
+			TimeDateTime: time.Now(),
+		}
 
 
-		if _, err := sess.Insert(user); err != nil {
+		if _, err := sess.Table("test_data").Insert(row); err != nil {
 			return err
 			return err
 		}
 		}