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.
140 lines
4.4 KiB
Go
140 lines
4.4 KiB
Go
package sqlmigration
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
|
|
"github.com/hanzoai/o11y/pkg/factory"
|
|
"github.com/hanzoai/o11y/pkg/sqlstore"
|
|
"github.com/hanzoai/o11y/pkg/types/authtypes"
|
|
"github.com/oklog/ulid/v2"
|
|
"github.com/uptrace/bun"
|
|
"github.com/uptrace/bun/dialect"
|
|
"github.com/uptrace/bun/migrate"
|
|
)
|
|
|
|
type addRoleCRUDTuples struct {
|
|
sqlstore sqlstore.SQLStore
|
|
}
|
|
|
|
func NewAddRoleCRUDTuplesFactory(sqlstore sqlstore.SQLStore) factory.ProviderFactory[SQLMigration, Config] {
|
|
return factory.NewProviderFactory(factory.MustNewName("add_role_crud_tuples"), func(ctx context.Context, ps factory.ProviderSettings, c Config) (SQLMigration, error) {
|
|
return &addRoleCRUDTuples{sqlstore: sqlstore}, nil
|
|
})
|
|
}
|
|
|
|
func (migration *addRoleCRUDTuples) Register(migrations *migrate.Migrations) error {
|
|
return migrations.Register(migration.Up, migration.Down)
|
|
}
|
|
|
|
func (migration *addRoleCRUDTuples) Up(ctx context.Context, db *bun.DB) error {
|
|
tx, err := db.BeginTx(ctx, nil)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer func() { _ = tx.Rollback() }()
|
|
|
|
var storeID string
|
|
err = tx.QueryRowContext(ctx, `SELECT id FROM store WHERE name = ? LIMIT 1`, "o11y").Scan(&storeID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
var orgIDs []string
|
|
rows, err := tx.QueryContext(ctx, `SELECT id FROM organizations`)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer rows.Close()
|
|
for rows.Next() {
|
|
var orgID string
|
|
if err := rows.Scan(&orgID); err != nil {
|
|
return err
|
|
}
|
|
orgIDs = append(orgIDs, orgID)
|
|
}
|
|
|
|
isPG := migration.sqlstore.BunDB().Dialect().Name() == dialect.PG
|
|
|
|
// Migration 081 moved role tuples from "metaresources" to "role" type but
|
|
// only inserted create and list. The read, update, and delete tuples were
|
|
// lost in the migration. Re-add them here.
|
|
tuples := []migrationTuple{
|
|
{authtypes.O11yAdminRoleName, "role", "role", "read"},
|
|
{authtypes.O11yAdminRoleName, "role", "role", "update"},
|
|
{authtypes.O11yAdminRoleName, "role", "role", "delete"},
|
|
}
|
|
|
|
for _, orgID := range orgIDs {
|
|
for _, tuple := range tuples {
|
|
entropy := ulid.DefaultEntropy()
|
|
now := time.Now().UTC()
|
|
tupleID := ulid.MustNew(ulid.Timestamp(now), entropy).String()
|
|
|
|
objectID := "organization/" + orgID + "/" + tuple.objectName + "/*"
|
|
roleSubject := "organization/" + orgID + "/role/" + tuple.roleName
|
|
|
|
if isPG {
|
|
user := "role:" + roleSubject + "#assignee"
|
|
result, err := tx.ExecContext(ctx, `
|
|
INSERT INTO tuple (store, object_type, object_id, relation, _user, user_type, ulid, inserted_at)
|
|
VALUES (?, ?, ?, ?, ?, ?, ?, ?)
|
|
ON CONFLICT (store, object_type, object_id, relation, _user) DO NOTHING`,
|
|
storeID, tuple.objectType, objectID, tuple.relation, user, "userset", tupleID, now,
|
|
)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
rowsAffected, err := result.RowsAffected()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if rowsAffected == 0 {
|
|
continue
|
|
}
|
|
_, err = tx.ExecContext(ctx, `
|
|
INSERT INTO changelog (store, object_type, object_id, relation, _user, operation, ulid, inserted_at)
|
|
VALUES (?, ?, ?, ?, ?, ?, ?, ?)
|
|
ON CONFLICT (store, ulid, object_type) DO NOTHING`,
|
|
storeID, tuple.objectType, objectID, tuple.relation, user, "TUPLE_OPERATION_WRITE", tupleID, now,
|
|
)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
} else {
|
|
result, err := tx.ExecContext(ctx, `
|
|
INSERT INTO tuple (store, object_type, object_id, relation, user_object_type, user_object_id, user_relation, user_type, ulid, inserted_at)
|
|
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
|
ON CONFLICT (store, object_type, object_id, relation, user_object_type, user_object_id, user_relation) DO NOTHING`,
|
|
storeID, tuple.objectType, objectID, tuple.relation, "role", roleSubject, "assignee", "userset", tupleID, now,
|
|
)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
rowsAffected, err := result.RowsAffected()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if rowsAffected == 0 {
|
|
continue
|
|
}
|
|
_, err = tx.ExecContext(ctx, `
|
|
INSERT INTO changelog (store, object_type, object_id, relation, user_object_type, user_object_id, user_relation, operation, ulid, inserted_at)
|
|
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
|
ON CONFLICT (store, ulid, object_type) DO NOTHING`,
|
|
storeID, tuple.objectType, objectID, tuple.relation, "role", roleSubject, "assignee", 0, tupleID, now,
|
|
)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return tx.Commit()
|
|
}
|
|
|
|
func (migration *addRoleCRUDTuples) Down(context.Context, *bun.DB) error {
|
|
return nil
|
|
}
|