Compare commits
2 Commits
6e60fae559
...
758d3d1c59
| Author | SHA1 | Date | |
|---|---|---|---|
| 758d3d1c59 | |||
| 65f521dce0 |
@@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
客户端调用:
|
客户端调用:
|
||||||
|
|
||||||
- `POST /monitor/server/heartbeat-v2`
|
- `POST /monitor/server/heartbeat`
|
||||||
- Header: `X-API-Key`
|
- Header: `X-API-Key`
|
||||||
|
|
||||||
## 项目结构
|
## 项目结构
|
||||||
@@ -66,7 +66,7 @@ HarborForge.Monitor/
|
|||||||
|
|
||||||
### MONITOR_PORT — 插件桥接端口
|
### MONITOR_PORT — 插件桥接端口
|
||||||
|
|
||||||
当 `MONITOR_PORT` (或 `monitorPort`) 设置为大于 0 的值时,Monitor 会在 `127.0.0.1:<MONITOR_PORT>` 上启动一个本地 HTTP 服务,供 HarborForge OpenClaw 插件查询遥测数据。
|
当 `MONITOR_PORT` 设置为大于 0 的值时,Monitor 会在 `127.0.0.1:<MONITOR_PORT>` 上启动一个本地 HTTP 服务,供 HarborForge OpenClaw 插件查询遥测数据。
|
||||||
|
|
||||||
支持的端点:
|
支持的端点:
|
||||||
|
|
||||||
|
|||||||
@@ -24,12 +24,26 @@ func main() {
|
|||||||
printPayload bool
|
printPayload bool
|
||||||
dryRun bool
|
dryRun bool
|
||||||
showVersion 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.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(&runOnce, "once", false, "Collect and send telemetry once, then exit")
|
||||||
flag.BoolVar(&printPayload, "print-payload", false, "Print payload JSON before sending")
|
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(&dryRun, "dry-run", false, "Collect telemetry but do not send it")
|
||||||
flag.BoolVar(&showVersion, "version", false, "Print version and exit")
|
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()
|
flag.Parse()
|
||||||
|
|
||||||
if showVersion {
|
if showVersion {
|
||||||
@@ -37,7 +51,15 @@ func main() {
|
|||||||
return
|
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 {
|
if err != nil {
|
||||||
log.Fatalf("load config: %v", err)
|
log.Fatalf("load config: %v", err)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,7 +17,21 @@ type Config struct {
|
|||||||
MonitorPort int `json:"monitorPort"`
|
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) {
|
func Load(path string) (Config, error) {
|
||||||
|
return LoadWithOverrides(path, Overrides{})
|
||||||
|
}
|
||||||
|
|
||||||
|
func LoadWithOverrides(path string, overrides Overrides) (Config, error) {
|
||||||
cfg := Config{
|
cfg := Config{
|
||||||
BackendURL: getenvAny([]string{"HF_MONITER_BACKEND_URL", "HF_MONITOR_BACKEND_URL"}, "https://monitor.hangman-lab.top"),
|
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")),
|
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.RootFS = getenvAny([]string{"HF_MONITER_ROOTFS", "HF_MONITOR_ROOTFS"}, cfg.RootFS)
|
||||||
cfg.MonitorPort = getenvIntAny([]string{"MONITOR_PORT", "HF_MONITOR_PORT"}, cfg.MonitorPort)
|
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 == "" {
|
if cfg.BackendURL == "" {
|
||||||
return cfg, fmt.Errorf("backendUrl is required")
|
return cfg, fmt.Errorf("backendUrl is required")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -98,7 +98,7 @@ func Send(ctx context.Context, client *http.Client, cfg config.Config, payload P
|
|||||||
return fmt.Errorf("marshal payload: %w", err)
|
return fmt.Errorf("marshal payload: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
req, err := http.NewRequestWithContext(ctx, http.MethodPost, strings.TrimRight(cfg.BackendURL, "/")+"/monitor/server/heartbeat-v2", strings.NewReader(string(body)))
|
req, err := http.NewRequestWithContext(ctx, http.MethodPost, strings.TrimRight(cfg.BackendURL, "/")+"/monitor/server/heartbeat", strings.NewReader(string(body)))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("build request: %w", err)
|
return fmt.Errorf("build request: %w", err)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user