From 644135a933aa7b8ba5e145928cfc4337f7ea3516 Mon Sep 17 00:00:00 2001 From: Nityananda Gohain Date: Mon, 20 Jan 2025 17:09:55 +0530 Subject: [PATCH] fix: remove analytics schema migrations (#6856) --- ee/query-service/app/server.go | 8 --- pkg/query-service/app/server.go | 8 --- pkg/query-service/migrate/migate.go | 90 ----------------------------- 3 files changed, 106 deletions(-) diff --git a/ee/query-service/app/server.go b/ee/query-service/app/server.go index e93c09fb68..93f2b90562 100644 --- a/ee/query-service/app/server.go +++ b/ee/query-service/app/server.go @@ -30,7 +30,6 @@ import ( "go.signoz.io/signoz/ee/query-service/interfaces" "go.signoz.io/signoz/ee/query-service/rules" baseauth "go.signoz.io/signoz/pkg/query-service/auth" - "go.signoz.io/signoz/pkg/query-service/migrate" v3 "go.signoz.io/signoz/pkg/query-service/model/v3" "go.signoz.io/signoz/pkg/signoz" "go.signoz.io/signoz/pkg/web" @@ -202,13 +201,6 @@ func NewServer(serverOptions *ServerOptions) (*Server, error) { return nil, err } - go func() { - err = migrate.ClickHouseMigrate(reader.GetConn(), serverOptions.Cluster) - if err != nil { - zap.L().Error("error while running clickhouse migrations", zap.Error(err)) - } - }() - // initiate opamp _, err = opAmpModel.InitDB(localDB) if err != nil { diff --git a/pkg/query-service/app/server.go b/pkg/query-service/app/server.go index 92b01548ff..98a135d788 100644 --- a/pkg/query-service/app/server.go +++ b/pkg/query-service/app/server.go @@ -33,7 +33,6 @@ import ( opAmpModel "go.signoz.io/signoz/pkg/query-service/app/opamp/model" "go.signoz.io/signoz/pkg/query-service/app/preferences" "go.signoz.io/signoz/pkg/query-service/common" - "go.signoz.io/signoz/pkg/query-service/migrate" v3 "go.signoz.io/signoz/pkg/query-service/model/v3" "go.signoz.io/signoz/pkg/query-service/app/explorer" @@ -166,13 +165,6 @@ func NewServer(serverOptions *ServerOptions) (*Server, error) { return nil, err } - go func() { - err = migrate.ClickHouseMigrate(reader.GetConn(), serverOptions.Cluster) - if err != nil { - zap.L().Error("error while running clickhouse migrations", zap.Error(err)) - } - }() - fluxInterval, err := time.ParseDuration(serverOptions.FluxInterval) if err != nil { return nil, err diff --git a/pkg/query-service/migrate/migate.go b/pkg/query-service/migrate/migate.go index 2db7243f58..d6d90e2168 100644 --- a/pkg/query-service/migrate/migate.go +++ b/pkg/query-service/migrate/migate.go @@ -1,11 +1,8 @@ package migrate import ( - "context" "database/sql" - "fmt" - "github.com/ClickHouse/clickhouse-go/v2/lib/driver" "github.com/jmoiron/sqlx" ) @@ -55,90 +52,3 @@ func Migrate(dsn string) error { return nil } - -func ClickHouseMigrate(conn driver.Conn, cluster string) error { - - database := "CREATE DATABASE IF NOT EXISTS signoz_analytics ON CLUSTER %s" - - localTable := `CREATE TABLE IF NOT EXISTS signoz_analytics.rule_state_history_v0 ON CLUSTER %s -( - _retention_days UInt32 DEFAULT 180, - rule_id LowCardinality(String), - rule_name LowCardinality(String), - overall_state LowCardinality(String), - overall_state_changed Bool, - state LowCardinality(String), - state_changed Bool, - unix_milli Int64 CODEC(Delta(8), ZSTD(1)), - fingerprint UInt64 CODEC(ZSTD(1)), - value Float64 CODEC(Gorilla, ZSTD(1)), - labels String CODEC(ZSTD(5)), -) -ENGINE = MergeTree -PARTITION BY toDate(unix_milli / 1000) -ORDER BY (rule_id, unix_milli) -TTL toDateTime(unix_milli / 1000) + toIntervalDay(_retention_days) -SETTINGS ttl_only_drop_parts = 1, index_granularity = 8192` - - distributedTable := `CREATE TABLE IF NOT EXISTS signoz_analytics.distributed_rule_state_history_v0 ON CLUSTER %s -( - rule_id LowCardinality(String), - rule_name LowCardinality(String), - overall_state LowCardinality(String), - overall_state_changed Bool, - state LowCardinality(String), - state_changed Bool, - unix_milli Int64 CODEC(Delta(8), ZSTD(1)), - fingerprint UInt64 CODEC(ZSTD(1)), - value Float64 CODEC(Gorilla, ZSTD(1)), - labels String CODEC(ZSTD(5)), -) -ENGINE = Distributed(%s, signoz_analytics, rule_state_history_v0, cityHash64(rule_id, rule_name, fingerprint))` - - // check if db exists - dbExists := `SELECT count(*) FROM system.databases WHERE name = 'signoz_analytics'` - var count uint64 - err := conn.QueryRow(context.Background(), dbExists).Scan(&count) - if err != nil { - return err - } - - if count == 0 { - err = conn.Exec(context.Background(), fmt.Sprintf(database, cluster)) - if err != nil { - return err - } - } - - // check if table exists - tableExists := `SELECT count(*) FROM system.tables WHERE name = 'rule_state_history_v0' AND database = 'signoz_analytics'` - var tableCount uint64 - err = conn.QueryRow(context.Background(), tableExists).Scan(&tableCount) - if err != nil { - return err - } - - if tableCount == 0 { - err = conn.Exec(context.Background(), fmt.Sprintf(localTable, cluster)) - if err != nil { - return err - } - } - - // check if distributed table exists - distributedTableExists := `SELECT count(*) FROM system.tables WHERE name = 'distributed_rule_state_history_v0' AND database = 'signoz_analytics'` - var distributedTableCount uint64 - err = conn.QueryRow(context.Background(), distributedTableExists).Scan(&distributedTableCount) - if err != nil { - return err - } - - if distributedTableCount == 0 { - err = conn.Exec(context.Background(), fmt.Sprintf(distributedTable, cluster, cluster)) - if err != nil { - return err - } - } - - return nil -}