ayurishchevandClaude Sonnet 5.5
cd37b10f3b
An admin-controlled scenario that repeats what the operator does by hand: clear the IP queue, scan and enqueue all free Floating IPs, wait until every queued address reaches a terminal state (so results are in the Registry), then wait a configurable interval and start over. - control-api: new auto_cycle singleton table (migration 0008) holding enabled/interval/max-run settings and persisted phase state, so the cycle survives restarts; engine in orchestrator/autocycle.go driven from the existing loop tick with an injectable "now" for deterministic tests. - Interval (default 1h, min 60s) and max wait (default unlimited, timeout outcome) are runtime settings, never hardcoded. - The periodic fip_scan_interval_seconds scan is skipped while the cycle is enabled. An emptied queue mid-cycle counts as finished; stopping during the pause keeps the last cycle's outcome. - API: GET/PUT /api/v1/admin/auto-cycle, POST .../start, POST .../stop. - admin-dashboard: "Автоматический цикл" panel on /settings and an "Автоцикл активен" indicator on /overview. - Tests for db, orchestrator, httpapi and dashboard; run-local-e2e.sh now exercises a full auto cycle; docs updated; bin/ rebuilt with refreshed SHA256SUMS. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
144 lines
4.5 KiB
Go
144 lines
4.5 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 scanIPsResponse struct {
|
|
ScannedFree int `json:"scanned_free"`
|
|
Added []string `json:"added"`
|
|
Requeued []string `json:"requeued"`
|
|
Reordered []string `json:"reordered"`
|
|
SkippedInProgress []string `json:"skipped_in_progress"`
|
|
}
|
|
|
|
// registryDTO is one row of the durable per-address registry — see
|
|
// db.RegistrySummary.
|
|
type registryDTO struct {
|
|
IPAddress string `json:"ip_address"`
|
|
FirstSeenAt time.Time `json:"first_seen_at"`
|
|
LastSeenAt time.Time `json:"last_seen_at"`
|
|
TotalCycles int `json:"total_cycles"`
|
|
LastResult string `json:"last_result"`
|
|
LastCheckedAt *time.Time `json:"last_checked_at"`
|
|
InQueue bool `json:"in_queue"`
|
|
CurrentState string `json:"current_state"`
|
|
}
|
|
|
|
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"`
|
|
HistoryRetentionCycles int `json:"history_retention_cycles"`
|
|
}
|
|
|
|
// 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"`
|
|
}
|
|
|
|
// autoCycleDTO is the status+parameters object returned by every
|
|
// /api/v1/admin/auto-cycle endpoint. Times are RFC3339 (null when unset).
|
|
type autoCycleDTO struct {
|
|
Enabled bool `json:"enabled"`
|
|
IntervalSeconds int `json:"interval_seconds"`
|
|
MaxRunSeconds int `json:"max_run_seconds"`
|
|
Phase string `json:"phase"`
|
|
RunStartedAt *time.Time `json:"run_started_at"`
|
|
NextRunAt *time.Time `json:"next_run_at"`
|
|
LastRunStartedAt *time.Time `json:"last_run_started_at"`
|
|
LastRunFinishedAt *time.Time `json:"last_run_finished_at"`
|
|
LastOutcome string `json:"last_outcome"`
|
|
LastError string `json:"last_error"`
|
|
LastScannedFree int `json:"last_scanned_free"`
|
|
RunsTotal int `json:"runs_total"`
|
|
}
|
|
|
|
// putAutoCycleRequest is the PUT body. Pointers make the update partial:
|
|
// an omitted field keeps its current value.
|
|
type putAutoCycleRequest struct {
|
|
IntervalSeconds *int `json:"interval_seconds"`
|
|
MaxRunSeconds *int `json:"max_run_seconds"`
|
|
}
|