ayurishchevandClaude Sonnet 5
95f8066eed
Both binaries registered with control-api exactly once at startup and
exited (os.Exit(1)) on any failure — including control-api simply not
being up yet (no ordering guarantee between the two at boot/redeploy) or
the admin not having added this validator_id/site_id to the config yet.
Run() now retries registration with capped exponential backoff (3s->30s)
until it succeeds or the process is asked to shut down, instead of
crashing; registerWithRetry is identical in agentcore and probercore
since their Run/register shape already was.
Separately, the admin dashboard's Validators page had no hostname column
even though the agent already reports one on register (mirroring the
prober) and control-api already persists it — only the admin-config read
DTO (validatorDTO in httpapi and dashboard) dropped it before it reached
the template. Added hostname + last_heartbeat_at to that DTO end-to-end
and a Хост/Heartbeat column to validators.html, matching sites.html.
Rebuilt bin/{control-api,admin-dashboard,prober,validator-agent} and
bin/SHA256SUMS per docs/SETUP.md's documented build recipe.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
98 lines
2.6 KiB
Go
98 lines
2.6 KiB
Go
package httpapi
|
|
|
|
import "time"
|
|
|
|
// DTOs for the admin queue-management and dynamic-config endpoints
|
|
// (/api/v1/admin/ips, /api/v1/admin/config/*). Unlike the older read-only
|
|
// admin endpoints (which marshal internal/db model structs directly, in
|
|
// PascalCase), these use explicit snake_case JSON tags to match the
|
|
// agent/prober DTO convention.
|
|
|
|
type submitIPsRequest struct {
|
|
Addresses []string `json:"addresses"`
|
|
}
|
|
|
|
type submitIPsResponse struct {
|
|
Added []string `json:"added"`
|
|
Requeued []string `json:"requeued"`
|
|
Reordered []string `json:"reordered"`
|
|
SkippedInProgress []string `json:"skipped_in_progress"`
|
|
}
|
|
|
|
type deleteIPsRequest struct {
|
|
Addresses []string `json:"addresses"`
|
|
}
|
|
|
|
type deleteIPsResponse struct {
|
|
Deleted []string `json:"deleted"`
|
|
NotFound []string `json:"not_found"`
|
|
}
|
|
|
|
type clearQueueResponse struct {
|
|
Deleted []string `json:"deleted"`
|
|
}
|
|
|
|
type validatorDTO struct {
|
|
ValidatorID string `json:"validator_id"`
|
|
Hostname string `json:"hostname"`
|
|
OSPortID string `json:"os_port_id"`
|
|
State string `json:"state"`
|
|
LastHeartbeatAt *time.Time `json:"last_heartbeat_at"`
|
|
}
|
|
|
|
type createValidatorRequest struct {
|
|
ValidatorID string `json:"validator_id"`
|
|
OSPortID string `json:"os_port_id"`
|
|
}
|
|
|
|
type updateValidatorRequest struct {
|
|
OSPortID string `json:"os_port_id"`
|
|
}
|
|
|
|
type siteDTO struct {
|
|
Index int `json:"index"`
|
|
SiteID string `json:"site_id"`
|
|
Hostname string `json:"hostname"`
|
|
State string `json:"state"`
|
|
LastHeartbeatAt *time.Time `json:"last_heartbeat_at"`
|
|
}
|
|
|
|
type putSiteRequest struct {
|
|
SiteID string `json:"site_id"`
|
|
}
|
|
|
|
type targetGroupDTO struct {
|
|
Name string `json:"name"`
|
|
Targets []string `json:"targets"`
|
|
}
|
|
|
|
type putTargetGroupRequest struct {
|
|
Targets []string `json:"targets"`
|
|
}
|
|
|
|
type checkTypeDTO struct {
|
|
Name string `json:"name"`
|
|
Enabled bool `json:"enabled"`
|
|
Targets []string `json:"targets"`
|
|
}
|
|
|
|
type putCheckTypeRequest struct {
|
|
Enabled bool `json:"enabled"`
|
|
Targets []string `json:"targets"`
|
|
}
|
|
|
|
// orchestratorSettingsDTO doubles as both the GET response and the PUT
|
|
// request body for /api/v1/admin/config/orchestrator — a single-field DTO,
|
|
// same shape both ways, like putSiteRequest/siteDTO.
|
|
type orchestratorSettingsDTO struct {
|
|
FIPSettleSeconds int `json:"fip_settle_seconds"`
|
|
}
|
|
|
|
// inboundChecksDTO doubles as both the GET response and the PUT request
|
|
// body for /api/v1/admin/config/inbound-checks. Same field shape as
|
|
// proberAssignment.Ports/ICMP (dto.go).
|
|
type inboundChecksDTO struct {
|
|
Ports []int `json:"ports"`
|
|
ICMP bool `json:"icmp"`
|
|
}
|