P2-04.5: kill host.default_paths in favour of manual schedules
Two independent path lists for "what does this host back up?" was
a real divergence footgun — operator types one set at Add-host time
and a different set into a schedule, both end up in the same repo,
the snapshot history looks fine until restore. Resolution: drop
host.default_paths entirely; add a `manual` flag on schedules.
A manual schedule has paths/excludes/tags/retention like any other
but no cron — it fires only via per-schedule Run-now. Single source
of truth for what gets backed up.
Schema (migration 0007):
* schedules.manual INTEGER NOT NULL DEFAULT 0.
* For every host with non-empty default_paths, seed a manual
schedule with those paths and bump host_schedule_version.
* ALTER TABLE hosts DROP COLUMN default_paths.
* ALTER TABLE enrollment_tokens RENAME COLUMN default_paths
TO initial_paths.
Original draft of this migration rebuilt hosts via the
create-new + drop-old + rename-new pattern. With foreign_keys=ON
(set in the connection DSN), DROP TABLE on the parent fired
ON DELETE CASCADE on every child of hosts(id) — schedules /
jobs / snapshots / host_credentials all wiped on the smoke env
when I tried it. SQLite 3.35+ supports column-level ALTERs
directly, so we skip the rebuild dance and avoid the cascade
trap. Six lines of SQL instead of sixty, no FK risk.
Run-now rewiring:
* New `dispatchScheduleNow(hostID, scheduleID, conn?)` helper
unifies the agent-driven path (cron fire → schedule.fire →
OnScheduleFire callback) and the UI-driven path (operator
clicks Run-now on a schedule row). Conn arg is optional; nil
falls back to Hub.Send.
* New POST /hosts/{id}/schedules/{sid}/run endpoint — per-row
Run-now button on the schedules list.
* Dashboard's per-host Run-now (handleUIRunBackup) now picks the
host's only enabled manual schedule, falls back to the only
enabled schedule, else returns "pick one in Schedules tab".
Keeps one-click for the common case.
Agent:
* Scheduler skips manual schedules in cron build (silent — they're
a normal data shape, not an error).
* Wire Schedule struct gains Manual flag.
* Schedule.fire flow unchanged — the agent only ever fires
non-manual schedules anyway.
UI:
* Add-host form retitled "Initial schedule · manual" so the
operator knows the paths become an editable schedule under
the Schedules tab. Result page calls out the manual schedule
+ points at Host > Schedules.
* Schedule edit form: "Manual schedule" checkbox at the top of
the When section; toggling it hides/shows the cron field via
inline JS. Server-side validator skips the cron requirement
when manual=true.
* Schedule list shows a "manual" tag under the status pill and
renders the When column as "— run-now only —" for manual rows.
Each row gets a Run-now button when the schedule is enabled
and the host is online.
Tests + go test ./... green.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -88,6 +88,13 @@ func (s *Scheduler) Apply(payload api.ScheduleSetPayload, tx Sender) {
|
|||||||
if !sch.Enabled {
|
if !sch.Enabled {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
// Manual schedules carry paths/retention/etc. but have no
|
||||||
|
// cron — they only fire via operator-driven run-now (which
|
||||||
|
// the server resolves directly via dispatchScheduledJob).
|
||||||
|
// Skip without warning: they're a normal data shape.
|
||||||
|
if sch.Manual {
|
||||||
|
continue
|
||||||
|
}
|
||||||
// Capture by value so the closure doesn't share id across iters.
|
// Capture by value so the closure doesn't share id across iters.
|
||||||
entry := sch
|
entry := sch
|
||||||
_, err := c.AddFunc(entry.CronExpr, func() {
|
_, err := c.AddFunc(entry.CronExpr, func() {
|
||||||
|
|||||||
@@ -181,6 +181,11 @@ type Schedule struct {
|
|||||||
PreHook string `json:"pre_hook,omitempty"`
|
PreHook string `json:"pre_hook,omitempty"`
|
||||||
PostHook string `json:"post_hook,omitempty"`
|
PostHook string `json:"post_hook,omitempty"`
|
||||||
Enabled bool `json:"enabled"`
|
Enabled bool `json:"enabled"`
|
||||||
|
// Manual schedules are not added to the agent's local cron — they
|
||||||
|
// fire only when the operator clicks a Run-now button. The agent
|
||||||
|
// can ignore them entirely; we ship them in the payload only so
|
||||||
|
// the operator can edit them on a still-disconnected agent.
|
||||||
|
Manual bool `json:"manual,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// ScheduleSetPayload — server pushes the full canonical schedule list
|
// ScheduleSetPayload — server pushes the full canonical schedule list
|
||||||
|
|||||||
@@ -56,12 +56,11 @@ type enrollOperatorRequest struct {
|
|||||||
RepoURL string `json:"repo_url"`
|
RepoURL string `json:"repo_url"`
|
||||||
RepoUsername string `json:"repo_username"`
|
RepoUsername string `json:"repo_username"`
|
||||||
RepoPassword string `json:"repo_password"`
|
RepoPassword string `json:"repo_password"`
|
||||||
// DefaultPaths lands on the host row at consume time. Used by
|
// InitialPaths seeds the host's initial manual schedule on
|
||||||
// run-now buttons (the dashboard's per-row Run, the host
|
// consume — operator can edit/extend from the host's Schedules
|
||||||
// detail's Run backup now). When schedules ship in P2-01 they
|
// tab afterwards. Empty list = no initial schedule (operator
|
||||||
// supersede this — until then, this is the only source of paths
|
// must add one before backups can run).
|
||||||
// for run-now jobs.
|
InitialPaths []string `json:"initial_paths,omitempty"`
|
||||||
DefaultPaths []string `json:"default_paths,omitempty"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type enrollOperatorResponse struct {
|
type enrollOperatorResponse struct {
|
||||||
@@ -134,7 +133,6 @@ func (s *Server) handleAgentEnroll(w stdhttp.ResponseWriter, r *stdhttp.Request)
|
|||||||
AgentVersion: req.AgentVersion,
|
AgentVersion: req.AgentVersion,
|
||||||
ResticVersion: req.ResticVersion,
|
ResticVersion: req.ResticVersion,
|
||||||
EnrolledAt: time.Now().UTC(),
|
EnrolledAt: time.Now().UTC(),
|
||||||
DefaultPaths: attachments.DefaultPaths,
|
|
||||||
}
|
}
|
||||||
if err := s.deps.Store.CreateHost(r.Context(), host,
|
if err := s.deps.Store.CreateHost(r.Context(), host,
|
||||||
auth.HashToken(agentToken), ""); err != nil {
|
auth.HashToken(agentToken), ""); err != nil {
|
||||||
@@ -142,6 +140,28 @@ func (s *Server) handleAgentEnroll(w stdhttp.ResponseWriter, r *stdhttp.Request)
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Seed an initial manual schedule from whatever paths the
|
||||||
|
// operator typed into Add-host. The schedule is editable from
|
||||||
|
// the host's Schedules tab; the operator can add automated
|
||||||
|
// schedules alongside it later. We skip this when no paths
|
||||||
|
// were supplied — the host can still enrol; it just can't
|
||||||
|
// back up until the operator adds a schedule.
|
||||||
|
if len(attachments.InitialPaths) > 0 {
|
||||||
|
seed := store.Schedule{
|
||||||
|
ID: ulid.Make().String(),
|
||||||
|
HostID: hostID,
|
||||||
|
Kind: string(api.JobBackup),
|
||||||
|
CronExpr: "",
|
||||||
|
Paths: attachments.InitialPaths,
|
||||||
|
Enabled: true,
|
||||||
|
Manual: true,
|
||||||
|
}
|
||||||
|
if err := s.deps.Store.CreateSchedule(r.Context(), &seed); err != nil {
|
||||||
|
slog.Warn("enrollment: seed manual schedule failed",
|
||||||
|
"host_id", hostID, "err", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Promote the encrypted repo creds onto the freshly-created host
|
// Promote the encrypted repo creds onto the freshly-created host
|
||||||
// row. If this fails for any reason we log loudly but still
|
// row. If this fails for any reason we log loudly but still
|
||||||
// return the bearer — the operator recovers via PUT
|
// return the bearer — the operator recovers via PUT
|
||||||
@@ -203,7 +223,7 @@ func (s *Server) handleCreateEnrollmentToken(w stdhttp.ResponseWriter, r *stdhtt
|
|||||||
writeJSONError(w, stdhttp.StatusBadRequest, "invalid_json", err.Error())
|
writeJSONError(w, stdhttp.StatusBadRequest, "invalid_json", err.Error())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
token, expiresAt, err := s.mintEnrollmentToken(r.Context(), req.RepoURL, req.RepoUsername, req.RepoPassword, req.DefaultPaths)
|
token, expiresAt, err := s.mintEnrollmentToken(r.Context(), req.RepoURL, req.RepoUsername, req.RepoPassword, req.InitialPaths)
|
||||||
switch err {
|
switch err {
|
||||||
case nil:
|
case nil:
|
||||||
writeJSON(w, stdhttp.StatusCreated, enrollOperatorResponse{Token: token, ExpiresAt: expiresAt})
|
writeJSON(w, stdhttp.StatusCreated, enrollOperatorResponse{Token: token, ExpiresAt: expiresAt})
|
||||||
@@ -226,7 +246,7 @@ var errMissingRepoCreds = errAuth("missing_repo_creds")
|
|||||||
// token (shown to the operator exactly once) and the expiry time.
|
// token (shown to the operator exactly once) and the expiry time.
|
||||||
//
|
//
|
||||||
// Shared by the JSON endpoint and the HTML "Add host" flow.
|
// Shared by the JSON endpoint and the HTML "Add host" flow.
|
||||||
func (s *Server) mintEnrollmentToken(ctx context.Context, repoURL, repoUsername, repoPassword string, defaultPaths []string) (string, time.Time, error) {
|
func (s *Server) mintEnrollmentToken(ctx context.Context, repoURL, repoUsername, repoPassword string, initialPaths []string) (string, time.Time, error) {
|
||||||
if repoURL == "" || repoPassword == "" {
|
if repoURL == "" || repoPassword == "" {
|
||||||
return "", time.Time{}, errMissingRepoCreds
|
return "", time.Time{}, errMissingRepoCreds
|
||||||
}
|
}
|
||||||
@@ -243,12 +263,12 @@ func (s *Server) mintEnrollmentToken(ctx context.Context, repoURL, repoUsername,
|
|||||||
return "", time.Time{}, err
|
return "", time.Time{}, err
|
||||||
}
|
}
|
||||||
|
|
||||||
if defaultPaths == nil {
|
if initialPaths == nil {
|
||||||
defaultPaths = []string{}
|
initialPaths = []string{}
|
||||||
}
|
}
|
||||||
pathsJSON, err := json.Marshal(defaultPaths)
|
pathsJSON, err := json.Marshal(initialPaths)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", time.Time{}, fmt.Errorf("marshal default_paths: %w", err)
|
return "", time.Time{}, fmt.Errorf("marshal initial_paths: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
const ttl = time.Hour
|
const ttl = time.Hour
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package http
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
"log/slog"
|
"log/slog"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@@ -46,6 +47,7 @@ func (s *Server) loadScheduleSetPayload(ctx context.Context, hostID string) (api
|
|||||||
PreHook: r.PreHook,
|
PreHook: r.PreHook,
|
||||||
PostHook: r.PostHook,
|
PostHook: r.PostHook,
|
||||||
Enabled: r.Enabled,
|
Enabled: r.Enabled,
|
||||||
|
Manual: r.Manual,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
return out, nil
|
return out, nil
|
||||||
@@ -144,37 +146,42 @@ func (s *Server) applyScheduleAck(ctx context.Context, hostID string, version in
|
|||||||
}
|
}
|
||||||
|
|
||||||
// dispatchScheduledJob is invoked when the agent reports a local
|
// dispatchScheduledJob is invoked when the agent reports a local
|
||||||
// cron fire via `schedule.fire`. We look up the schedule, build the
|
// cron fire via `schedule.fire`. Thin wrapper around the shared
|
||||||
// CommandRunPayload from it, persist a job row (actor=schedule,
|
// dispatcher; logs and discards the return values since the agent
|
||||||
// linked back to scheduled_id), and write MsgCommandRun straight
|
// can't usefully act on them.
|
||||||
// back on the same conn so the agent runs the job through its
|
func (s *Server) dispatchScheduledJob(ctx context.Context, hostID string, _ *ws.Conn, scheduleID string, scheduledAt time.Time) {
|
||||||
// normal command dispatch path.
|
jobID, err := s.dispatchScheduleNow(ctx, hostID, scheduleID, nil)
|
||||||
//
|
|
||||||
// On any error we log and bail — the agent's cron will fire again
|
|
||||||
// at the next tick. We deliberately don't try to retry: schedules
|
|
||||||
// are by definition repeating, and a missed tick is less bad than
|
|
||||||
// a confused operator-visible "phantom job" that never actually
|
|
||||||
// ran restic.
|
|
||||||
func (s *Server) dispatchScheduledJob(ctx context.Context, hostID string, conn *ws.Conn, scheduleID string, scheduledAt time.Time) {
|
|
||||||
sched, err := s.deps.Store.GetSchedule(ctx, hostID, scheduleID)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Warn("schedule.fire: schedule not found",
|
slog.Warn("schedule.fire: dispatch failed",
|
||||||
"host_id", hostID, "schedule_id", scheduleID, "err", err)
|
"host_id", hostID, "schedule_id", scheduleID, "err", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
slog.Info("schedule.fire: dispatched",
|
||||||
|
"host_id", hostID, "schedule_id", scheduleID,
|
||||||
|
"job_id", jobID, "scheduled_at", scheduledAt)
|
||||||
|
}
|
||||||
|
|
||||||
|
// dispatchScheduleNow looks up a schedule, builds a CommandRunPayload,
|
||||||
|
// persists a jobs row (actor_kind=schedule, scheduled_id linking
|
||||||
|
// back), and ships MsgCommandRun to the host. Used by both the
|
||||||
|
// agent-driven path (cron fire reaches us as schedule.fire) and the
|
||||||
|
// UI-driven path (operator clicks Run-now on a schedule row).
|
||||||
|
//
|
||||||
|
// conn is optional: when set we write directly through it (no race
|
||||||
|
// against an in-flight Register). When nil we fall back to Hub.Send.
|
||||||
|
// Returns the new job_id on success.
|
||||||
|
func (s *Server) dispatchScheduleNow(ctx context.Context, hostID, scheduleID string, conn *ws.Conn) (string, error) {
|
||||||
|
sched, err := s.deps.Store.GetSchedule(ctx, hostID, scheduleID)
|
||||||
|
if err != nil {
|
||||||
|
if errors.Is(err, store.ErrNotFound) {
|
||||||
|
return "", errFmtf("schedule not found")
|
||||||
|
}
|
||||||
|
return "", errFmtf("internal: %s", err)
|
||||||
|
}
|
||||||
if !sched.Enabled {
|
if !sched.Enabled {
|
||||||
// The agent shouldn't be firing disabled schedules — its
|
return "", errFmtf("schedule is disabled")
|
||||||
// local cron is rebuilt from the canonical version after
|
|
||||||
// every push — but treat as belt-and-braces.
|
|
||||||
slog.Info("schedule.fire: ignoring disabled schedule",
|
|
||||||
"host_id", hostID, "schedule_id", scheduleID)
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Args differ by kind. For backup we ship the schedule's paths;
|
|
||||||
// other kinds are still arg-less in Phase 2 (forget/prune/check
|
|
||||||
// take their parameters from RetentionPolicy / Options at exec
|
|
||||||
// time on the agent — handled when those job kinds land).
|
|
||||||
var args []string
|
var args []string
|
||||||
if sched.Kind == string(api.JobBackup) {
|
if sched.Kind == string(api.JobBackup) {
|
||||||
args = append(args, sched.Paths...)
|
args = append(args, sched.Paths...)
|
||||||
@@ -191,9 +198,7 @@ func (s *Server) dispatchScheduledJob(ctx context.Context, hostID string, conn *
|
|||||||
ActorID: &sched.ID,
|
ActorID: &sched.ID,
|
||||||
CreatedAt: now,
|
CreatedAt: now,
|
||||||
}); err != nil {
|
}); err != nil {
|
||||||
slog.Warn("schedule.fire: create job",
|
return "", errFmtf("create job: %s", err)
|
||||||
"host_id", hostID, "schedule_id", scheduleID, "err", err)
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
env, err := api.Marshal(api.MsgCommandRun, jobID, api.CommandRunPayload{
|
env, err := api.Marshal(api.MsgCommandRun, jobID, api.CommandRunPayload{
|
||||||
@@ -202,16 +207,18 @@ func (s *Server) dispatchScheduledJob(ctx context.Context, hostID string, conn *
|
|||||||
Args: args,
|
Args: args,
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("schedule.fire: marshal command.run",
|
return "", errFmtf("marshal command.run: %s", err)
|
||||||
"host_id", hostID, "schedule_id", scheduleID, "err", err)
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
sendCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
|
sendCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
if err := conn.Send(sendCtx, env); err != nil {
|
if conn != nil {
|
||||||
slog.Warn("schedule.fire: send command.run",
|
if err := conn.Send(sendCtx, env); err != nil {
|
||||||
"host_id", hostID, "job_id", jobID, "err", err)
|
return "", errFmtf("send command.run: %s", err)
|
||||||
return
|
}
|
||||||
|
} else {
|
||||||
|
if err := s.deps.Hub.Send(sendCtx, hostID, env); err != nil {
|
||||||
|
return "", errFmtf("send command.run: %s", err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_ = s.deps.Store.AppendAudit(ctx, store.AuditEntry{
|
_ = s.deps.Store.AppendAudit(ctx, store.AuditEntry{
|
||||||
@@ -222,9 +229,7 @@ func (s *Server) dispatchScheduledJob(ctx context.Context, hostID string, conn *
|
|||||||
TargetID: &jobID,
|
TargetID: &jobID,
|
||||||
TS: now,
|
TS: now,
|
||||||
})
|
})
|
||||||
slog.Info("schedule.fire: dispatched",
|
return jobID, nil
|
||||||
"host_id", hostID, "schedule_id", scheduleID,
|
|
||||||
"job_id", jobID, "kind", sched.Kind, "scheduled_at", scheduledAt)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Compile-time guard that the store actually implements the methods
|
// Compile-time guard that the store actually implements the methods
|
||||||
|
|||||||
@@ -30,6 +30,9 @@ type scheduleAPI struct {
|
|||||||
PreHook string `json:"pre_hook,omitempty"`
|
PreHook string `json:"pre_hook,omitempty"`
|
||||||
PostHook string `json:"post_hook,omitempty"`
|
PostHook string `json:"post_hook,omitempty"`
|
||||||
Enabled bool `json:"enabled"`
|
Enabled bool `json:"enabled"`
|
||||||
|
// Manual = no cron, fires only when the operator triggers a
|
||||||
|
// run-now. Cron expr is ignored when this is true.
|
||||||
|
Manual bool `json:"manual"`
|
||||||
CreatedAt string `json:"created_at,omitempty"`
|
CreatedAt string `json:"created_at,omitempty"`
|
||||||
UpdatedAt string `json:"updated_at,omitempty"`
|
UpdatedAt string `json:"updated_at,omitempty"`
|
||||||
}
|
}
|
||||||
@@ -254,11 +257,13 @@ func validateSchedule(s *scheduleAPI) (code, msg string) {
|
|||||||
default:
|
default:
|
||||||
return "invalid_kind", "kind must be one of backup|forget|prune|check"
|
return "invalid_kind", "kind must be one of backup|forget|prune|check"
|
||||||
}
|
}
|
||||||
if strings.TrimSpace(s.CronExpr) == "" {
|
if !s.Manual {
|
||||||
return "missing_cron_expr", "cron_expr is required"
|
if strings.TrimSpace(s.CronExpr) == "" {
|
||||||
}
|
return "missing_cron_expr", "cron_expr is required (or set manual=true)"
|
||||||
if _, err := cronParser.Parse(s.CronExpr); err != nil {
|
}
|
||||||
return "invalid_cron_expr", err.Error()
|
if _, err := cronParser.Parse(s.CronExpr); err != nil {
|
||||||
|
return "invalid_cron_expr", err.Error()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if s.Kind == api.JobBackup && len(s.Paths) == 0 {
|
if s.Kind == api.JobBackup && len(s.Paths) == 0 {
|
||||||
return "missing_paths", "backup schedules require at least one path"
|
return "missing_paths", "backup schedules require at least one path"
|
||||||
@@ -283,6 +288,7 @@ func toScheduleAPI(s store.Schedule) scheduleAPI {
|
|||||||
PreHook: s.PreHook,
|
PreHook: s.PreHook,
|
||||||
PostHook: s.PostHook,
|
PostHook: s.PostHook,
|
||||||
Enabled: s.Enabled,
|
Enabled: s.Enabled,
|
||||||
|
Manual: s.Manual,
|
||||||
CreatedAt: s.CreatedAt.Format("2006-01-02T15:04:05.999999999Z07:00"),
|
CreatedAt: s.CreatedAt.Format("2006-01-02T15:04:05.999999999Z07:00"),
|
||||||
UpdatedAt: s.UpdatedAt.Format("2006-01-02T15:04:05.999999999Z07:00"),
|
UpdatedAt: s.UpdatedAt.Format("2006-01-02T15:04:05.999999999Z07:00"),
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -160,6 +160,7 @@ func (s *Server) routes(r chi.Router) {
|
|||||||
r.Get("/hosts/{id}/schedules/{sid}/edit", s.handleUIScheduleEditGet)
|
r.Get("/hosts/{id}/schedules/{sid}/edit", s.handleUIScheduleEditGet)
|
||||||
r.Post("/hosts/{id}/schedules/{sid}/edit", s.handleUIScheduleSave)
|
r.Post("/hosts/{id}/schedules/{sid}/edit", s.handleUIScheduleSave)
|
||||||
r.Post("/hosts/{id}/schedules/{sid}/delete", s.handleUIScheduleDelete)
|
r.Post("/hosts/{id}/schedules/{sid}/delete", s.handleUIScheduleDelete)
|
||||||
|
r.Post("/hosts/{id}/schedules/{sid}/run", s.handleUIScheduleRun)
|
||||||
// Live job log.
|
// Live job log.
|
||||||
r.Get("/jobs/{id}", s.handleUIJobDetail)
|
r.Get("/jobs/{id}", s.handleUIJobDetail)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package http
|
package http
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"crypto/rand"
|
"crypto/rand"
|
||||||
"encoding/base64"
|
"encoding/base64"
|
||||||
"errors"
|
"errors"
|
||||||
@@ -170,23 +171,18 @@ func (s *Server) handleUIRunBackup(w stdhttp.ResponseWriter, r *stdhttp.Request)
|
|||||||
stdhttp.Error(w, "internal", stdhttp.StatusInternalServerError)
|
stdhttp.Error(w, "internal", stdhttp.StatusInternalServerError)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if len(host.DefaultPaths) == 0 {
|
|
||||||
// Tell the user with HX-Redirect via a friendly toast — for
|
|
||||||
// now, just an HTTP error: HTMX surfaces the response body
|
|
||||||
// to the operator's console, and a future toast component
|
|
||||||
// will lift it into the UI.
|
|
||||||
stdhttp.Error(w,
|
|
||||||
"this host has no default backup paths set — edit the host or wait for schedules (P2)",
|
|
||||||
stdhttp.StatusBadRequest)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if host.RepoInitialisedAt == nil {
|
if host.RepoInitialisedAt == nil {
|
||||||
stdhttp.Error(w,
|
stdhttp.Error(w,
|
||||||
"this host's repo hasn't been initialised yet — click Initialise repo first",
|
"this host's repo hasn't been initialised yet — click Initialise repo first",
|
||||||
stdhttp.StatusBadRequest)
|
stdhttp.StatusBadRequest)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
res, status, code, msg := s.dispatchJob(r.Context(), storeUser, hostID, api.JobBackup, host.DefaultPaths)
|
pick, err := s.pickRunNowSchedule(r.Context(), hostID)
|
||||||
|
if err != nil {
|
||||||
|
stdhttp.Error(w, err.Error(), stdhttp.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
res, status, code, msg := s.dispatchJob(r.Context(), storeUser, hostID, api.JobBackup, pick.Paths)
|
||||||
if code != "" {
|
if code != "" {
|
||||||
stdhttp.Error(w, msg, status)
|
stdhttp.Error(w, msg, status)
|
||||||
return
|
return
|
||||||
@@ -205,6 +201,48 @@ func (s *Server) handleUIRunBackup(w stdhttp.ResponseWriter, r *stdhttp.Request)
|
|||||||
stdhttp.Redirect(w, r, target, stdhttp.StatusSeeOther)
|
stdhttp.Redirect(w, r, target, stdhttp.StatusSeeOther)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// pickRunNowSchedule chooses which schedule a generic per-host
|
||||||
|
// "Run now" button should dispatch when the operator hasn't picked
|
||||||
|
// one explicitly. Picks in priority order: the host's only enabled
|
||||||
|
// manual schedule, then its only enabled schedule of any kind.
|
||||||
|
// Returns a friendly error if there's nothing to run, or if the
|
||||||
|
// operator needs to disambiguate.
|
||||||
|
func (s *Server) pickRunNowSchedule(ctx context.Context, hostID string) (*store.Schedule, error) {
|
||||||
|
rows, err := s.deps.Store.ListSchedulesByHost(ctx, hostID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, errFmt("internal: %s", err)
|
||||||
|
}
|
||||||
|
enabled := make([]store.Schedule, 0, len(rows))
|
||||||
|
for _, r := range rows {
|
||||||
|
if r.Enabled {
|
||||||
|
enabled = append(enabled, r)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(enabled) == 0 {
|
||||||
|
return nil, errFmt("this host has no enabled schedules — add one in the Schedules tab")
|
||||||
|
}
|
||||||
|
manuals := []store.Schedule{}
|
||||||
|
for _, r := range enabled {
|
||||||
|
if r.Manual {
|
||||||
|
manuals = append(manuals, r)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
switch {
|
||||||
|
case len(manuals) == 1:
|
||||||
|
s := manuals[0]
|
||||||
|
return &s, nil
|
||||||
|
case len(enabled) == 1:
|
||||||
|
s := enabled[0]
|
||||||
|
return &s, nil
|
||||||
|
default:
|
||||||
|
return nil, errFmt("this host has %d schedules — pick one from the Schedules tab", len(enabled))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func errFmt(format string, args ...any) error {
|
||||||
|
return errFmtf(format, args...)
|
||||||
|
}
|
||||||
|
|
||||||
// handleUIInitRepo dispatches a one-shot `restic init` job for a
|
// handleUIInitRepo dispatches a one-shot `restic init` job for a
|
||||||
// host. Surfaced in the run-now panel as a red "Initialise repo"
|
// host. Surfaced in the run-now panel as a red "Initialise repo"
|
||||||
// button when host.repo_initialised_at IS NULL. On success it
|
// button when host.repo_initialised_at IS NULL. On success it
|
||||||
|
|||||||
@@ -26,9 +26,9 @@ type schedulesListPage struct {
|
|||||||
|
|
||||||
// scheduleEditPage drives both the Create form (Schedule.ID empty)
|
// scheduleEditPage drives both the Create form (Schedule.ID empty)
|
||||||
// and the Edit form (Schedule populated). Errors come back via Error
|
// and the Edit form (Schedule populated). Errors come back via Error
|
||||||
// to be rendered as a banner; FormValues holds the just-submitted
|
// to be rendered as a banner; the rest of the fields hold the just-
|
||||||
// raw fields so a failed POST can re-render with the operator's
|
// submitted raw values so a failed POST can re-render with the
|
||||||
// typed input still in place.
|
// operator's typed input still in place.
|
||||||
type scheduleEditPage struct {
|
type scheduleEditPage struct {
|
||||||
Host store.Host
|
Host store.Host
|
||||||
IsNew bool
|
IsNew bool
|
||||||
@@ -49,6 +49,7 @@ type scheduleEditPage struct {
|
|||||||
LimitUpKBps string
|
LimitUpKBps string
|
||||||
LimitDownKBps string
|
LimitDownKBps string
|
||||||
Enabled bool
|
Enabled bool
|
||||||
|
Manual bool
|
||||||
}
|
}
|
||||||
|
|
||||||
// handleUISchedulesList renders the Schedules sub-tab on a host.
|
// handleUISchedulesList renders the Schedules sub-tab on a host.
|
||||||
@@ -151,6 +152,7 @@ func (s *Server) handleUIScheduleEditGet(w stdhttp.ResponseWriter, r *stdhttp.Re
|
|||||||
ExcludesRaw: strings.Join(sched.Excludes, "\n"),
|
ExcludesRaw: strings.Join(sched.Excludes, "\n"),
|
||||||
TagsRaw: strings.Join(sched.Tags, ", "),
|
TagsRaw: strings.Join(sched.Tags, ", "),
|
||||||
Enabled: sched.Enabled,
|
Enabled: sched.Enabled,
|
||||||
|
Manual: sched.Manual,
|
||||||
}
|
}
|
||||||
page.KeepLast = intStringPtr(sched.RetentionPolicy.KeepLast)
|
page.KeepLast = intStringPtr(sched.RetentionPolicy.KeepLast)
|
||||||
page.KeepHourly = intStringPtr(sched.RetentionPolicy.KeepHourly)
|
page.KeepHourly = intStringPtr(sched.RetentionPolicy.KeepHourly)
|
||||||
@@ -213,6 +215,7 @@ func (s *Server) handleUIScheduleSave(w stdhttp.ResponseWriter, r *stdhttp.Reque
|
|||||||
LimitUpKBps: strings.TrimSpace(r.PostForm.Get("limit_up_kbps")),
|
LimitUpKBps: strings.TrimSpace(r.PostForm.Get("limit_up_kbps")),
|
||||||
LimitDownKBps: strings.TrimSpace(r.PostForm.Get("limit_down_kbps")),
|
LimitDownKBps: strings.TrimSpace(r.PostForm.Get("limit_down_kbps")),
|
||||||
Enabled: r.PostForm.Get("enabled") == "on",
|
Enabled: r.PostForm.Get("enabled") == "on",
|
||||||
|
Manual: r.PostForm.Get("manual") == "on",
|
||||||
}
|
}
|
||||||
|
|
||||||
// Convert the raw form values into store-shape data, surfacing
|
// Convert the raw form values into store-shape data, surfacing
|
||||||
@@ -234,13 +237,14 @@ func (s *Server) handleUIScheduleSave(w stdhttp.ResponseWriter, r *stdhttp.Reque
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Validate against the same rules the JSON API uses (cron, paths,
|
// Validate against the same rules the JSON API uses. Manual
|
||||||
// hooks-on-non-backup) — the UI only handles backup kind today,
|
// schedules skip the cron-expr requirement; everything else
|
||||||
// so we hardcode kind=backup here.
|
// applies the same.
|
||||||
apiShape := scheduleAPI{
|
apiShape := scheduleAPI{
|
||||||
Kind: api.JobBackup,
|
Kind: api.JobBackup,
|
||||||
CronExpr: page.CronExpr,
|
CronExpr: page.CronExpr,
|
||||||
Paths: paths,
|
Paths: paths,
|
||||||
|
Manual: page.Manual,
|
||||||
}
|
}
|
||||||
if code, msg := validateSchedule(&apiShape); code != "" {
|
if code, msg := validateSchedule(&apiShape); code != "" {
|
||||||
page.Error = uiErrorMessage(code, msg)
|
page.Error = uiErrorMessage(code, msg)
|
||||||
@@ -260,6 +264,7 @@ func (s *Server) handleUIScheduleSave(w stdhttp.ResponseWriter, r *stdhttp.Reque
|
|||||||
RetentionPolicy: retention,
|
RetentionPolicy: retention,
|
||||||
Options: options,
|
Options: options,
|
||||||
Enabled: page.Enabled,
|
Enabled: page.Enabled,
|
||||||
|
Manual: page.Manual,
|
||||||
}
|
}
|
||||||
if err := s.deps.Store.CreateSchedule(r.Context(), &row); err != nil {
|
if err := s.deps.Store.CreateSchedule(r.Context(), &row); err != nil {
|
||||||
page.Error = "Couldn't save schedule — see server log."
|
page.Error = "Couldn't save schedule — see server log."
|
||||||
@@ -294,6 +299,7 @@ func (s *Server) handleUIScheduleSave(w stdhttp.ResponseWriter, r *stdhttp.Reque
|
|||||||
existing.RetentionPolicy = retention
|
existing.RetentionPolicy = retention
|
||||||
existing.Options = options
|
existing.Options = options
|
||||||
existing.Enabled = page.Enabled
|
existing.Enabled = page.Enabled
|
||||||
|
existing.Manual = page.Manual
|
||||||
if err := s.deps.Store.UpdateSchedule(r.Context(), existing); err != nil {
|
if err := s.deps.Store.UpdateSchedule(r.Context(), existing); err != nil {
|
||||||
page.Error = "Couldn't save schedule — see server log."
|
page.Error = "Couldn't save schedule — see server log."
|
||||||
slog.Error("ui schedule update", "err", err)
|
slog.Error("ui schedule update", "err", err)
|
||||||
@@ -315,6 +321,46 @@ func (s *Server) handleUIScheduleSave(w stdhttp.ResponseWriter, r *stdhttp.Reque
|
|||||||
stdhttp.Redirect(w, r, "/hosts/"+hostID+"/schedules", stdhttp.StatusSeeOther)
|
stdhttp.Redirect(w, r, "/hosts/"+hostID+"/schedules", stdhttp.StatusSeeOther)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// handleUIScheduleRun is the POST target of per-schedule Run-now
|
||||||
|
// buttons. Reuses dispatchScheduledJob (the same code path used by
|
||||||
|
// the agent's local cron firing) so manual + automated runs flow
|
||||||
|
// through identical job lifecycle. Sets HX-Redirect to the live
|
||||||
|
// log on success.
|
||||||
|
func (s *Server) handleUIScheduleRun(w stdhttp.ResponseWriter, r *stdhttp.Request) {
|
||||||
|
u := s.requireUIUser(w, r)
|
||||||
|
if u == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
hostID := chi.URLParam(r, "id")
|
||||||
|
scheduleID := chi.URLParam(r, "sid")
|
||||||
|
host, err := s.deps.Store.GetHost(r.Context(), hostID)
|
||||||
|
if err != nil {
|
||||||
|
if errors.Is(err, store.ErrNotFound) {
|
||||||
|
stdhttp.NotFound(w, r)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
stdhttp.Error(w, "internal", stdhttp.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if !s.deps.Hub.Connected(hostID) {
|
||||||
|
stdhttp.Error(w, "agent is offline", stdhttp.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
_ = host
|
||||||
|
jobID, err := s.dispatchScheduleNow(r.Context(), hostID, scheduleID, nil)
|
||||||
|
if err != nil {
|
||||||
|
stdhttp.Error(w, err.Error(), stdhttp.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
target := "/jobs/" + jobID
|
||||||
|
if r.Header.Get("HX-Request") == "true" {
|
||||||
|
w.Header().Set("HX-Redirect", target)
|
||||||
|
w.WriteHeader(stdhttp.StatusOK)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
stdhttp.Redirect(w, r, target, stdhttp.StatusSeeOther)
|
||||||
|
}
|
||||||
|
|
||||||
// handleUIScheduleDelete is the POST target of the Delete buttons on
|
// handleUIScheduleDelete is the POST target of the Delete buttons on
|
||||||
// the list view. Confirm-then-redirect; no AJAX.
|
// the list view. Confirm-then-redirect; no AJAX.
|
||||||
func (s *Server) handleUIScheduleDelete(w stdhttp.ResponseWriter, r *stdhttp.Request) {
|
func (s *Server) handleUIScheduleDelete(w stdhttp.ResponseWriter, r *stdhttp.Request) {
|
||||||
|
|||||||
@@ -19,26 +19,25 @@ import (
|
|||||||
// later via PUT /api/hosts/{id}/repo-credentials; the agent will
|
// later via PUT /api/hosts/{id}/repo-credentials; the agent will
|
||||||
// refuse backup jobs until that lands.
|
// refuse backup jobs until that lands.
|
||||||
//
|
//
|
||||||
// defaultPaths is the JSON-encoded path list (the agent invokes
|
// initialPaths is the JSON-encoded path list seeded into the host's
|
||||||
// `restic backup` with these on a run-now without explicit paths).
|
// initial manual schedule on consume. Empty string is treated as
|
||||||
// Empty string is treated as "[]". Not encrypted — paths aren't
|
// "[]". Not encrypted — paths aren't secret.
|
||||||
// secret.
|
func (s *Store) CreateEnrollmentToken(ctx context.Context, tokenHash string, ttl time.Duration, encRepoCreds, initialPaths string) error {
|
||||||
func (s *Store) CreateEnrollmentToken(ctx context.Context, tokenHash string, ttl time.Duration, encRepoCreds, defaultPaths string) error {
|
|
||||||
now := time.Now().UTC()
|
now := time.Now().UTC()
|
||||||
var enc any = nil
|
var enc any = nil
|
||||||
if encRepoCreds != "" {
|
if encRepoCreds != "" {
|
||||||
enc = encRepoCreds
|
enc = encRepoCreds
|
||||||
}
|
}
|
||||||
if defaultPaths == "" {
|
if initialPaths == "" {
|
||||||
defaultPaths = "[]"
|
initialPaths = "[]"
|
||||||
}
|
}
|
||||||
_, err := s.db.ExecContext(ctx,
|
_, err := s.db.ExecContext(ctx,
|
||||||
`INSERT INTO enrollment_tokens (token_hash, created_at, expires_at, enc_repo_creds, default_paths)
|
`INSERT INTO enrollment_tokens (token_hash, created_at, expires_at, enc_repo_creds, initial_paths)
|
||||||
VALUES (?, ?, ?, ?, ?)`,
|
VALUES (?, ?, ?, ?, ?)`,
|
||||||
tokenHash,
|
tokenHash,
|
||||||
now.Format(time.RFC3339Nano),
|
now.Format(time.RFC3339Nano),
|
||||||
now.Add(ttl).Format(time.RFC3339Nano),
|
now.Add(ttl).Format(time.RFC3339Nano),
|
||||||
enc, defaultPaths)
|
enc, initialPaths)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("store: create enrollment token: %w", err)
|
return fmt.Errorf("store: create enrollment token: %w", err)
|
||||||
}
|
}
|
||||||
@@ -77,9 +76,10 @@ type EnrollmentTokenAttachments struct {
|
|||||||
// EncRepoCreds is the AEAD ciphertext bound (additional-data) to
|
// EncRepoCreds is the AEAD ciphertext bound (additional-data) to
|
||||||
// "token:" + token_hash. Empty if no creds were stashed.
|
// "token:" + token_hash. Empty if no creds were stashed.
|
||||||
EncRepoCreds string
|
EncRepoCreds string
|
||||||
// DefaultPaths is the operator's run-now path list. Always
|
// InitialPaths is the operator-supplied path list seeded into
|
||||||
// non-nil (empty slice if none were set).
|
// the host's initial manual schedule. Always non-nil (empty
|
||||||
DefaultPaths []string
|
// slice if none were set).
|
||||||
|
InitialPaths []string
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetEnrollmentTokenAttachments returns the operator-supplied
|
// GetEnrollmentTokenAttachments returns the operator-supplied
|
||||||
@@ -93,25 +93,25 @@ type EnrollmentTokenAttachments struct {
|
|||||||
func (s *Store) GetEnrollmentTokenAttachments(ctx context.Context, tokenHash string) (EnrollmentTokenAttachments, error) {
|
func (s *Store) GetEnrollmentTokenAttachments(ctx context.Context, tokenHash string) (EnrollmentTokenAttachments, error) {
|
||||||
now := time.Now().UTC().Format(time.RFC3339Nano)
|
now := time.Now().UTC().Format(time.RFC3339Nano)
|
||||||
row := s.db.QueryRowContext(ctx,
|
row := s.db.QueryRowContext(ctx,
|
||||||
`SELECT enc_repo_creds, default_paths FROM enrollment_tokens
|
`SELECT enc_repo_creds, initial_paths FROM enrollment_tokens
|
||||||
WHERE token_hash = ? AND consumed_at IS NULL AND expires_at > ?`,
|
WHERE token_hash = ? AND consumed_at IS NULL AND expires_at > ?`,
|
||||||
tokenHash, now)
|
tokenHash, now)
|
||||||
var (
|
var (
|
||||||
enc sql.NullString
|
enc sql.NullString
|
||||||
defaultPaths string
|
initialPaths string
|
||||||
)
|
)
|
||||||
if err := row.Scan(&enc, &defaultPaths); err != nil {
|
if err := row.Scan(&enc, &initialPaths); err != nil {
|
||||||
if errors.Is(err, sql.ErrNoRows) {
|
if errors.Is(err, sql.ErrNoRows) {
|
||||||
return EnrollmentTokenAttachments{}, ErrNotFound
|
return EnrollmentTokenAttachments{}, ErrNotFound
|
||||||
}
|
}
|
||||||
return EnrollmentTokenAttachments{}, fmt.Errorf("store: get enrollment token attachments: %w", err)
|
return EnrollmentTokenAttachments{}, fmt.Errorf("store: get enrollment token attachments: %w", err)
|
||||||
}
|
}
|
||||||
out := EnrollmentTokenAttachments{DefaultPaths: []string{}}
|
out := EnrollmentTokenAttachments{InitialPaths: []string{}}
|
||||||
if enc.Valid {
|
if enc.Valid {
|
||||||
out.EncRepoCreds = enc.String
|
out.EncRepoCreds = enc.String
|
||||||
}
|
}
|
||||||
if defaultPaths != "" {
|
if initialPaths != "" {
|
||||||
_ = json.Unmarshal([]byte(defaultPaths), &out.DefaultPaths)
|
_ = json.Unmarshal([]byte(initialPaths), &out.InitialPaths)
|
||||||
}
|
}
|
||||||
return out, nil
|
return out, nil
|
||||||
}
|
}
|
||||||
|
|||||||
+7
-19
@@ -17,25 +17,17 @@ func (s *Store) CreateHost(ctx context.Context, h Host, agentTokenHash, certPinS
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("store: marshal tags: %w", err)
|
return fmt.Errorf("store: marshal tags: %w", err)
|
||||||
}
|
}
|
||||||
if h.DefaultPaths == nil {
|
|
||||||
h.DefaultPaths = []string{}
|
|
||||||
}
|
|
||||||
defaultPaths, err := json.Marshal(h.DefaultPaths)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("store: marshal default_paths: %w", err)
|
|
||||||
}
|
|
||||||
_, err = s.db.ExecContext(ctx,
|
_, err = s.db.ExecContext(ctx,
|
||||||
`INSERT INTO hosts (
|
`INSERT INTO hosts (
|
||||||
id, name, os, arch, agent_version, restic_version, protocol_version,
|
id, name, os, arch, agent_version, restic_version, protocol_version,
|
||||||
enrolled_at, status, tags,
|
enrolled_at, status, tags,
|
||||||
agent_token_hash, cert_pin_sha256, default_paths
|
agent_token_hash, cert_pin_sha256
|
||||||
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, 'offline', ?, ?, ?, ?)`,
|
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, 'offline', ?, ?, ?)`,
|
||||||
h.ID, h.Name, h.OS, h.Arch,
|
h.ID, h.Name, h.OS, h.Arch,
|
||||||
h.AgentVersion, h.ResticVersion, h.ProtocolVersion,
|
h.AgentVersion, h.ResticVersion, h.ProtocolVersion,
|
||||||
h.EnrolledAt.UTC().Format(time.RFC3339Nano),
|
h.EnrolledAt.UTC().Format(time.RFC3339Nano),
|
||||||
string(tags),
|
string(tags),
|
||||||
agentTokenHash, certPinSHA256,
|
agentTokenHash, certPinSHA256)
|
||||||
string(defaultPaths))
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("store: create host: %w", err)
|
return fmt.Errorf("store: create host: %w", err)
|
||||||
}
|
}
|
||||||
@@ -50,7 +42,7 @@ func (s *Store) LookupHostByAgentToken(ctx context.Context, tokenHash string) (*
|
|||||||
enrolled_at, last_seen_at, status, repo_id, tags,
|
enrolled_at, last_seen_at, status, repo_id, tags,
|
||||||
current_job_id, last_backup_at, last_backup_status,
|
current_job_id, last_backup_at, last_backup_status,
|
||||||
repo_size_bytes, snapshot_count, open_alert_count,
|
repo_size_bytes, snapshot_count, open_alert_count,
|
||||||
applied_schedule_version, default_paths, repo_initialised_at
|
applied_schedule_version, repo_initialised_at
|
||||||
FROM hosts WHERE agent_token_hash = ?`,
|
FROM hosts WHERE agent_token_hash = ?`,
|
||||||
tokenHash)
|
tokenHash)
|
||||||
return scanHost(row)
|
return scanHost(row)
|
||||||
@@ -63,7 +55,7 @@ func (s *Store) GetHost(ctx context.Context, id string) (*Host, error) {
|
|||||||
enrolled_at, last_seen_at, status, repo_id, tags,
|
enrolled_at, last_seen_at, status, repo_id, tags,
|
||||||
current_job_id, last_backup_at, last_backup_status,
|
current_job_id, last_backup_at, last_backup_status,
|
||||||
repo_size_bytes, snapshot_count, open_alert_count,
|
repo_size_bytes, snapshot_count, open_alert_count,
|
||||||
applied_schedule_version, default_paths, repo_initialised_at
|
applied_schedule_version, repo_initialised_at
|
||||||
FROM hosts WHERE id = ?`, id)
|
FROM hosts WHERE id = ?`, id)
|
||||||
return scanHost(row)
|
return scanHost(row)
|
||||||
}
|
}
|
||||||
@@ -124,7 +116,7 @@ func (s *Store) ListHosts(ctx context.Context) ([]Host, error) {
|
|||||||
enrolled_at, last_seen_at, status, repo_id, tags,
|
enrolled_at, last_seen_at, status, repo_id, tags,
|
||||||
current_job_id, last_backup_at, last_backup_status,
|
current_job_id, last_backup_at, last_backup_status,
|
||||||
repo_size_bytes, snapshot_count, open_alert_count,
|
repo_size_bytes, snapshot_count, open_alert_count,
|
||||||
applied_schedule_version, default_paths, repo_initialised_at
|
applied_schedule_version, repo_initialised_at
|
||||||
FROM hosts ORDER BY name`)
|
FROM hosts ORDER BY name`)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("store: list hosts: %w", err)
|
return nil, fmt.Errorf("store: list hosts: %w", err)
|
||||||
@@ -162,7 +154,6 @@ func scanHostRow(s hostScanner) (*Host, error) {
|
|||||||
repoID, currentJob, lastBkSt sql.NullString
|
repoID, currentJob, lastBkSt sql.NullString
|
||||||
enrolled string
|
enrolled string
|
||||||
tags string
|
tags string
|
||||||
defaultPaths string
|
|
||||||
repoInitAt sql.NullString
|
repoInitAt sql.NullString
|
||||||
)
|
)
|
||||||
err := s.Scan(&h.ID, &h.Name, &h.OS, &h.Arch,
|
err := s.Scan(&h.ID, &h.Name, &h.OS, &h.Arch,
|
||||||
@@ -170,7 +161,7 @@ func scanHostRow(s hostScanner) (*Host, error) {
|
|||||||
&enrolled, &lastSeen, &h.Status, &repoID, &tags,
|
&enrolled, &lastSeen, &h.Status, &repoID, &tags,
|
||||||
¤tJob, &lastBackupAt, &lastBkSt,
|
¤tJob, &lastBackupAt, &lastBkSt,
|
||||||
&h.RepoSizeBytes, &h.SnapshotCount, &h.OpenAlertCount,
|
&h.RepoSizeBytes, &h.SnapshotCount, &h.OpenAlertCount,
|
||||||
&h.AppliedScheduleVersion, &defaultPaths, &repoInitAt)
|
&h.AppliedScheduleVersion, &repoInitAt)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if errors.Is(err, sql.ErrNoRows) {
|
if errors.Is(err, sql.ErrNoRows) {
|
||||||
return nil, ErrNotFound
|
return nil, ErrNotFound
|
||||||
@@ -211,9 +202,6 @@ func scanHostRow(s hostScanner) (*Host, error) {
|
|||||||
if tags != "" {
|
if tags != "" {
|
||||||
_ = json.Unmarshal([]byte(tags), &h.Tags)
|
_ = json.Unmarshal([]byte(tags), &h.Tags)
|
||||||
}
|
}
|
||||||
if defaultPaths != "" {
|
|
||||||
_ = json.Unmarshal([]byte(defaultPaths), &h.DefaultPaths)
|
|
||||||
}
|
|
||||||
if repoInitAt.Valid {
|
if repoInitAt.Valid {
|
||||||
t, err := time.Parse(time.RFC3339Nano, repoInitAt.String)
|
t, err := time.Parse(time.RFC3339Nano, repoInitAt.String)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -0,0 +1,53 @@
|
|||||||
|
-- 0007_manual_schedules.sql
|
||||||
|
--
|
||||||
|
-- Unify "what does this host back up?" under schedules. Drop the
|
||||||
|
-- legacy host.default_paths column in favour of a `manual` flag on
|
||||||
|
-- schedules: a manual schedule carries paths/excludes/tags/retention
|
||||||
|
-- like any other but has no cron expression — it only fires when
|
||||||
|
-- the operator clicks Run-now.
|
||||||
|
--
|
||||||
|
-- Steps (each is a single ALTER, no table rebuilds):
|
||||||
|
-- 1. Add schedules.manual.
|
||||||
|
-- 2. For every host with non-empty default_paths, create a manual
|
||||||
|
-- schedule seeded with those paths and bump host_schedule_version
|
||||||
|
-- so the next push reaches the agent.
|
||||||
|
-- 3. ALTER TABLE hosts DROP COLUMN default_paths.
|
||||||
|
-- 4. ALTER TABLE enrollment_tokens RENAME COLUMN default_paths
|
||||||
|
-- TO initial_paths.
|
||||||
|
--
|
||||||
|
-- The earlier draft of this migration rebuilt hosts via the
|
||||||
|
-- create-new + drop-old + rename pattern. With foreign_keys=ON
|
||||||
|
-- (which the connection DSN sets), DROP TABLE on the parent
|
||||||
|
-- triggered ON DELETE CASCADE on every child of hosts(id) — the
|
||||||
|
-- smoke env lost schedules / jobs / snapshots / host_credentials
|
||||||
|
-- as a result. SQLite 3.35+ supports column-level ALTERs, so we
|
||||||
|
-- skip the rebuild entirely and avoid the cascade trap.
|
||||||
|
|
||||||
|
ALTER TABLE schedules ADD COLUMN manual INTEGER NOT NULL DEFAULT 0;
|
||||||
|
|
||||||
|
INSERT INTO schedules (
|
||||||
|
id, host_id, kind, cron_expr,
|
||||||
|
paths, excludes, tags, retention_policy, options,
|
||||||
|
pre_hook, post_hook, enabled, manual, created_at, updated_at
|
||||||
|
)
|
||||||
|
SELECT
|
||||||
|
lower(hex(randomblob(13))),
|
||||||
|
id, 'backup', '',
|
||||||
|
default_paths, '[]', '[]', '{}', '{}',
|
||||||
|
'', '', 1, 1,
|
||||||
|
strftime('%Y-%m-%dT%H:%M:%fZ', 'now'),
|
||||||
|
strftime('%Y-%m-%dT%H:%M:%fZ', 'now')
|
||||||
|
FROM hosts
|
||||||
|
WHERE default_paths IS NOT NULL
|
||||||
|
AND default_paths != ''
|
||||||
|
AND default_paths != '[]';
|
||||||
|
|
||||||
|
INSERT INTO host_schedule_version (host_id, version)
|
||||||
|
SELECT id, 1 FROM hosts
|
||||||
|
WHERE default_paths IS NOT NULL
|
||||||
|
AND default_paths != ''
|
||||||
|
AND default_paths != '[]'
|
||||||
|
ON CONFLICT(host_id) DO UPDATE SET version = version + 1;
|
||||||
|
|
||||||
|
ALTER TABLE hosts DROP COLUMN default_paths;
|
||||||
|
ALTER TABLE enrollment_tokens RENAME COLUMN default_paths TO initial_paths;
|
||||||
@@ -43,13 +43,13 @@ func (st *Store) CreateSchedule(ctx context.Context, s *Schedule) error {
|
|||||||
if _, err := tx.ExecContext(ctx,
|
if _, err := tx.ExecContext(ctx,
|
||||||
`INSERT INTO schedules (
|
`INSERT INTO schedules (
|
||||||
id, host_id, kind, cron_expr, paths, excludes, tags,
|
id, host_id, kind, cron_expr, paths, excludes, tags,
|
||||||
retention_policy, options, pre_hook, post_hook, enabled,
|
retention_policy, options, pre_hook, post_hook, enabled, manual,
|
||||||
created_at, updated_at
|
created_at, updated_at
|
||||||
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
|
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
|
||||||
s.ID, s.HostID, s.Kind, s.CronExpr,
|
s.ID, s.HostID, s.Kind, s.CronExpr,
|
||||||
string(pathsJSON), string(excludesJSON), string(tagsJSON),
|
string(pathsJSON), string(excludesJSON), string(tagsJSON),
|
||||||
string(retentionJSON), string(optionsJSON),
|
string(retentionJSON), string(optionsJSON),
|
||||||
s.PreHook, s.PostHook, boolToInt(s.Enabled),
|
s.PreHook, s.PostHook, boolToInt(s.Enabled), boolToInt(s.Manual),
|
||||||
now.Format(time.RFC3339Nano), now.Format(time.RFC3339Nano),
|
now.Format(time.RFC3339Nano), now.Format(time.RFC3339Nano),
|
||||||
); err != nil {
|
); err != nil {
|
||||||
return fmt.Errorf("store: create schedule: %w", err)
|
return fmt.Errorf("store: create schedule: %w", err)
|
||||||
@@ -94,13 +94,13 @@ func (st *Store) UpdateSchedule(ctx context.Context, s *Schedule) error {
|
|||||||
`UPDATE schedules SET
|
`UPDATE schedules SET
|
||||||
cron_expr = ?, paths = ?, excludes = ?, tags = ?,
|
cron_expr = ?, paths = ?, excludes = ?, tags = ?,
|
||||||
retention_policy = ?, options = ?,
|
retention_policy = ?, options = ?,
|
||||||
pre_hook = ?, post_hook = ?, enabled = ?,
|
pre_hook = ?, post_hook = ?, enabled = ?, manual = ?,
|
||||||
updated_at = ?
|
updated_at = ?
|
||||||
WHERE id = ? AND host_id = ?`,
|
WHERE id = ? AND host_id = ?`,
|
||||||
s.CronExpr,
|
s.CronExpr,
|
||||||
string(pathsJSON), string(excludesJSON), string(tagsJSON),
|
string(pathsJSON), string(excludesJSON), string(tagsJSON),
|
||||||
string(retentionJSON), string(optionsJSON),
|
string(retentionJSON), string(optionsJSON),
|
||||||
s.PreHook, s.PostHook, boolToInt(s.Enabled),
|
s.PreHook, s.PostHook, boolToInt(s.Enabled), boolToInt(s.Manual),
|
||||||
now.Format(time.RFC3339Nano),
|
now.Format(time.RFC3339Nano),
|
||||||
s.ID, s.HostID,
|
s.ID, s.HostID,
|
||||||
)
|
)
|
||||||
@@ -148,7 +148,7 @@ func (st *Store) DeleteSchedule(ctx context.Context, hostID, scheduleID string)
|
|||||||
func (st *Store) GetSchedule(ctx context.Context, hostID, scheduleID string) (*Schedule, error) {
|
func (st *Store) GetSchedule(ctx context.Context, hostID, scheduleID string) (*Schedule, error) {
|
||||||
row := st.db.QueryRowContext(ctx,
|
row := st.db.QueryRowContext(ctx,
|
||||||
`SELECT id, host_id, kind, cron_expr, paths, excludes, tags,
|
`SELECT id, host_id, kind, cron_expr, paths, excludes, tags,
|
||||||
retention_policy, options, pre_hook, post_hook, enabled,
|
retention_policy, options, pre_hook, post_hook, enabled, manual,
|
||||||
created_at, updated_at
|
created_at, updated_at
|
||||||
FROM schedules WHERE id = ? AND host_id = ?`,
|
FROM schedules WHERE id = ? AND host_id = ?`,
|
||||||
scheduleID, hostID)
|
scheduleID, hostID)
|
||||||
@@ -164,7 +164,7 @@ func (st *Store) GetSchedule(ctx context.Context, hostID, scheduleID string) (*S
|
|||||||
func (st *Store) ListSchedulesByHost(ctx context.Context, hostID string) ([]Schedule, error) {
|
func (st *Store) ListSchedulesByHost(ctx context.Context, hostID string) ([]Schedule, error) {
|
||||||
rows, err := st.db.QueryContext(ctx,
|
rows, err := st.db.QueryContext(ctx,
|
||||||
`SELECT id, host_id, kind, cron_expr, paths, excludes, tags,
|
`SELECT id, host_id, kind, cron_expr, paths, excludes, tags,
|
||||||
retention_policy, options, pre_hook, post_hook, enabled,
|
retention_policy, options, pre_hook, post_hook, enabled, manual,
|
||||||
created_at, updated_at
|
created_at, updated_at
|
||||||
FROM schedules WHERE host_id = ? ORDER BY created_at`,
|
FROM schedules WHERE host_id = ? ORDER BY created_at`,
|
||||||
hostID)
|
hostID)
|
||||||
@@ -238,11 +238,11 @@ func scanScheduleRow(s scheduleScanner) (*Schedule, error) {
|
|||||||
out Schedule
|
out Schedule
|
||||||
paths, excludes, tags, retention, options string
|
paths, excludes, tags, retention, options string
|
||||||
createdAt, updatedAt string
|
createdAt, updatedAt string
|
||||||
enabled int
|
enabled, manual int
|
||||||
)
|
)
|
||||||
err := s.Scan(&out.ID, &out.HostID, &out.Kind, &out.CronExpr,
|
err := s.Scan(&out.ID, &out.HostID, &out.Kind, &out.CronExpr,
|
||||||
&paths, &excludes, &tags, &retention, &options,
|
&paths, &excludes, &tags, &retention, &options,
|
||||||
&out.PreHook, &out.PostHook, &enabled,
|
&out.PreHook, &out.PostHook, &enabled, &manual,
|
||||||
&createdAt, &updatedAt)
|
&createdAt, &updatedAt)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@@ -263,6 +263,7 @@ func scanScheduleRow(s scheduleScanner) (*Schedule, error) {
|
|||||||
_ = json.Unmarshal([]byte(options), &out.Options)
|
_ = json.Unmarshal([]byte(options), &out.Options)
|
||||||
}
|
}
|
||||||
out.Enabled = enabled != 0
|
out.Enabled = enabled != 0
|
||||||
|
out.Manual = manual != 0
|
||||||
if t, err := time.Parse(time.RFC3339Nano, createdAt); err == nil {
|
if t, err := time.Parse(time.RFC3339Nano, createdAt); err == nil {
|
||||||
out.CreatedAt = t
|
out.CreatedAt = t
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -60,10 +60,6 @@ type Host struct {
|
|||||||
SnapshotCount int
|
SnapshotCount int
|
||||||
OpenAlertCount int
|
OpenAlertCount int
|
||||||
AppliedScheduleVersion int64
|
AppliedScheduleVersion int64
|
||||||
// DefaultPaths is what `restic backup` is invoked with when an
|
|
||||||
// operator hits "Run now" without supplying paths. Phase 1
|
|
||||||
// interim — schedules (P2-01) supersede this.
|
|
||||||
DefaultPaths []string
|
|
||||||
// RepoInitialisedAt is non-nil once we've confirmed the host's
|
// RepoInitialisedAt is non-nil once we've confirmed the host's
|
||||||
// repo has been initialised — either the operator clicked the
|
// repo has been initialised — either the operator clicked the
|
||||||
// init button, or a backup succeeded, or snapshots.report came
|
// init button, or a backup succeeded, or snapshots.report came
|
||||||
@@ -90,6 +86,12 @@ type Schedule struct {
|
|||||||
PreHook string
|
PreHook string
|
||||||
PostHook string
|
PostHook string
|
||||||
Enabled bool
|
Enabled bool
|
||||||
|
// Manual schedules carry paths/excludes/tags/retention like any
|
||||||
|
// other but have no cron — they only fire when the operator
|
||||||
|
// clicks Run-now. Lets us keep one data shape for "what gets
|
||||||
|
// backed up" without forcing every host to have an automated
|
||||||
|
// schedule. Created by Add-host with the typed paths.
|
||||||
|
Manual bool
|
||||||
CreatedAt time.Time
|
CreatedAt time.Time
|
||||||
UpdatedAt time.Time
|
UpdatedAt time.Time
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -100,6 +100,7 @@ Sizes: **S** = under a day, **M** = 1–3 days, **L** = 3–7 days.
|
|||||||
- [x] **P2-01** (M) Schedule schema + CRUD API. `schedules` table was already laid down in 0001; this slice adds `store.Schedule`/`RetentionPolicy`/`ScheduleOptions` types, `CreateSchedule` / `GetSchedule` / `ListSchedulesByHost` / `UpdateSchedule` / `DeleteSchedule` / `GetHostScheduleVersion` / `SetHostAppliedScheduleVersion` (mutations bump `host_schedule_version` atomically in-tx), and REST endpoints `GET|POST /api/hosts/{id}/schedules` + `PUT|DELETE /api/hosts/{id}/schedules/{sid}`. Validation: cron-expr parses via `robfig/cron/v3` (same parser the agent will use, so anything that validates here will fire there); kind ∈ {backup, forget, prune, check} (init/unlock are operator-only); backup schedules require ≥1 path; hooks rejected on non-backup kinds (spec §14.3). Mutations audit-logged. Server + store tests cover the happy path, validation, and version bumps.
|
- [x] **P2-01** (M) Schedule schema + CRUD API. `schedules` table was already laid down in 0001; this slice adds `store.Schedule`/`RetentionPolicy`/`ScheduleOptions` types, `CreateSchedule` / `GetSchedule` / `ListSchedulesByHost` / `UpdateSchedule` / `DeleteSchedule` / `GetHostScheduleVersion` / `SetHostAppliedScheduleVersion` (mutations bump `host_schedule_version` atomically in-tx), and REST endpoints `GET|POST /api/hosts/{id}/schedules` + `PUT|DELETE /api/hosts/{id}/schedules/{sid}`. Validation: cron-expr parses via `robfig/cron/v3` (same parser the agent will use, so anything that validates here will fire there); kind ∈ {backup, forget, prune, check} (init/unlock are operator-only); backup schedules require ≥1 path; hooks rejected on non-backup kinds (spec §14.3). Mutations audit-logged. Server + store tests cover the happy path, validation, and version bumps.
|
||||||
- [x] **P2-02** (L) Server-pushed schedule reconciliation. `pushScheduleSet*` helpers (on-hello + async post-CRUD flavours), wiring in `onAgentHello` (always pushes, even when the host has no repo creds yet), `pushScheduleSetAsync` called from Create/Update/Delete handlers (no-op when the host is offline; on-hello catches up). `MsgScheduleAck` handled in the WS dispatcher: `OnScheduleAck` callback persists `applied_schedule_version`. Agent-side `schedule.set` handler ships in P2-03; the server side now has parity tests.
|
- [x] **P2-02** (L) Server-pushed schedule reconciliation. `pushScheduleSet*` helpers (on-hello + async post-CRUD flavours), wiring in `onAgentHello` (always pushes, even when the host has no repo creds yet), `pushScheduleSetAsync` called from Create/Update/Delete handlers (no-op when the host is offline; on-hello catches up). `MsgScheduleAck` handled in the WS dispatcher: `OnScheduleAck` callback persists `applied_schedule_version`. Agent-side `schedule.set` handler ships in P2-03; the server side now has parity tests.
|
||||||
- [x] **P2-03** (M) Agent local scheduler. New `internal/agent/scheduler` package wraps `robfig/cron/v3` — `Apply(ScheduleSetPayload, Sender)` stops the prior cron (waits for in-flight entries), rebuilds from scratch (skipping disabled entries + skipping bad cron exprs with a warn log), starts, and emits `schedule.ack`. On a tick the entry sends a new `schedule.fire` envelope to the server with `{schedule_id, scheduled_at}`. The server's `OnScheduleFire` callback (`dispatchScheduledJob`) looks up the schedule, builds args from kind, persists a `jobs` row with `actor_kind=schedule` + `scheduled_id`, and ships `command.run` back on the same conn — agent runs the job through the existing dispatcher. Tx is swapped on every Apply so reconnect is handled naturally (cron entries that fire against a dropped tx log + skip the tick). `CreateJob` now writes `scheduled_id`; this column was in the schema since 0001 but never populated. Tests: scheduler unit tests cover ack-on-apply, cron tick → fire envelope, disabled-entries silent, replace-prior-state stops the old cron. Server-side end-to-end test covers fire → command.run with the right job_id/kind/args, plus jobs row with actor_kind=schedule + scheduled_id linking back. **Deferred:** persistence of next-fire times across agent restarts (a missed fire window during downtime simply fires once on reconnect — desirable behaviour).
|
- [x] **P2-03** (M) Agent local scheduler. New `internal/agent/scheduler` package wraps `robfig/cron/v3` — `Apply(ScheduleSetPayload, Sender)` stops the prior cron (waits for in-flight entries), rebuilds from scratch (skipping disabled entries + skipping bad cron exprs with a warn log), starts, and emits `schedule.ack`. On a tick the entry sends a new `schedule.fire` envelope to the server with `{schedule_id, scheduled_at}`. The server's `OnScheduleFire` callback (`dispatchScheduledJob`) looks up the schedule, builds args from kind, persists a `jobs` row with `actor_kind=schedule` + `scheduled_id`, and ships `command.run` back on the same conn — agent runs the job through the existing dispatcher. Tx is swapped on every Apply so reconnect is handled naturally (cron entries that fire against a dropped tx log + skip the tick). `CreateJob` now writes `scheduled_id`; this column was in the schema since 0001 but never populated. Tests: scheduler unit tests cover ack-on-apply, cron tick → fire envelope, disabled-entries silent, replace-prior-state stops the old cron. Server-side end-to-end test covers fire → command.run with the right job_id/kind/args, plus jobs row with actor_kind=schedule + scheduled_id linking back. **Deferred:** persistence of next-fire times across agent restarts (a missed fire window during downtime simply fires once on reconnect — desirable behaviour).
|
||||||
|
- [x] **P2-04.5** (S) Manual schedules — kill `host.default_paths`. Two independent path lists (host.default_paths fed Run-now while schedule.paths fed cron) was a real footgun that could put divergent file sets in the same repo. Replaced with a `manual` flag on schedules: same data shape, no cron, fires only via Run-now. Migration 0007 drops `host.default_paths` (ALTER TABLE DROP COLUMN — no rebuild dance, the original draft used the parent-table-rebuild pattern and FK cascade wiped every dependent table on the smoke env), seeds a manual schedule from any non-empty default_paths, and renames `enrollment_tokens.default_paths` → `initial_paths`. Add-host form retitled "Initial schedule · manual" so the operator knows where the paths land. Per-schedule Run-now button (`POST /hosts/{id}/schedules/{sid}/run`) reuses the same `dispatchScheduleNow` path used by `schedule.fire`. Dashboard's per-host Run-now picks the host's only enabled manual schedule, then falls back to the only enabled schedule, else returns "pick one in Schedules tab" — keeps one-click for the common case. Schedule edit form gains a "Manual schedule" toggle that hides the cron field when checked. Agent skips manual schedules in cron build. Validator allows missing cron when manual=true.
|
||||||
- [x] **P2-04** (M) Schedule editor UI. New "Schedules" sub-tab on host detail (header + run-now panel preserved across the snapshot/schedule pages). List view shows status, cron, paths, retention summary (`store.RetentionPolicy.Summary()` renders "last=7, d=14, w=4"), tags, and edit/delete buttons. The header carries a "version N · agent in sync / agent at vM" indicator backed by `host_schedule_version` + `applied_schedule_version`. Create/edit form covers cron expr (with quick-pick presets), paths textarea, excludes textarea, tags (comma-separated), retention (six numeric inputs mirroring restic's `--keep-*` flags), bandwidth caps, enabled toggle. Form validation re-renders with the operator's typed input still in place. Each save fires `pushScheduleSetAsync` so an online agent re-arms within a few seconds. Hooks UI deferred to P2-15 (lands when the hook execution path does).
|
- [x] **P2-04** (M) Schedule editor UI. New "Schedules" sub-tab on host detail (header + run-now panel preserved across the snapshot/schedule pages). List view shows status, cron, paths, retention summary (`store.RetentionPolicy.Summary()` renders "last=7, d=14, w=4"), tags, and edit/delete buttons. The header carries a "version N · agent in sync / agent at vM" indicator backed by `host_schedule_version` + `applied_schedule_version`. Create/edit form covers cron expr (with quick-pick presets), paths textarea, excludes textarea, tags (comma-separated), retention (six numeric inputs mirroring restic's `--keep-*` flags), bandwidth caps, enabled toggle. Form validation re-renders with the operator's typed input still in place. Each save fires `pushScheduleSetAsync` so an online agent re-arms within a few seconds. Hooks UI deferred to P2-15 (lands when the hook execution path does).
|
||||||
- [ ] **P2-05** (M) `forget` command with retention policy (keep-last/daily/weekly/monthly/yearly)
|
- [ ] **P2-05** (M) `forget` command with retention policy (keep-last/daily/weekly/monthly/yearly)
|
||||||
- [ ] **P2-06** (M) `prune` command (admin-only, uses non-append-only credential)
|
- [ ] **P2-06** (M) `prune` command (admin-only, uses non-append-only credential)
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -43,14 +43,14 @@
|
|||||||
<div class="field-help">Free-form. Used for filtering and grouping on the dashboard.</div>
|
<div class="field-help">Free-form. Used for filtering and grouping on the dashboard.</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<h3 class="text-[13px] font-semibold uppercase tracking-[0.08em] text-ink-mute mb-4 pt-6 border-t border-line-soft">Default backup paths</h3>
|
<h3 class="text-[13px] font-semibold uppercase tracking-[0.08em] text-ink-mute mb-4 pt-6 border-t border-line-soft">Initial schedule <span class="text-ink-fade font-normal">· manual</span></h3>
|
||||||
<div class="mb-7">
|
<div class="mb-7">
|
||||||
<label class="field-label" for="ah-paths">Paths <span class="text-ink-fade font-normal">· one per line</span></label>
|
<label class="field-label" for="ah-paths">Paths <span class="text-ink-fade font-normal">· one per line</span></label>
|
||||||
<textarea id="ah-paths" name="paths" rows="3" class="field mono"
|
<textarea id="ah-paths" name="paths" rows="3" class="field mono"
|
||||||
style="resize: vertical;"
|
style="resize: vertical;"
|
||||||
placeholder="/etc /home /var/lib/postgresql">{{$page.Paths}}</textarea>
|
placeholder="/etc /home /var/lib/postgresql">{{$page.Paths}}</textarea>
|
||||||
<div class="field-help">
|
<div class="field-help">
|
||||||
What <span class="mono text-ink-mid">restic backup</span> runs against when an operator hits “Run now”. Until schedules ship in Phase 2, this is the only source of paths for run-now jobs — leave it empty if you’ll dispatch via the JSON API instead.
|
These paths become an <strong>initial manual schedule</strong> on the new host — manual = no cron, only fires when you click <span class="mono text-ink-mid">Run now</span>. You can edit this schedule (or add automated ones alongside it) from the host's <strong>Schedules</strong> tab. Leave blank to skip — the host will enrol but can't back up until you add a schedule.
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -187,6 +187,10 @@
|
|||||||
<div>{{$page.ExpiresAt.Format "15:04:05.000"}} <span class="text-ink-mid">server</span> token minted · 1h ttl</div>
|
<div>{{$page.ExpiresAt.Format "15:04:05.000"}} <span class="text-ink-mid">server</span> token minted · 1h ttl</div>
|
||||||
<div class="text-ink-fade"> awaiting POST /api/agents/enroll …</div>
|
<div class="text-ink-fade"> awaiting POST /api/agents/enroll …</div>
|
||||||
</div>
|
</div>
|
||||||
|
<p class="mt-4 text-[12.5px] text-ink-mid leading-[1.6]">
|
||||||
|
Enrolment will create a <span class="mono text-ink">manual</span> schedule from the paths above. Find it (and add automated ones) under
|
||||||
|
<span class="mono text-ink">Host > Schedules</span> once the agent connects.
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<aside class="col-span-5">
|
<aside class="col-span-5">
|
||||||
|
|||||||
@@ -38,9 +38,18 @@
|
|||||||
<div class="col-span-7 panel rounded-[7px] px-8 py-7">
|
<div class="col-span-7 panel rounded-[7px] px-8 py-7">
|
||||||
|
|
||||||
<h3 class="text-[13px] font-semibold uppercase tracking-[0.08em] text-ink-mute mb-4">When</h3>
|
<h3 class="text-[13px] font-semibold uppercase tracking-[0.08em] text-ink-mute mb-4">When</h3>
|
||||||
|
|
||||||
<div class="mb-5">
|
<div class="mb-5">
|
||||||
|
<label class="flex items-center gap-2.5 cursor-pointer text-[13px]">
|
||||||
|
<input id="se-manual" type="checkbox" name="manual" {{if $page.Manual}}checked{{end}}
|
||||||
|
onchange="document.getElementById('se-cron-block').style.display=this.checked?'none':'';">
|
||||||
|
<span>Manual schedule <span class="text-ink-fade font-normal">— no cron, only fires when you click Run-now</span></span>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="se-cron-block" class="mb-5" {{if $page.Manual}}style="display: none;"{{end}}>
|
||||||
<label class="field-label" for="se-cron">Cron expression</label>
|
<label class="field-label" for="se-cron">Cron expression</label>
|
||||||
<input id="se-cron" name="cron_expr" type="text" class="field mono" required value="{{$page.CronExpr}}">
|
<input id="se-cron" name="cron_expr" type="text" class="field mono" value="{{$page.CronExpr}}">
|
||||||
<div class="field-help">
|
<div class="field-help">
|
||||||
Standard 5-field cron with descriptors. Examples:
|
Standard 5-field cron with descriptors. Examples:
|
||||||
<span class="mono text-ink-mid">0 3 * * *</span> (daily 03:00),
|
<span class="mono text-ink-mid">0 3 * * *</span> (daily 03:00),
|
||||||
|
|||||||
@@ -56,9 +56,9 @@
|
|||||||
</div>
|
</div>
|
||||||
{{else}}
|
{{else}}
|
||||||
<div class="hairline grid items-baseline px-4 py-2.5 text-[11px] text-ink-fade uppercase tracking-[0.08em]"
|
<div class="hairline grid items-baseline px-4 py-2.5 text-[11px] text-ink-fade uppercase tracking-[0.08em]"
|
||||||
style="grid-template-columns: 0.5fr 1fr 2fr 1.5fr 0.5fr 0.7fr; column-gap: 18px;">
|
style="grid-template-columns: 0.6fr 1.1fr 2fr 1.3fr 0.5fr 1fr; column-gap: 18px;">
|
||||||
<div>Status</div>
|
<div>Status</div>
|
||||||
<div>Cron</div>
|
<div>When</div>
|
||||||
<div>Paths</div>
|
<div>Paths</div>
|
||||||
<div>Retention</div>
|
<div>Retention</div>
|
||||||
<div>Tags</div>
|
<div>Tags</div>
|
||||||
@@ -66,24 +66,33 @@
|
|||||||
</div>
|
</div>
|
||||||
{{range $page.Schedules}}
|
{{range $page.Schedules}}
|
||||||
<div class="grid items-center px-4 py-3 text-[13px] hairline"
|
<div class="grid items-center px-4 py-3 text-[13px] hairline"
|
||||||
style="grid-template-columns: 0.5fr 1fr 2fr 1.5fr 0.5fr 0.7fr; column-gap: 18px;">
|
style="grid-template-columns: 0.6fr 1.1fr 2fr 1.3fr 0.5fr 1fr; column-gap: 18px;">
|
||||||
<div>
|
<div class="flex flex-col gap-0.5">
|
||||||
{{if .Enabled}}
|
{{if .Enabled}}
|
||||||
<span class="mono text-[11px] text-ok">enabled</span>
|
<span class="mono text-[11px] text-ok">enabled</span>
|
||||||
{{else}}
|
{{else}}
|
||||||
<span class="mono text-[11px] text-ink-fade">disabled</span>
|
<span class="mono text-[11px] text-ink-fade">disabled</span>
|
||||||
{{end}}
|
{{end}}
|
||||||
|
{{if .Manual}}
|
||||||
|
<span class="mono text-[10.5px] text-ink-mute">manual</span>
|
||||||
|
{{end}}
|
||||||
</div>
|
</div>
|
||||||
<div class="mono text-ink">{{.CronExpr}}</div>
|
<div class="mono text-ink">{{if .Manual}}<span class="text-ink-fade">— run-now only —</span>{{else}}{{.CronExpr}}{{end}}</div>
|
||||||
<div class="mono text-ink-mid text-[12px] truncate" title="{{joinDot .Paths}}">{{joinDot .Paths}}</div>
|
<div class="mono text-ink-mid text-[12px] truncate" title="{{joinDot .Paths}}">{{joinDot .Paths}}</div>
|
||||||
<div class="mono text-[12px] text-ink-mid">{{.RetentionPolicy.Summary}}</div>
|
<div class="mono text-[12px] text-ink-mid">{{.RetentionPolicy.Summary}}</div>
|
||||||
<div class="flex gap-1.5 flex-wrap">
|
<div class="flex gap-1.5 flex-wrap">
|
||||||
{{- range .Tags -}}<span class="tag">{{.}}</span>{{- end -}}
|
{{- range .Tags -}}<span class="tag">{{.}}</span>{{- end -}}
|
||||||
</div>
|
</div>
|
||||||
<div class="text-right flex gap-1.5 justify-end">
|
<div class="text-right flex gap-1.5 justify-end">
|
||||||
|
{{if and .Enabled (eq $host.Status "online")}}
|
||||||
|
<button class="btn btn-primary"
|
||||||
|
hx-post="/hosts/{{$host.ID}}/schedules/{{.ID}}/run"
|
||||||
|
hx-swap="none"
|
||||||
|
hx-disabled-elt="this">Run now</button>
|
||||||
|
{{end}}
|
||||||
<a href="/hosts/{{$host.ID}}/schedules/{{.ID}}/edit" class="btn">Edit</a>
|
<a href="/hosts/{{$host.ID}}/schedules/{{.ID}}/edit" class="btn">Edit</a>
|
||||||
<form method="post" action="/hosts/{{$host.ID}}/schedules/{{.ID}}/delete" style="display: inline;"
|
<form method="post" action="/hosts/{{$host.ID}}/schedules/{{.ID}}/delete" style="display: inline;"
|
||||||
onsubmit="return confirm('Delete schedule {{.CronExpr}}? Existing snapshots are not affected.');">
|
onsubmit="return confirm('Delete this schedule? Existing snapshots are not affected.');">
|
||||||
<button type="submit" class="btn btn-danger">Delete</button>
|
<button type="submit" class="btn btn-danger">Delete</button>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user