From 65f521dce010a097f2a54b0c809098ed8ecd9cb9 Mon Sep 17 00:00:00 2001 From: orion Date: Sat, 4 Apr 2026 07:53:34 +0000 Subject: [PATCH] feat: support monitor cli override flags --- cmd/harborforge-monitor/main.go | 24 +++++++++++++++++++++- internal/config/config.go | 36 +++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 1 deletion(-) diff --git a/cmd/harborforge-monitor/main.go b/cmd/harborforge-monitor/main.go index 9bb534d..5dcf7a5 100644 --- a/cmd/harborforge-monitor/main.go +++ b/cmd/harborforge-monitor/main.go @@ -24,12 +24,26 @@ func main() { printPayload bool dryRun bool showVersion bool + backendURL string + identifier string + apiKey string + reportInt int + logLevel string + rootFS string + monitorPort int ) flag.StringVar(&configPath, "config", "/etc/harborforge-monitor/config.json", "Path to config file") flag.BoolVar(&runOnce, "once", false, "Collect and send telemetry once, then exit") flag.BoolVar(&printPayload, "print-payload", false, "Print payload JSON before sending") flag.BoolVar(&dryRun, "dry-run", false, "Collect telemetry but do not send it") flag.BoolVar(&showVersion, "version", false, "Print version and exit") + flag.StringVar(&backendURL, "backend-url", "", "Override backend URL") + flag.StringVar(&identifier, "identifier", "", "Override identifier") + flag.StringVar(&apiKey, "api-key", "", "Override API key") + flag.IntVar(&reportInt, "report-interval", 0, "Override report interval in seconds") + flag.StringVar(&logLevel, "log-level", "", "Override log level") + flag.StringVar(&rootFS, "rootfs", "", "Override root filesystem path") + flag.IntVar(&monitorPort, "monitor-port", 0, "Override monitor bridge port") flag.Parse() if showVersion { @@ -37,7 +51,15 @@ func main() { return } - cfg, err := config.Load(configPath) + cfg, err := config.LoadWithOverrides(configPath, config.Overrides{ + BackendURL: backendURL, + Identifier: identifier, + APIKey: apiKey, + ReportIntervalSec: reportInt, + LogLevel: logLevel, + RootFS: rootFS, + MonitorPort: monitorPort, + }) if err != nil { log.Fatalf("load config: %v", err) } diff --git a/internal/config/config.go b/internal/config/config.go index d4e83f0..f054cb1 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -17,7 +17,21 @@ type Config struct { MonitorPort int `json:"monitorPort"` } +type Overrides struct { + BackendURL string + Identifier string + APIKey string + ReportIntervalSec int + LogLevel string + RootFS string + MonitorPort int +} + func Load(path string) (Config, error) { + return LoadWithOverrides(path, Overrides{}) +} + +func LoadWithOverrides(path string, overrides Overrides) (Config, error) { cfg := Config{ BackendURL: getenvAny([]string{"HF_MONITER_BACKEND_URL", "HF_MONITOR_BACKEND_URL"}, "https://monitor.hangman-lab.top"), Identifier: getenvAny([]string{"HF_MONITER_IDENTIFIER", "HF_MONITOR_IDENTIFIER"}, hostnameOr("unknown-host")), @@ -46,6 +60,28 @@ func Load(path string) (Config, error) { cfg.RootFS = getenvAny([]string{"HF_MONITER_ROOTFS", "HF_MONITOR_ROOTFS"}, cfg.RootFS) cfg.MonitorPort = getenvIntAny([]string{"MONITOR_PORT", "HF_MONITOR_PORT"}, cfg.MonitorPort) + if overrides.BackendURL != "" { + cfg.BackendURL = overrides.BackendURL + } + if overrides.Identifier != "" { + cfg.Identifier = overrides.Identifier + } + if overrides.APIKey != "" { + cfg.APIKey = overrides.APIKey + } + if overrides.ReportIntervalSec > 0 { + cfg.ReportIntervalSec = overrides.ReportIntervalSec + } + if overrides.LogLevel != "" { + cfg.LogLevel = overrides.LogLevel + } + if overrides.RootFS != "" { + cfg.RootFS = overrides.RootFS + } + if overrides.MonitorPort > 0 { + cfg.MonitorPort = overrides.MonitorPort + } + if cfg.BackendURL == "" { return cfg, fmt.Errorf("backendUrl is required") }