P2-04: schedule editor UI
Closes the schedule foundations slice — operator can now drive the
plumbing P2-01..03 landed without touching the JSON API.
* New routes:
- GET /hosts/{id}/schedules (list)
- GET /hosts/{id}/schedules/new (create form)
- POST /hosts/{id}/schedules/new (create)
- GET /hosts/{id}/schedules/{sid}/edit (edit form)
- POST /hosts/{id}/schedules/{sid}/edit (update)
- POST /hosts/{id}/schedules/{sid}/delete (delete, confirm-then-redirect)
* List view (web/templates/pages/schedules_list.html):
status, cron, paths, retention summary, tags, edit/delete buttons.
Header shows "version N · agent in sync" or "agent at vM" when the
push hasn't been ack'd yet — backed by host_schedule_version +
applied_schedule_version. Empty-state CTA points at /schedules/new.
* Create/edit form (web/templates/pages/schedule_edit.html, shared):
cron expression with five quick-pick presets (daily 3am / every 6h
/ @hourly / weekly Sun / monthly 1st), paths textarea (one per
line), excludes textarea, tags (comma-separated), retention as six
numeric fields (mirrors restic's --keep-* flags one-for-one),
bandwidth caps, enabled toggle. Side panel explains the
reconciliation flow so the operator knows what saving actually
does. Validation errors re-render with operator's input intact.
* internal/server/http/ui_schedules.go owns the handlers; reuses
the same validateSchedule + pushScheduleSetAsync used by the JSON
API path. Each save audit-logs schedule.created / schedule.updated
/ schedule.deleted (matching the JSON API actions).
* store.RetentionPolicy gains a Summary() method ("last=7, d=14,
w=4" or "—"). Used by the list view's table cell so templates
don't have to do any conditional retention rendering.
* Two new template helpers: list (string varargs → []string, used
for the cron preset row) and joinComma (sibling to joinDot for
the rare list that wants commas). RetentionPolicy.Summary covers
the schedule-list case but the helpers are general.
* host_detail.html secondary tabs row converted from inert <div>s
into <a> links. Snapshots active by default; Schedules now points
at the new page. Jobs/Repo/Settings remain inert until their
P2 owners ship.
Hooks UI deferred to P2-15 (lands with the hook execution path).
Single-kind UI (backup only) by design — other kinds get a UI when
their job dispatch lands in P2-05..08.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -153,6 +153,13 @@ func (s *Server) routes(r chi.Router) {
|
||||
r.Post("/hosts/new", s.handleUIAddHostPost)
|
||||
// Host detail (Snapshots tab is the default).
|
||||
r.Get("/hosts/{id}", s.handleUIHostDetail)
|
||||
// Schedules tab + create/edit/delete forms.
|
||||
r.Get("/hosts/{id}/schedules", s.handleUISchedulesList)
|
||||
r.Get("/hosts/{id}/schedules/new", s.handleUIScheduleNewGet)
|
||||
r.Post("/hosts/{id}/schedules/new", s.handleUIScheduleSave)
|
||||
r.Get("/hosts/{id}/schedules/{sid}/edit", s.handleUIScheduleEditGet)
|
||||
r.Post("/hosts/{id}/schedules/{sid}/edit", s.handleUIScheduleSave)
|
||||
r.Post("/hosts/{id}/schedules/{sid}/delete", s.handleUIScheduleDelete)
|
||||
// Live job log.
|
||||
r.Get("/jobs/{id}", s.handleUIJobDetail)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,467 @@
|
||||
package http
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
stdhttp "net/http"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/go-chi/chi/v5"
|
||||
"github.com/oklog/ulid/v2"
|
||||
|
||||
"gitea.dcglab.co.uk/steve/restic-manager/internal/api"
|
||||
"gitea.dcglab.co.uk/steve/restic-manager/internal/server/ui"
|
||||
"gitea.dcglab.co.uk/steve/restic-manager/internal/store"
|
||||
)
|
||||
|
||||
// schedulesListPage carries everything the Schedules tab needs.
|
||||
type schedulesListPage struct {
|
||||
Host store.Host
|
||||
Schedules []store.Schedule
|
||||
Version int64
|
||||
AppliedVersion int64
|
||||
}
|
||||
|
||||
// scheduleEditPage drives both the Create form (Schedule.ID empty)
|
||||
// and the Edit form (Schedule populated). Errors come back via Error
|
||||
// to be rendered as a banner; FormValues holds the just-submitted
|
||||
// raw fields so a failed POST can re-render with the operator's
|
||||
// typed input still in place.
|
||||
type scheduleEditPage struct {
|
||||
Host store.Host
|
||||
IsNew bool
|
||||
ScheduleID string
|
||||
Error string
|
||||
// Form values — strings so partial input survives validation
|
||||
// errors (e.g. operator typed "abc" into keep_last).
|
||||
CronExpr string
|
||||
PathsRaw string
|
||||
ExcludesRaw string
|
||||
TagsRaw string
|
||||
KeepLast string
|
||||
KeepHourly string
|
||||
KeepDaily string
|
||||
KeepWeekly string
|
||||
KeepMonthly string
|
||||
KeepYearly string
|
||||
LimitUpKBps string
|
||||
LimitDownKBps string
|
||||
Enabled bool
|
||||
}
|
||||
|
||||
// handleUISchedulesList renders the Schedules sub-tab on a host.
|
||||
func (s *Server) handleUISchedulesList(w stdhttp.ResponseWriter, r *stdhttp.Request) {
|
||||
u := s.requireUIUser(w, r)
|
||||
if u == nil {
|
||||
return
|
||||
}
|
||||
hostID := chi.URLParam(r, "id")
|
||||
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
|
||||
}
|
||||
rows, err := s.deps.Store.ListSchedulesByHost(r.Context(), hostID)
|
||||
if err != nil {
|
||||
stdhttp.Error(w, "internal", stdhttp.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
version, _ := s.deps.Store.GetHostScheduleVersion(r.Context(), hostID)
|
||||
|
||||
view := s.baseView(u, "dashboard")
|
||||
view.Title = host.Name + " · schedules · restic-manager"
|
||||
view.Page = schedulesListPage{
|
||||
Host: *host,
|
||||
Schedules: rows,
|
||||
Version: version,
|
||||
AppliedVersion: host.AppliedScheduleVersion,
|
||||
}
|
||||
if err := s.deps.UI.Render(w, "schedules_list", view); err != nil {
|
||||
slog.Error("ui: render schedules_list", "err", err)
|
||||
stdhttp.Error(w, "internal", stdhttp.StatusInternalServerError)
|
||||
}
|
||||
}
|
||||
|
||||
// handleUIScheduleNewGet renders the empty Create form.
|
||||
func (s *Server) handleUIScheduleNewGet(w stdhttp.ResponseWriter, r *stdhttp.Request) {
|
||||
u := s.requireUIUser(w, r)
|
||||
if u == nil {
|
||||
return
|
||||
}
|
||||
hostID := chi.URLParam(r, "id")
|
||||
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
|
||||
}
|
||||
view := s.baseView(u, "dashboard")
|
||||
view.Title = "New schedule · " + host.Name
|
||||
view.Page = scheduleEditPage{
|
||||
Host: *host,
|
||||
IsNew: true,
|
||||
CronExpr: "0 3 * * *",
|
||||
Enabled: true,
|
||||
}
|
||||
s.renderScheduleEdit(w, view)
|
||||
}
|
||||
|
||||
// handleUIScheduleEditGet renders the Edit form pre-filled from the
|
||||
// existing schedule row.
|
||||
func (s *Server) handleUIScheduleEditGet(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
|
||||
}
|
||||
sched, err := s.deps.Store.GetSchedule(r.Context(), hostID, scheduleID)
|
||||
if err != nil {
|
||||
if errors.Is(err, store.ErrNotFound) {
|
||||
stdhttp.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
stdhttp.Error(w, "internal", stdhttp.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
page := scheduleEditPage{
|
||||
Host: *host,
|
||||
IsNew: false,
|
||||
ScheduleID: sched.ID,
|
||||
CronExpr: sched.CronExpr,
|
||||
PathsRaw: strings.Join(sched.Paths, "\n"),
|
||||
ExcludesRaw: strings.Join(sched.Excludes, "\n"),
|
||||
TagsRaw: strings.Join(sched.Tags, ", "),
|
||||
Enabled: sched.Enabled,
|
||||
}
|
||||
page.KeepLast = intStringPtr(sched.RetentionPolicy.KeepLast)
|
||||
page.KeepHourly = intStringPtr(sched.RetentionPolicy.KeepHourly)
|
||||
page.KeepDaily = intStringPtr(sched.RetentionPolicy.KeepDaily)
|
||||
page.KeepWeekly = intStringPtr(sched.RetentionPolicy.KeepWeekly)
|
||||
page.KeepMonthly = intStringPtr(sched.RetentionPolicy.KeepMonthly)
|
||||
page.KeepYearly = intStringPtr(sched.RetentionPolicy.KeepYearly)
|
||||
page.LimitUpKBps = intStringPtr(sched.Options.LimitUploadKBps)
|
||||
page.LimitDownKBps = intStringPtr(sched.Options.LimitDownloadKBps)
|
||||
|
||||
view := s.baseView(u, "dashboard")
|
||||
view.Title = "Edit schedule · " + host.Name
|
||||
view.Page = page
|
||||
s.renderScheduleEdit(w, view)
|
||||
}
|
||||
|
||||
// handleUIScheduleSave handles POST for both create and update. The
|
||||
// edit form posts to /hosts/{id}/schedules/new (for create) or
|
||||
// /hosts/{id}/schedules/{sid}/edit (for update); we branch on whether
|
||||
// {sid} is present in the route params.
|
||||
func (s *Server) handleUIScheduleSave(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")
|
||||
storeUser, _, err := s.userByID(r, u.ID)
|
||||
if err != nil || storeUser == nil {
|
||||
stdhttp.Error(w, "internal", stdhttp.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
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 err := r.ParseForm(); err != nil {
|
||||
stdhttp.Error(w, "bad request", stdhttp.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
page := scheduleEditPage{
|
||||
Host: *host,
|
||||
IsNew: scheduleID == "",
|
||||
ScheduleID: scheduleID,
|
||||
CronExpr: strings.TrimSpace(r.PostForm.Get("cron_expr")),
|
||||
PathsRaw: r.PostForm.Get("paths"),
|
||||
ExcludesRaw: r.PostForm.Get("excludes"),
|
||||
TagsRaw: strings.TrimSpace(r.PostForm.Get("tags")),
|
||||
KeepLast: strings.TrimSpace(r.PostForm.Get("keep_last")),
|
||||
KeepHourly: strings.TrimSpace(r.PostForm.Get("keep_hourly")),
|
||||
KeepDaily: strings.TrimSpace(r.PostForm.Get("keep_daily")),
|
||||
KeepWeekly: strings.TrimSpace(r.PostForm.Get("keep_weekly")),
|
||||
KeepMonthly: strings.TrimSpace(r.PostForm.Get("keep_monthly")),
|
||||
KeepYearly: strings.TrimSpace(r.PostForm.Get("keep_yearly")),
|
||||
LimitUpKBps: strings.TrimSpace(r.PostForm.Get("limit_up_kbps")),
|
||||
LimitDownKBps: strings.TrimSpace(r.PostForm.Get("limit_down_kbps")),
|
||||
Enabled: r.PostForm.Get("enabled") == "on",
|
||||
}
|
||||
|
||||
// Convert the raw form values into store-shape data, surfacing
|
||||
// the first parse error as a banner.
|
||||
paths := splitPaths(page.PathsRaw)
|
||||
excludes := splitPaths(page.ExcludesRaw)
|
||||
tags := splitCSV(page.TagsRaw)
|
||||
|
||||
retention, err := parseRetention(page)
|
||||
if err != nil {
|
||||
page.Error = err.Error()
|
||||
s.renderEditPage(w, u, page)
|
||||
return
|
||||
}
|
||||
options, err := parseOptions(page)
|
||||
if err != nil {
|
||||
page.Error = err.Error()
|
||||
s.renderEditPage(w, u, page)
|
||||
return
|
||||
}
|
||||
|
||||
// Validate against the same rules the JSON API uses (cron, paths,
|
||||
// hooks-on-non-backup) — the UI only handles backup kind today,
|
||||
// so we hardcode kind=backup here.
|
||||
apiShape := scheduleAPI{
|
||||
Kind: api.JobBackup,
|
||||
CronExpr: page.CronExpr,
|
||||
Paths: paths,
|
||||
}
|
||||
if code, msg := validateSchedule(&apiShape); code != "" {
|
||||
page.Error = uiErrorMessage(code, msg)
|
||||
s.renderEditPage(w, u, page)
|
||||
return
|
||||
}
|
||||
|
||||
if page.IsNew {
|
||||
row := store.Schedule{
|
||||
ID: ulid.Make().String(),
|
||||
HostID: hostID,
|
||||
Kind: string(api.JobBackup),
|
||||
CronExpr: page.CronExpr,
|
||||
Paths: paths,
|
||||
Excludes: excludes,
|
||||
Tags: tags,
|
||||
RetentionPolicy: retention,
|
||||
Options: options,
|
||||
Enabled: page.Enabled,
|
||||
}
|
||||
if err := s.deps.Store.CreateSchedule(r.Context(), &row); err != nil {
|
||||
page.Error = "Couldn't save schedule — see server log."
|
||||
slog.Error("ui schedule create", "err", err)
|
||||
s.renderEditPage(w, u, page)
|
||||
return
|
||||
}
|
||||
_ = s.deps.Store.AppendAudit(r.Context(), store.AuditEntry{
|
||||
ID: ulid.Make().String(),
|
||||
UserID: &storeUser.ID,
|
||||
Actor: "user",
|
||||
Action: "schedule.created",
|
||||
TargetKind: ptr("schedule"),
|
||||
TargetID: &row.ID,
|
||||
TS: nowUTC(),
|
||||
})
|
||||
s.pushScheduleSetAsync(hostID)
|
||||
} else {
|
||||
existing, err := s.deps.Store.GetSchedule(r.Context(), hostID, scheduleID)
|
||||
if err != nil {
|
||||
if errors.Is(err, store.ErrNotFound) {
|
||||
stdhttp.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
stdhttp.Error(w, "internal", stdhttp.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
existing.CronExpr = page.CronExpr
|
||||
existing.Paths = paths
|
||||
existing.Excludes = excludes
|
||||
existing.Tags = tags
|
||||
existing.RetentionPolicy = retention
|
||||
existing.Options = options
|
||||
existing.Enabled = page.Enabled
|
||||
if err := s.deps.Store.UpdateSchedule(r.Context(), existing); err != nil {
|
||||
page.Error = "Couldn't save schedule — see server log."
|
||||
slog.Error("ui schedule update", "err", err)
|
||||
s.renderEditPage(w, u, page)
|
||||
return
|
||||
}
|
||||
_ = s.deps.Store.AppendAudit(r.Context(), store.AuditEntry{
|
||||
ID: ulid.Make().String(),
|
||||
UserID: &storeUser.ID,
|
||||
Actor: "user",
|
||||
Action: "schedule.updated",
|
||||
TargetKind: ptr("schedule"),
|
||||
TargetID: &scheduleID,
|
||||
TS: nowUTC(),
|
||||
})
|
||||
s.pushScheduleSetAsync(hostID)
|
||||
}
|
||||
|
||||
stdhttp.Redirect(w, r, "/hosts/"+hostID+"/schedules", stdhttp.StatusSeeOther)
|
||||
}
|
||||
|
||||
// handleUIScheduleDelete is the POST target of the Delete buttons on
|
||||
// the list view. Confirm-then-redirect; no AJAX.
|
||||
func (s *Server) handleUIScheduleDelete(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")
|
||||
storeUser, _, err := s.userByID(r, u.ID)
|
||||
if err != nil || storeUser == nil {
|
||||
stdhttp.Error(w, "internal", stdhttp.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
if err := s.deps.Store.DeleteSchedule(r.Context(), hostID, scheduleID); err != nil {
|
||||
if errors.Is(err, store.ErrNotFound) {
|
||||
stdhttp.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
stdhttp.Error(w, "internal", stdhttp.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
_ = s.deps.Store.AppendAudit(r.Context(), store.AuditEntry{
|
||||
ID: ulid.Make().String(),
|
||||
UserID: &storeUser.ID,
|
||||
Actor: "user",
|
||||
Action: "schedule.deleted",
|
||||
TargetKind: ptr("schedule"),
|
||||
TargetID: &scheduleID,
|
||||
TS: nowUTC(),
|
||||
})
|
||||
s.pushScheduleSetAsync(hostID)
|
||||
stdhttp.Redirect(w, r, "/hosts/"+hostID+"/schedules", stdhttp.StatusSeeOther)
|
||||
}
|
||||
|
||||
func (s *Server) renderScheduleEdit(w stdhttp.ResponseWriter, view ui.ViewData) {
|
||||
if err := s.deps.UI.Render(w, "schedule_edit", view); err != nil {
|
||||
slog.Error("ui: render schedule_edit", "err", err)
|
||||
stdhttp.Error(w, "internal", stdhttp.StatusInternalServerError)
|
||||
}
|
||||
}
|
||||
|
||||
func (s *Server) renderEditPage(w stdhttp.ResponseWriter, u *ui.User, page scheduleEditPage) {
|
||||
view := s.baseView(u, "dashboard")
|
||||
if page.IsNew {
|
||||
view.Title = "New schedule · " + page.Host.Name
|
||||
} else {
|
||||
view.Title = "Edit schedule · " + page.Host.Name
|
||||
}
|
||||
view.Page = page
|
||||
w.WriteHeader(stdhttp.StatusUnprocessableEntity)
|
||||
s.renderScheduleEdit(w, view)
|
||||
}
|
||||
|
||||
// ----- helpers --------------------------------------------------------
|
||||
|
||||
// splitCSV parses comma-separated values into a clean []string —
|
||||
// leading/trailing whitespace trimmed, blanks dropped.
|
||||
func splitCSV(s string) []string {
|
||||
out := []string{}
|
||||
for _, p := range strings.Split(s, ",") {
|
||||
if t := strings.TrimSpace(p); t != "" {
|
||||
out = append(out, t)
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
func parseRetention(p scheduleEditPage) (store.RetentionPolicy, error) {
|
||||
var r store.RetentionPolicy
|
||||
for _, f := range []struct {
|
||||
raw string
|
||||
dest **int
|
||||
name string
|
||||
}{
|
||||
{p.KeepLast, &r.KeepLast, "keep last"},
|
||||
{p.KeepHourly, &r.KeepHourly, "keep hourly"},
|
||||
{p.KeepDaily, &r.KeepDaily, "keep daily"},
|
||||
{p.KeepWeekly, &r.KeepWeekly, "keep weekly"},
|
||||
{p.KeepMonthly, &r.KeepMonthly, "keep monthly"},
|
||||
{p.KeepYearly, &r.KeepYearly, "keep yearly"},
|
||||
} {
|
||||
v, err := parsePosInt(f.raw)
|
||||
if err != nil {
|
||||
return r, errFmtf("%s: %s", f.name, err)
|
||||
}
|
||||
*f.dest = v
|
||||
}
|
||||
return r, nil
|
||||
}
|
||||
|
||||
func parseOptions(p scheduleEditPage) (store.ScheduleOptions, error) {
|
||||
var o store.ScheduleOptions
|
||||
up, err := parsePosInt(p.LimitUpKBps)
|
||||
if err != nil {
|
||||
return o, errFmtf("limit upload: %s", err)
|
||||
}
|
||||
o.LimitUploadKBps = up
|
||||
down, err := parsePosInt(p.LimitDownKBps)
|
||||
if err != nil {
|
||||
return o, errFmtf("limit download: %s", err)
|
||||
}
|
||||
o.LimitDownloadKBps = down
|
||||
return o, nil
|
||||
}
|
||||
|
||||
// parsePosInt turns a possibly-empty string into *int. Empty → nil
|
||||
// (no value). Non-empty must parse as a positive int.
|
||||
func parsePosInt(raw string) (*int, error) {
|
||||
if raw == "" {
|
||||
return nil, nil
|
||||
}
|
||||
v, err := strconv.Atoi(raw)
|
||||
if err != nil {
|
||||
return nil, errFmtf("must be a whole number")
|
||||
}
|
||||
if v < 0 {
|
||||
return nil, errFmtf("must be non-negative")
|
||||
}
|
||||
return &v, nil
|
||||
}
|
||||
|
||||
func intStringPtr(p *int) string {
|
||||
if p == nil {
|
||||
return ""
|
||||
}
|
||||
return strconv.Itoa(*p)
|
||||
}
|
||||
|
||||
// uiErrorMessage maps the JSON-API validation codes to operator-
|
||||
// friendly banner text.
|
||||
func uiErrorMessage(code, msg string) string {
|
||||
switch code {
|
||||
case "missing_cron_expr":
|
||||
return "Cron expression is required."
|
||||
case "invalid_cron_expr":
|
||||
return "Cron expression doesn't parse: " + msg
|
||||
case "missing_paths":
|
||||
return "At least one backup path is required (one per line)."
|
||||
case "invalid_kind":
|
||||
return "Unsupported schedule kind."
|
||||
default:
|
||||
return msg
|
||||
}
|
||||
}
|
||||
|
||||
// errFmtf wraps fmt.Errorf so the validators read consistently.
|
||||
func errFmtf(format string, args ...any) error {
|
||||
return fmt.Errorf(format, args...)
|
||||
}
|
||||
@@ -32,6 +32,12 @@ func funcMap() template.FuncMap {
|
||||
return *p
|
||||
},
|
||||
"sub": func(a, b int) int { return a - b },
|
||||
// joinComma joins a slice with ", ". Used by the schedule list
|
||||
// to render retention summaries.
|
||||
"joinComma": func(parts []string) string { return strings.Join(parts, ", ") },
|
||||
// list packs strings into a slice — handy for inline ranges
|
||||
// in templates (e.g. quick-pick cron presets).
|
||||
"list": func(items ...string) []string { return items },
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -2,6 +2,8 @@ package store
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
@@ -103,6 +105,31 @@ type RetentionPolicy struct {
|
||||
KeepYearly *int `json:"keep_yearly,omitempty"`
|
||||
}
|
||||
|
||||
// Summary renders a compact human view of the policy for templates
|
||||
// and logs — "last=7, d=14, w=4" or "—" when nothing is set.
|
||||
func (p RetentionPolicy) Summary() string {
|
||||
parts := []string{}
|
||||
for _, kv := range []struct {
|
||||
k string
|
||||
v *int
|
||||
}{
|
||||
{"last", p.KeepLast},
|
||||
{"h", p.KeepHourly},
|
||||
{"d", p.KeepDaily},
|
||||
{"w", p.KeepWeekly},
|
||||
{"m", p.KeepMonthly},
|
||||
{"y", p.KeepYearly},
|
||||
} {
|
||||
if kv.v != nil {
|
||||
parts = append(parts, fmt.Sprintf("%s=%d", kv.k, *kv.v))
|
||||
}
|
||||
}
|
||||
if len(parts) == 0 {
|
||||
return "—"
|
||||
}
|
||||
return strings.Join(parts, ", ")
|
||||
}
|
||||
|
||||
// ScheduleOptions covers per-schedule knobs that aren't core to the
|
||||
// command itself — currently bandwidth caps. Stored as JSON so
|
||||
// future fields don't churn the schema.
|
||||
|
||||
@@ -100,7 +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-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).
|
||||
- [ ] **P2-04** (M) Schedule editor UI (paths, excludes, tags, cron, retention)
|
||||
- [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-06** (M) `prune` command (admin-only, uses non-append-only credential)
|
||||
- [ ] **P2-07** (S) `check` command (random subset + `--read-data-subset`)
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -92,7 +92,8 @@
|
||||
|
||||
{{/* ---------- secondary tabs ---------- */}}
|
||||
<div class="flex items-end mt-1.5">
|
||||
<div class="sub-tab active">Snapshots <span class="mono text-ink-fade text-[11px] ml-1">{{comma $host.SnapshotCount}}</span></div>
|
||||
<a class="sub-tab active" href="/hosts/{{$host.ID}}">Snapshots <span class="mono text-ink-fade text-[11px] ml-1">{{comma $host.SnapshotCount}}</span></a>
|
||||
<a class="sub-tab" href="/hosts/{{$host.ID}}/schedules">Schedules</a>
|
||||
<div class="sub-tab">Jobs</div>
|
||||
<div class="sub-tab">Repo</div>
|
||||
<div class="sub-tab">Settings</div>
|
||||
|
||||
@@ -0,0 +1,163 @@
|
||||
{{define "title"}}{{.Title}}{{end}}
|
||||
|
||||
{{define "content"}}
|
||||
{{$page := .Page}}
|
||||
{{$host := $page.Host}}
|
||||
<div class="max-w-[1280px] mx-auto px-8 pt-9 pb-24">
|
||||
|
||||
<div class="crumbs">
|
||||
<a href="/">Dashboard</a><span class="sep">/</span>
|
||||
<a href="/hosts/{{$host.ID}}">{{$host.Name}}</a><span class="sep">/</span>
|
||||
<a href="/hosts/{{$host.ID}}/schedules">schedules</a><span class="sep">/</span>
|
||||
<span class="text-ink-mid">{{if $page.IsNew}}new{{else}}edit{{end}}</span>
|
||||
</div>
|
||||
|
||||
<h1 class="text-2xl font-medium tracking-[-0.012em] mt-2.5">
|
||||
{{if $page.IsNew}}New schedule{{else}}Edit schedule{{end}}
|
||||
<span class="text-ink-fade">·</span>
|
||||
<span class="mono text-ink">{{$host.Name}}</span>
|
||||
</h1>
|
||||
<p class="text-pretty text-ink-mute text-[13px] mt-1.5 max-w-[640px]">
|
||||
Backups run on the cron expression below. The agent applies whatever the server most
|
||||
recently pushed; an offline agent catches up on the next reconnect.
|
||||
</p>
|
||||
|
||||
{{if $page.Error}}
|
||||
<div class="mt-6 px-4 py-3 rounded-[5px] text-[13px]"
|
||||
style="background: color-mix(in oklch, var(--bad), transparent 88%);
|
||||
border: 1px solid color-mix(in oklch, var(--bad), transparent 70%);
|
||||
color: oklch(0.85 0.10 25);">
|
||||
{{$page.Error}}
|
||||
</div>
|
||||
{{end}}
|
||||
|
||||
<form method="post"
|
||||
action="{{if $page.IsNew}}/hosts/{{$host.ID}}/schedules/new{{else}}/hosts/{{$host.ID}}/schedules/{{$page.ScheduleID}}/edit{{end}}"
|
||||
class="grid grid-cols-12 gap-8 mt-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>
|
||||
<div class="mb-5">
|
||||
<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}}">
|
||||
<div class="field-help">
|
||||
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">@hourly</span>,
|
||||
<span class="mono text-ink-mid">*/30 * * * *</span> (every 30 min).
|
||||
Server validates with the same parser the agent uses to fire.
|
||||
</div>
|
||||
<div class="flex flex-wrap gap-1.5 mt-2.5">
|
||||
{{range $cron := list "0 3 * * *" "0 */6 * * *" "@hourly" "0 3 * * 0" "0 3 1 * *"}}
|
||||
<button type="button" class="btn btn-ghost mono text-[11px]"
|
||||
onclick="document.getElementById('se-cron').value='{{$cron}}'">{{$cron}}</button>
|
||||
{{end}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3 class="text-[13px] font-semibold uppercase tracking-[0.08em] text-ink-mute mb-4 pt-6 border-t border-line-soft">Paths</h3>
|
||||
<div class="mb-5">
|
||||
<label class="field-label" for="se-paths">Backup paths <span class="text-ink-fade font-normal">· one per line</span></label>
|
||||
<textarea id="se-paths" name="paths" rows="4" class="field mono"
|
||||
style="resize: vertical;"
|
||||
placeholder="/etc /home /var/lib/postgresql">{{$page.PathsRaw}}</textarea>
|
||||
<div class="field-help">What <span class="mono text-ink-mid">restic backup</span> walks. The agent runs as root with <span class="mono text-ink-mid">CAP_DAC_READ_SEARCH</span>, so any readable path is fair game.</div>
|
||||
</div>
|
||||
<div class="mb-7">
|
||||
<label class="field-label" for="se-excludes">Excludes <span class="text-ink-fade font-normal">· optional, one per line</span></label>
|
||||
<textarea id="se-excludes" name="excludes" rows="3" class="field mono"
|
||||
style="resize: vertical;"
|
||||
placeholder="*.tmp node_modules .cache">{{$page.ExcludesRaw}}</textarea>
|
||||
<div class="field-help">Passed straight through as <span class="mono text-ink-mid">--exclude</span> args.</div>
|
||||
</div>
|
||||
|
||||
<h3 class="text-[13px] font-semibold uppercase tracking-[0.08em] text-ink-mute mb-4 pt-6 border-t border-line-soft">Tags <span class="text-ink-fade font-normal">· optional</span></h3>
|
||||
<div class="mb-7">
|
||||
<label class="field-label" for="se-tags">Tags <span class="text-ink-fade font-normal">· comma-separated</span></label>
|
||||
<input id="se-tags" name="tags" type="text" class="field mono" placeholder="nightly, prod" value="{{$page.TagsRaw}}">
|
||||
<div class="field-help">Attached to every snapshot this schedule produces. Useful for retention rules (P2-05).</div>
|
||||
</div>
|
||||
|
||||
<h3 class="text-[13px] font-semibold uppercase tracking-[0.08em] text-ink-mute mb-4 pt-6 border-t border-line-soft">Retention <span class="text-ink-fade font-normal">· optional, all blank = keep everything</span></h3>
|
||||
<div class="grid grid-cols-3 gap-4 mb-7">
|
||||
<div>
|
||||
<label class="field-label" for="se-keep-last">Keep last</label>
|
||||
<input id="se-keep-last" name="keep_last" type="number" min="0" class="field mono" value="{{$page.KeepLast}}">
|
||||
</div>
|
||||
<div>
|
||||
<label class="field-label" for="se-keep-hourly">Keep hourly</label>
|
||||
<input id="se-keep-hourly" name="keep_hourly" type="number" min="0" class="field mono" value="{{$page.KeepHourly}}">
|
||||
</div>
|
||||
<div>
|
||||
<label class="field-label" for="se-keep-daily">Keep daily</label>
|
||||
<input id="se-keep-daily" name="keep_daily" type="number" min="0" class="field mono" value="{{$page.KeepDaily}}">
|
||||
</div>
|
||||
<div>
|
||||
<label class="field-label" for="se-keep-weekly">Keep weekly</label>
|
||||
<input id="se-keep-weekly" name="keep_weekly" type="number" min="0" class="field mono" value="{{$page.KeepWeekly}}">
|
||||
</div>
|
||||
<div>
|
||||
<label class="field-label" for="se-keep-monthly">Keep monthly</label>
|
||||
<input id="se-keep-monthly" name="keep_monthly" type="number" min="0" class="field mono" value="{{$page.KeepMonthly}}">
|
||||
</div>
|
||||
<div>
|
||||
<label class="field-label" for="se-keep-yearly">Keep yearly</label>
|
||||
<input id="se-keep-yearly" name="keep_yearly" type="number" min="0" class="field mono" value="{{$page.KeepYearly}}">
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-[12px] text-ink-mute leading-[1.55] mb-7">
|
||||
Applied by <span class="mono text-ink-mid">restic forget</span> when the prune job kind lands in P2-05. Mirrors restic's <span class="mono text-ink-mid">--keep-*</span> flags one-for-one.
|
||||
</div>
|
||||
|
||||
<h3 class="text-[13px] font-semibold uppercase tracking-[0.08em] text-ink-mute mb-4 pt-6 border-t border-line-soft">Bandwidth <span class="text-ink-fade font-normal">· optional</span></h3>
|
||||
<div class="grid grid-cols-2 gap-4 mb-7">
|
||||
<div>
|
||||
<label class="field-label" for="se-up">Limit upload <span class="text-ink-fade font-normal">· KB/s</span></label>
|
||||
<input id="se-up" name="limit_up_kbps" type="number" min="0" class="field mono" value="{{$page.LimitUpKBps}}">
|
||||
</div>
|
||||
<div>
|
||||
<label class="field-label" for="se-down">Limit download <span class="text-ink-fade font-normal">· KB/s</span></label>
|
||||
<input id="se-down" name="limit_down_kbps" type="number" min="0" class="field mono" value="{{$page.LimitDownKBps}}">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="pt-6 border-t border-line-soft">
|
||||
<label class="flex items-center gap-2.5 cursor-pointer text-[13px]">
|
||||
<input type="checkbox" name="enabled" {{if $page.Enabled}}checked{{end}}>
|
||||
<span>Enabled</span>
|
||||
<span class="text-ink-fade">— uncheck to keep the row but stop it from firing.</span>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div class="flex gap-2 pt-7">
|
||||
<button type="submit" class="btn btn-primary btn-lg">{{if $page.IsNew}}Create schedule{{else}}Save changes{{end}}</button>
|
||||
<a href="/hosts/{{$host.ID}}/schedules" class="btn btn-lg">Cancel</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<aside class="col-span-5">
|
||||
<div class="text-[11px] uppercase tracking-[0.1em] text-ink-fade mb-3">How this works</div>
|
||||
<ol class="list-none p-0 m-0 space-y-4">
|
||||
<li class="relative pl-9">
|
||||
<span class="absolute left-0 top-0 w-[22px] h-[22px] border border-line rounded-full text-[11px] leading-[20px] text-center text-ink-mute mono">1</span>
|
||||
<div class="text-[13px] text-ink font-medium">Server is the source of truth</div>
|
||||
<div class="text-[12px] text-ink-mute mt-1 leading-[1.55]">Saving here bumps <span class="mono text-ink-mid">host_schedule_version</span> and pushes the new set to the agent over WS. Offline agents catch up on reconnect.</div>
|
||||
</li>
|
||||
<li class="relative pl-9">
|
||||
<span class="absolute left-0 top-0 w-[22px] h-[22px] border border-line rounded-full text-[11px] leading-[20px] text-center text-ink-mute mono">2</span>
|
||||
<div class="text-[13px] text-ink font-medium">Agent fires locally</div>
|
||||
<div class="text-[12px] text-ink-mute mt-1 leading-[1.55]">On each tick the agent sends <span class="mono text-ink-mid">schedule.fire</span>; the server creates a job row (<span class="mono text-ink-mid">actor_kind=schedule</span>) and ships <span class="mono text-ink-mid">command.run</span> back. Same job lifecycle as run-now.</div>
|
||||
</li>
|
||||
<li class="relative pl-9">
|
||||
<span class="absolute left-0 top-0 w-[22px] h-[22px] border border-line rounded-full text-[11px] leading-[20px] text-center text-ink-mute mono">3</span>
|
||||
<div class="text-[13px] text-ink font-medium">Missed ticks fire on reconnect</div>
|
||||
<div class="text-[12px] text-ink-mute mt-1 leading-[1.55]">By design — the operator wants the missed backup to run, not be silently skipped because the agent was bouncing.</div>
|
||||
</li>
|
||||
</ol>
|
||||
</aside>
|
||||
|
||||
</form>
|
||||
|
||||
</div>
|
||||
{{end}}
|
||||
@@ -0,0 +1,96 @@
|
||||
{{define "title"}}{{.Title}}{{end}}
|
||||
|
||||
{{define "content"}}
|
||||
{{$page := .Page}}
|
||||
{{$host := $page.Host}}
|
||||
<div class="max-w-[1280px] mx-auto px-8 pt-7 pb-14">
|
||||
|
||||
<div class="crumbs">
|
||||
<a href="/">Dashboard</a><span class="sep">/</span>
|
||||
<a href="/hosts/{{$host.ID}}">{{$host.Name}}</a><span class="sep">/</span>
|
||||
<span class="text-ink-mid">schedules</span>
|
||||
</div>
|
||||
|
||||
{{/* ---------- header ---------- */}}
|
||||
<div class="flex items-start justify-between mt-3.5">
|
||||
<div>
|
||||
<div class="flex items-center gap-3">
|
||||
{{if eq $host.Status "online"}}
|
||||
<span class="dot dot-online"></span>
|
||||
{{else}}
|
||||
<span class="dot dot-offline"></span>
|
||||
{{end}}
|
||||
<h1 class="text-[22px] font-medium tracking-[-0.01em]">
|
||||
schedules <span class="text-ink-fade">·</span>
|
||||
<span class="mono text-ink font-medium">{{$host.Name}}</span>
|
||||
</h1>
|
||||
<span class="mono text-[11px] text-ink-mute">version {{$page.Version}}{{if and (gt $page.Version 0) (ne $page.Version $page.AppliedVersion)}} <span class="text-warn">· agent at v{{$page.AppliedVersion}}</span>{{else if gt $page.Version 0}} <span class="text-ok">· agent in sync</span>{{end}}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex items-center gap-2">
|
||||
<a href="/hosts/{{$host.ID}}/schedules/new" class="btn btn-primary">New schedule</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{{/* ---------- secondary tabs ---------- */}}
|
||||
<div class="flex items-end mt-7">
|
||||
<a class="sub-tab" href="/hosts/{{$host.ID}}">Snapshots <span class="mono text-ink-fade text-[11px] ml-1">{{comma $host.SnapshotCount}}</span></a>
|
||||
<a class="sub-tab active" href="/hosts/{{$host.ID}}/schedules">Schedules <span class="mono text-ink-fade text-[11px] ml-1">{{len $page.Schedules}}</span></a>
|
||||
<div class="sub-tab">Jobs</div>
|
||||
<div class="sub-tab">Repo</div>
|
||||
<div class="sub-tab">Settings</div>
|
||||
</div>
|
||||
|
||||
{{/* ---------- schedule rows ---------- */}}
|
||||
<div class="panel rounded-[7px] mt-6 overflow-hidden">
|
||||
{{if eq (len $page.Schedules) 0}}
|
||||
<div class="empty-state" style="border: none; background: var(--panel);">
|
||||
<h3 class="text-base font-medium tracking-[-0.005em]">No schedules yet.</h3>
|
||||
<p class="text-pretty text-ink-mute text-[13px] mt-2 mx-auto max-w-[480px] leading-[1.65]">
|
||||
Add one and the agent will start running backups on whatever cron expression you give it.
|
||||
Until then, run-now is the only way to trigger a backup.
|
||||
</p>
|
||||
<div class="mt-5">
|
||||
<a href="/hosts/{{$host.ID}}/schedules/new" class="btn btn-primary">New schedule</a>
|
||||
</div>
|
||||
</div>
|
||||
{{else}}
|
||||
<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;">
|
||||
<div>Status</div>
|
||||
<div>Cron</div>
|
||||
<div>Paths</div>
|
||||
<div>Retention</div>
|
||||
<div>Tags</div>
|
||||
<div></div>
|
||||
</div>
|
||||
{{range $page.Schedules}}
|
||||
<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;">
|
||||
<div>
|
||||
{{if .Enabled}}
|
||||
<span class="mono text-[11px] text-ok">enabled</span>
|
||||
{{else}}
|
||||
<span class="mono text-[11px] text-ink-fade">disabled</span>
|
||||
{{end}}
|
||||
</div>
|
||||
<div class="mono text-ink">{{.CronExpr}}</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="flex gap-1.5 flex-wrap">
|
||||
{{- range .Tags -}}<span class="tag">{{.}}</span>{{- end -}}
|
||||
</div>
|
||||
<div class="text-right flex gap-1.5 justify-end">
|
||||
<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;"
|
||||
onsubmit="return confirm('Delete schedule {{.CronExpr}}? Existing snapshots are not affected.');">
|
||||
<button type="submit" class="btn btn-danger">Delete</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
{{end}}
|
||||
{{end}}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
{{end}}
|
||||
Reference in New Issue
Block a user