jcoffey-dev
13cf9a30cb
Full rebrand across cosmetic branding, code identifiers, and infrastructure/data-plane naming, using the supplied Cairn OBS logo package. Cosmetic: favicon/logo swap (also closes a stale license-audit finding -- the old favicon was SvelteKit's unreplaced scaffold logo), new centered welcome landing page, larger/legible sidebar logo, page titles, CLAUDE.md/README/docs prose. Code identifiers: Go module path github.com/sentry/sentry -> github.com/cairnobs/cairnobs across all 13 modules and ~91 files (protoc regenerated); Rust crates sentry-agent/sentry-parser/sentry-search -> cairnobs-*; CLI sentryctl -> cairnobsctl; Terraform provider fully renamed (sentry_dashboard etc. -> cairnobs_dashboard, provider type, env vars); every session/auth cookie name; agent config paths and Windows service identity. Deliberately preserved: the gRPC wire protocol's protobuf packages (sentry.logs.v1, sentry.agent.v1) and their Go import directory (proto/sentry/...) -- renaming the wire-level package would break every currently-deployed agent binary (confirmed two real hosts, including mail.inbuxa.com, are actively streaming through this exact contract) until rebuilt and redeployed in lockstep with an ingest cutover. Only the Go module path wrapping the generated code changes. Infrastructure: every docker-compose container name (root and three component-level compose files); the Helm chart (directory, Chart.yaml, named-template helpers, all templates, values.yaml image repos); Kubernetes Operator (CRD group sentry.io -> cairnobs.io, both CRD YAML files, Go identifiers, RBAC markers); the coupled enterprise/tenantcrd package. Caught and fixed real path-coupling bugs along the way: the Helm chart's search/ingest volume mounts and the dev-only-credential detection constant vs. docker-compose.yml's literal values had to move together or a security warning would have silently stopped firing. Data plane: Postgres database sentry_metadata -> cairnobs_metadata and role sentry -> cairnobs; ClickHouse database sentry -> cairnobs; Kafka topic sentry.logs.raw -> cairnobs.logs.raw and its consumer groups. Source-level defaults, docker-compose.yml, and every migrate.sh/ provision script default updated together; already-applied migration files left untouched per this repo's immutable-migration convention. Verified at every layer: all 13 Go modules build/vet/test clean, both Rust workspaces (agent, search) build/clippy/test clean, npm run check/ build clean, docker compose config validates on all four compose files. Live-verified against a real docker stack multiple times through this work, including a final fresh-volume run confirming the actual renamed Postgres database/role, ClickHouse database, and Kafka topic all work end to end with a real login and query, zero console errors.
83 lines
2.7 KiB
Go
83 lines
2.7 KiB
Go
// Package clickhousewriter batch-inserts normalized log rows into
|
|
// ClickHouse using the native protocol driver's batch API. Moved out of
|
|
// internal/ (was ingest/internal/clickhousewriter) once
|
|
// enterprise/internal/chwriter needed to construct one *Writer per
|
|
// tenant -- same reasoning api/internal/dashboards and friends moved out
|
|
// of internal/ earlier in Phase 4: Go's compiler-enforced internal/
|
|
// visibility blocks a separate module (enterprise/) from importing
|
|
// anything under ingest/internal/..., independent of licensing --
|
|
// both modules are AGPLv3 as of Phase 6, and this was always an
|
|
// import-graph constraint, not a license one.
|
|
package clickhousewriter
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"github.com/ClickHouse/clickhouse-go/v2"
|
|
"github.com/ClickHouse/clickhouse-go/v2/lib/driver"
|
|
|
|
"github.com/cairnobs/cairnobs/ingest/internal/normalize"
|
|
logsv1 "github.com/cairnobs/cairnobs/proto/sentry/logs/v1"
|
|
)
|
|
|
|
// Config is deliberately a local type, not ingest/internal/config.
|
|
// ClickHouseConfig -- this package needs to be importable from
|
|
// enterprise/ (see the package doc comment), and internal/config must
|
|
// stay internal (nothing outside ingest/ needs its other fields, e.g.
|
|
// TLSConfig/GRPCConfig, and moving the whole package out just for this
|
|
// one struct would be a wider hole than necessary). Same "narrow local
|
|
// type, not the storage/config type itself" precedent as
|
|
// enterprise/internal/chrunner.DataSource.
|
|
type Config struct {
|
|
Addr string
|
|
Database string
|
|
Username string
|
|
Password string
|
|
}
|
|
|
|
type Writer struct {
|
|
conn driver.Conn
|
|
}
|
|
|
|
func New(ctx context.Context, cfg Config) (*Writer, error) {
|
|
conn, err := clickhouse.Open(&clickhouse.Options{
|
|
Addr: []string{cfg.Addr},
|
|
Auth: clickhouse.Auth{
|
|
Database: cfg.Database,
|
|
Username: cfg.Username,
|
|
Password: cfg.Password,
|
|
},
|
|
})
|
|
if err != nil {
|
|
return nil, fmt.Errorf("opening clickhouse connection: %w", err)
|
|
}
|
|
if err := conn.Ping(ctx); err != nil {
|
|
return nil, fmt.Errorf("pinging clickhouse: %w", err)
|
|
}
|
|
return &Writer{conn: conn}, nil
|
|
}
|
|
|
|
func (w *Writer) Close() error {
|
|
return w.conn.Close()
|
|
}
|
|
|
|
func (w *Writer) WriteBatch(ctx context.Context, records []*logsv1.LogRecord) error {
|
|
batch, err := w.conn.PrepareBatch(ctx, "INSERT INTO logs (timestamp, host, service, severity, message, attributes, record_id)")
|
|
if err != nil {
|
|
return fmt.Errorf("preparing batch: %w", err)
|
|
}
|
|
|
|
for _, rec := range records {
|
|
row := normalize.ToRow(rec)
|
|
if err := batch.Append(row.Timestamp, row.Host, row.Service, row.Severity, row.Message, row.Attributes, row.RecordID); err != nil {
|
|
return fmt.Errorf("appending row to batch: %w", err)
|
|
}
|
|
}
|
|
|
|
if err := batch.Send(); err != nil {
|
|
return fmt.Errorf("sending batch: %w", err)
|
|
}
|
|
return nil
|
|
}
|