From dbd519c12178a6d0476f30d3710f85ae53be27c0 Mon Sep 17 00:00:00 2001 From: Tyler Koenig Date: Fri, 19 Jun 2026 20:37:42 -0400 Subject: [PATCH] fix: 4 additional release-consistency findings - Disable healthcheck on probe compose services (no HTTP server) - Remove stale "(Phase 4)" comment from dev compose - Add data/ to .gitignore (compose volume creates deploy/data) - Clarify -db-type flag help text (sqlite or postgres) --- .gitignore | 1 + cmd/uptop/main.go | 8 ++++---- deploy/docker-compose.dev.yml | 2 +- deploy/docker-compose.probe.yml | 4 ++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 9037dde..9a45e2f 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,5 @@ authorized_keys tmp *.local.json *.local.md +data/ .env diff --git a/cmd/uptop/main.go b/cmd/uptop/main.go index 9449382..a0cee96 100644 --- a/cmd/uptop/main.go +++ b/cmd/uptop/main.go @@ -206,7 +206,7 @@ func runApply(args []string) { filePath := fs.String("f", "", "Path to YAML config file (required)") dryRun := fs.Bool("dry-run", false, "Show planned changes without applying") prune := fs.Bool("prune", false, "Delete monitors/alerts not in YAML") - dbType := fs.String("db-type", envOrDefault("UPTOP_DB_TYPE", "sqlite"), "Database type") + dbType := fs.String("db-type", envOrDefault("UPTOP_DB_TYPE", "sqlite"), "Database type (sqlite or postgres)") dsn := fs.String("dsn", envOrDefault("UPTOP_DB_DSN", "uptop.db"), "Database DSN") _ = fs.Parse(args) // ExitOnError: parse errors exit before returning @@ -239,7 +239,7 @@ func runApply(args []string) { func runExport(args []string) { fs := flag.NewFlagSet("export", flag.ExitOnError) outPath := fs.String("o", "-", "Output file path (- for stdout)") - dbType := fs.String("db-type", envOrDefault("UPTOP_DB_TYPE", "sqlite"), "Database type") + dbType := fs.String("db-type", envOrDefault("UPTOP_DB_TYPE", "sqlite"), "Database type (sqlite or postgres)") dsn := fs.String("dsn", envOrDefault("UPTOP_DB_DSN", "uptop.db"), "Database DSN") _ = fs.Parse(args) // ExitOnError: parse errors exit before returning @@ -259,7 +259,7 @@ func runExport(args []string) { func runMigrateSecrets(args []string) { fs := flag.NewFlagSet("migrate-secrets", flag.ExitOnError) - dbType := fs.String("db-type", envOrDefault("UPTOP_DB_TYPE", "sqlite"), "Database type") + dbType := fs.String("db-type", envOrDefault("UPTOP_DB_TYPE", "sqlite"), "Database type (sqlite or postgres)") dsn := fs.String("dsn", envOrDefault("UPTOP_DB_DSN", "uptop.db"), "Database DSN") _ = fs.Parse(args) @@ -351,7 +351,7 @@ func runServe(args []string) { fs := flag.NewFlagSet("serve", flag.ExitOnError) port := fs.Int("port", cfg.Port, "SSH Port") - flagDBType := fs.String("db-type", cfg.DBType, "Database type") + flagDBType := fs.String("db-type", cfg.DBType, "Database type (sqlite or postgres)") flagDSN := fs.String("dsn", cfg.DBDSN, "Database DSN") demo := fs.Bool("demo", false, "Seed demo data") importKuma := fs.String("import-kuma", "", "Import Uptime Kuma backup JSON file") diff --git a/deploy/docker-compose.dev.yml b/deploy/docker-compose.dev.yml index befccbf..1fbed79 100644 --- a/deploy/docker-compose.dev.yml +++ b/deploy/docker-compose.dev.yml @@ -13,7 +13,7 @@ services: - UPTOP_DB_TYPE=postgres - UPTOP_DB_DSN=postgres://devuser:devpass@postgres:5432/uptop_dev?sslmode=disable - # --- Web Server Configuration (Phase 4) --- + # --- Web Server Configuration --- - UPTOP_HTTP_PORT=8080 - UPTOP_STATUS_ENABLED=true - UPTOP_STATUS_TITLE=Dev Infrastructure Status diff --git a/deploy/docker-compose.probe.yml b/deploy/docker-compose.probe.yml index d0d5bc6..956effc 100644 --- a/deploy/docker-compose.probe.yml +++ b/deploy/docker-compose.probe.yml @@ -14,6 +14,8 @@ services: probe-us-east: image: lerkolabs/uptop:latest + healthcheck: + disable: true environment: - UPTOP_CLUSTER_MODE=probe - UPTOP_NODE_ID=us-east-1 @@ -26,6 +28,8 @@ services: probe-eu-west: image: lerkolabs/uptop:latest + healthcheck: + disable: true environment: - UPTOP_CLUSTER_MODE=probe - UPTOP_NODE_ID=eu-west-1