mirror of
https://github.com/hanzoai/o11y.git
synced 2026-10-15 12:58:33 +00:00
* debrand: signoz/SigNoz/SIGNOZ -> o11y/O11y/O11Y across the tree Rename all SigNoz *branding* to O11y in file contents, file/dir names, package names, env vars, config keys, comments, docs, SDK code, and the ClickHouse schema identifiers the querier reads. Collector dependency: - Repoint github.com/hanzoai/signoz-otel-collector -> github.com/hanzoai/otel-collector and bump v0.144.6 -> v0.144.7 (go.mod + go.sum reconciled via go mod tidy). Internal package paths also debranded upstream: signozschemamigrator -> o11yschemamigrator, signozlogspipelineprocessor -> o11ylogspipelineprocessor. - Fix: v0.144.7 dropped otelconst.DistributedFieldKeysTable from the collector's public constants; pin FieldKeysTable = "distributed_field_keys" locally in pkg/telemetrymetadata/tables.go. Package/dir renames (package decl + all importers): pkg/apiserver/signozapiserver -> o11yapiserver, plus signozalertmanager, signozauthzapi, signozglobal, signozquerier, signozruler, and pkg/signoz -> pkg/o11y. Schema (read plane): signoz_traces/metrics/logs/metadata/analytics/meter and signoz_index_v3/index_v2/error_index_v2/spans (+ distributed_*) -> o11y_*. Data-preserving cutover migration added: deploy/clickhouse/migrations/0001_rename_signoz_to_o11y.sql (metadata-only RENAME DATABASE/TABLE, no drop/recreate). Preserved (attribution / external / wire contracts): - LICENSE + NOTICE verbatim (incl. "software from SigNoz", "Copyright ... SigNoz Inc."). - Upstream github.com/SigNoz/* repo URLs + @SigNoz/* CODEOWNERS teams. - Billing resource-attribute regex "signoz.workspace.*" (external wire contract). go build ./pkg/... ./cmd/... = 0; gofmt clean; renamed+schema pkg tests pass. * o11y: bump collector to v0.144.8 (o11y_* physical schema writer) + lockstep deploy plan Collector v0.144.8's schema-migrator + exporters now CREATE/WRITE the same o11y_* physical databases/tables the querier reads and the RENAME migration (0001_rename_signoz_to_o11y.sql) targets. Cross-checked byte-identical: writer DB set == migration target DB set (6); writer prefixed-table set == migration target table set (8); o11y querier reads and cloud reads are subsets of that set. Zero table-name mismatches between writer, readers, and migration. Collector go.mod unchanged between v0.144.7 and v0.144.8 (identical go.mod hash) — pure source rename, no module-graph change. Adds deploy/clickhouse/DEPLOY_signoz_to_o11y_cutover.md: the lockstep order (collector v0.144.8 -> RENAME migration -> o11y+cloud readers) with a fresh/scratch-ClickHouse pre-flight (create via migrator, emit trace+metric, query back) and rollback. Ships together or telemetry blackholes. go build ./pkg/... ./cmd/community = 0.
196 lines
4.7 KiB
Go
196 lines
4.7 KiB
Go
package sqlmigration
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
|
|
"github.com/hanzoai/o11y/pkg/factory"
|
|
"github.com/hanzoai/o11y/pkg/sqlschema"
|
|
"github.com/hanzoai/o11y/pkg/sqlstore"
|
|
"github.com/hanzoai/o11y/pkg/types"
|
|
"github.com/hanzoai/o11y/pkg/valuer"
|
|
"github.com/uptrace/bun"
|
|
"github.com/uptrace/bun/migrate"
|
|
)
|
|
|
|
var (
|
|
userRoleToO11yManagedRoleMap = map[string]string{
|
|
"ADMIN": "o11y-admin",
|
|
"EDITOR": "o11y-editor",
|
|
"VIEWER": "o11y-viewer",
|
|
}
|
|
)
|
|
|
|
type userRow struct {
|
|
ID string `bun:"id"`
|
|
Role string `bun:"role"`
|
|
OrgID string `bun:"org_id"`
|
|
}
|
|
|
|
type roleRow struct {
|
|
ID string `bun:"id"`
|
|
Name string `bun:"name"`
|
|
OrgID string `bun:"org_id"`
|
|
}
|
|
|
|
type orgRoleKey struct {
|
|
OrgID string
|
|
RoleName string
|
|
}
|
|
|
|
type addUserRole struct {
|
|
sqlstore sqlstore.SQLStore
|
|
sqlschema sqlschema.SQLSchema
|
|
}
|
|
|
|
type userRoleRow struct {
|
|
bun.BaseModel `bun:"table:user_role"`
|
|
|
|
types.Identifiable
|
|
UserID string `bun:"user_id"`
|
|
RoleID string `bun:"role_id"`
|
|
types.TimeAuditable
|
|
}
|
|
|
|
func NewAddUserRoleFactory(sqlstore sqlstore.SQLStore, sqlschema sqlschema.SQLSchema) factory.ProviderFactory[SQLMigration, Config] {
|
|
return factory.NewProviderFactory(factory.MustNewName("add_user_role"), func(ctx context.Context, ps factory.ProviderSettings, c Config) (SQLMigration, error) {
|
|
return &addUserRole{
|
|
sqlstore: sqlstore,
|
|
sqlschema: sqlschema,
|
|
}, nil
|
|
})
|
|
}
|
|
|
|
func (migration *addUserRole) Register(migrations *migrate.Migrations) error {
|
|
if err := migrations.Register(migration.Up, migration.Down); err != nil {
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (migration *addUserRole) Up(ctx context.Context, db *bun.DB) error {
|
|
tx, err := db.BeginTx(ctx, nil)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
defer func() {
|
|
_ = tx.Rollback()
|
|
}()
|
|
|
|
sqls := [][]byte{}
|
|
|
|
tableSQLs := migration.sqlschema.Operator().CreateTable(&sqlschema.Table{
|
|
Name: "user_role",
|
|
Columns: []*sqlschema.Column{
|
|
{Name: "id", DataType: sqlschema.DataTypeText, Nullable: false},
|
|
{Name: "user_id", DataType: sqlschema.DataTypeText, Nullable: false},
|
|
{Name: "role_id", DataType: sqlschema.DataTypeText, Nullable: false},
|
|
{Name: "created_at", DataType: sqlschema.DataTypeTimestamp, Nullable: false},
|
|
{Name: "updated_at", DataType: sqlschema.DataTypeTimestamp, Nullable: false},
|
|
},
|
|
PrimaryKeyConstraint: &sqlschema.PrimaryKeyConstraint{
|
|
ColumnNames: []sqlschema.ColumnName{"id"},
|
|
},
|
|
ForeignKeyConstraints: []*sqlschema.ForeignKeyConstraint{
|
|
{
|
|
ReferencingColumnName: sqlschema.ColumnName("user_id"),
|
|
ReferencedTableName: sqlschema.TableName("users"),
|
|
ReferencedColumnName: sqlschema.ColumnName("id"),
|
|
},
|
|
{
|
|
ReferencingColumnName: sqlschema.ColumnName("role_id"),
|
|
ReferencedTableName: sqlschema.TableName("role"),
|
|
ReferencedColumnName: sqlschema.ColumnName("id"),
|
|
},
|
|
},
|
|
})
|
|
|
|
sqls = append(sqls, tableSQLs...)
|
|
|
|
indexSQLs := migration.sqlschema.Operator().CreateIndex(
|
|
&sqlschema.UniqueIndex{
|
|
TableName: "user_role",
|
|
ColumnNames: []sqlschema.ColumnName{"user_id", "role_id"},
|
|
},
|
|
)
|
|
|
|
sqls = append(sqls, indexSQLs...)
|
|
|
|
for _, sql := range sqls {
|
|
if _, err := tx.ExecContext(ctx, string(sql)); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
// fill the new user_role table for existing users
|
|
var users []userRow
|
|
err = tx.NewSelect().TableExpr("users").ColumnExpr("id, role, org_id").Scan(ctx, &users)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if len(users) == 0 {
|
|
return tx.Commit()
|
|
}
|
|
|
|
orgIDs := make(map[string]struct{})
|
|
for _, u := range users {
|
|
orgIDs[u.OrgID] = struct{}{}
|
|
}
|
|
|
|
orgIDList := make([]string, 0, len(orgIDs))
|
|
for oid := range orgIDs {
|
|
orgIDList = append(orgIDList, oid)
|
|
}
|
|
|
|
var roles []roleRow
|
|
err = tx.NewSelect().TableExpr("role").ColumnExpr("id, name, org_id").Where("org_id IN (?)", bun.In(orgIDList)).Scan(ctx, &roles)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
roleMap := make(map[orgRoleKey]string)
|
|
for _, r := range roles {
|
|
roleMap[orgRoleKey{OrgID: r.OrgID, RoleName: r.Name}] = r.ID
|
|
}
|
|
|
|
now := time.Now()
|
|
userRoles := make([]*userRoleRow, 0, len(users))
|
|
for _, u := range users {
|
|
managedRoleName, ok := userRoleToO11yManagedRoleMap[u.Role]
|
|
if !ok {
|
|
managedRoleName = "o11y-viewer" // fallback
|
|
}
|
|
|
|
roleID := roleMap[orgRoleKey{OrgID: u.OrgID, RoleName: managedRoleName}]
|
|
|
|
userRoles = append(userRoles, &userRoleRow{
|
|
Identifiable: types.Identifiable{ID: valuer.GenerateUUID()},
|
|
UserID: u.ID,
|
|
RoleID: roleID,
|
|
TimeAuditable: types.TimeAuditable{
|
|
CreatedAt: now,
|
|
UpdatedAt: now,
|
|
},
|
|
})
|
|
}
|
|
|
|
if len(userRoles) > 0 {
|
|
if _, err := tx.NewInsert().Model(&userRoles).Exec(ctx); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
if err := tx.Commit(); err != nil {
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (migration *addUserRole) Down(ctx context.Context, db *bun.DB) error {
|
|
return nil
|
|
}
|