From 9aa03acfa691ffa7573ed970aefe12745975a18a Mon Sep 17 00:00:00 2001 From: Ryan McKinley Date: Tue, 7 Sep 2021 16:35:52 -0700 Subject: [PATCH] Chore: remove sql testdata (#38945) --- pkg/api/api.go | 1 - pkg/api/metrics.go | 10 ---- pkg/models/test_data.go | 18 ------- pkg/services/sqlstore/sql_test_data.go | 67 -------------------------- 4 files changed, 96 deletions(-) delete mode 100644 pkg/models/test_data.go delete mode 100644 pkg/services/sqlstore/sql_test_data.go diff --git a/pkg/api/api.go b/pkg/api/api.go index 2c88f5114be..4b9e6d9708c 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -370,7 +370,6 @@ func (hs *HTTPServer) registerRoutes() { // metrics apiRoute.Post("/tsdb/query", bind(dtos.MetricRequest{}), routing.Wrap(hs.QueryMetrics)) - apiRoute.Get("/tsdb/testdata/gensql", reqGrafanaAdmin, routing.Wrap(GenerateSQLTestData)) apiRoute.Get("/tsdb/testdata/random-walk", routing.Wrap(hs.GetTestDataRandomWalk)) // DataSource w/ expressions diff --git a/pkg/api/metrics.go b/pkg/api/metrics.go index 6a60543fa46..563ceb1615b 100644 --- a/pkg/api/metrics.go +++ b/pkg/api/metrics.go @@ -8,7 +8,6 @@ import ( "github.com/grafana/grafana-plugin-sdk-go/backend" "github.com/grafana/grafana/pkg/api/dtos" "github.com/grafana/grafana/pkg/api/response" - "github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/expr" "github.com/grafana/grafana/pkg/models" @@ -214,15 +213,6 @@ func (hs *HTTPServer) QueryMetrics(c *models.ReqContext, reqDto dtos.MetricReque return response.JSON(statusCode, &resp) } -// GET /api/tsdb/testdata/gensql -func GenerateSQLTestData(c *models.ReqContext) response.Response { - if err := bus.Dispatch(&models.InsertSQLTestDataCommand{}); err != nil { - return response.Error(500, "Failed to insert test data", err) - } - - return response.JSON(200, &util.DynMap{"message": "OK"}) -} - // GET /api/tsdb/testdata/random-walk func (hs *HTTPServer) GetTestDataRandomWalk(c *models.ReqContext) response.Response { from := c.Query("from") diff --git a/pkg/models/test_data.go b/pkg/models/test_data.go deleted file mode 100644 index 1ed34dce99b..00000000000 --- a/pkg/models/test_data.go +++ /dev/null @@ -1,18 +0,0 @@ -package models - -import "time" - -type InsertSQLTestDataCommand struct { -} - -type SQLTestData struct { - Id int64 - Metric1 string - Metric2 string - ValueBigInt int64 - ValueDouble float64 - ValueFloat float32 - ValueInt int - TimeEpoch int64 - TimeDateTime time.Time -} diff --git a/pkg/services/sqlstore/sql_test_data.go b/pkg/services/sqlstore/sql_test_data.go deleted file mode 100644 index 83164d9c4e2..00000000000 --- a/pkg/services/sqlstore/sql_test_data.go +++ /dev/null @@ -1,67 +0,0 @@ -package sqlstore - -import ( - "math/rand" - "time" - - "github.com/grafana/grafana/pkg/bus" - "github.com/grafana/grafana/pkg/models" -) - -func init() { - bus.AddHandler("sql", InsertSQLTestData) -} - -func sqlRandomWalk(m1 string, m2 string, intWalker int64, floatWalker float64, sess *DBSession) error { - timeWalker := time.Now().UTC().Add(time.Hour * -200) - now := time.Now().UTC() - step := time.Minute - - row := &models.SQLTestData{ - Metric1: m1, - Metric2: m2, - TimeEpoch: timeWalker.Unix(), - TimeDateTime: timeWalker, - } - - for timeWalker.Unix() < now.Unix() { - timeWalker = timeWalker.Add(step) - - row.Id = 0 - row.ValueBigInt += rand.Int63n(200) - 100 - row.ValueDouble += rand.Float64() - 0.5 - row.ValueFloat += rand.Float32() - 0.5 - row.TimeEpoch = timeWalker.Unix() - row.TimeDateTime = timeWalker - - sqlog.Info("Writing SQL test data row") - if _, err := sess.Table("test_data").Insert(row); err != nil { - return err - } - } - - return nil -} - -func InsertSQLTestData(cmd *models.InsertSQLTestDataCommand) error { - return inTransaction(func(sess *DBSession) error { - var err error - - sqlog.Info("SQL TestData: Clearing previous test data") - res, err := sess.Exec("TRUNCATE test_data") - if err != nil { - return err - } - - rows, _ := res.RowsAffected() - sqlog.Info("SQL TestData: Truncate done", "rows", rows) - - if err := sqlRandomWalk("server1", "frontend", 100, 1.123, sess); err != nil { - return err - } - if err := sqlRandomWalk("server2", "frontend", 100, 1.123, sess); err != nil { - return err - } - return sqlRandomWalk("server3", "frontend", 100, 1.123, sess) - }) -}