Mirrors/ProxMenux
1
0
Fork 0
mirror of https://github.com/MacRimi/ProxMenux.git synced 2026-07-26 18:38:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

update 1.2.2.3 beta

Browse Source
This commit is contained in:
MacRimi
2026-07-05 16:58:27 +02:00
parent 6c1c317921
commit 8bcfcd6059
6 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
AppImage/ProxMenux-1.2.2.3-beta.AppImage
View File

Binary file not shown.

2
AppImage/ProxMenux-Monitor.AppImage.sha256
View File

@@ -1 +1 @@
4abe67f2d2d7516c438d222ed73fb166b0f6b3b77e85e9a6be37194b4b178cdd ProxMenux-1.2.2.3-beta.AppImage
0aab70a57567904c943f22a06120e6b01c661858754ef3adfa525dc9b8bbe07b ProxMenux-1.2.2.3-beta.AppImage

2
AppImage/components/host-backup.tsx
View File

@@ -7718,7 +7718,7 @@ function RestoreOptionsModal({
<div className="rounded-md border border-blue-500/40 bg-blue-500/5 p-3 text-[11px] text-muted-foreground flex items-start gap-2">
<History className="h-3.5 w-3.5 text-blue-400 shrink-0 mt-0.5" />
<div>
After the reboot, this Backups tab will show a live post-restore progress card with ETA, per-component status, log tail and rollback delta. If Telegram/Discord/ntfy notifications are configured, you'll also receive the "Host restore finished" event.
After the reboot, this Backups tab will show a live post-restore progress card with estimated time, per-component status, log tail and rollback delta. If Telegram/Discord/ntfy notifications are configured, you'll also receive the "Host restore finished" event.
</div>
</div>

2
AppImage/components/release-notes-modal.tsx
View File

@@ -222,7 +222,7 @@ const CURRENT_VERSION_FEATURES = [
},
{
icon: <RefreshCw className="h-5 w-5" />,
text: "Live post-restore progress — after a reboot the Backups tab shows a real-time progress card with step-by-step milestones, ETA, per-component status (NVIDIA, Intel GPU tools, Coral, AMD tools), boot sanity warnings, a rollback delta widget listing VMs / LXCs / components that exist on the host but weren't in the backup, and a log tail with an Issues-only filter. Past restores are archived and browsable.",
text: "Live post-restore progress — after a reboot the Backups tab shows a real-time progress card with step-by-step milestones, estimated time remaining, per-component status (NVIDIA, Intel GPU tools, Coral, AMD tools), boot sanity warnings, a rollback delta widget listing VMs / LXCs / components that exist on the host but weren't in the backup, and a log tail with an Issues-only filter. Past restores are archived and browsable.",
},
{
icon: <Shield className="h-5 w-5" />,

19
AppImage/components/restore-progress-card.tsx
View File

@@ -124,18 +124,21 @@ const formatRelative = (iso: string) => {
}
}
// Rough ETA derived from steps_done + elapsed. Best-effort: skips at
// step 0 (no data yet) and returns "—" once the run is terminal.
// Rough time-remaining estimate derived from steps_done + elapsed.
// Best-effort: at step 0 there's no data yet, so it returns
// "estimating time…". After the run is terminal, "—". The output is
// a full phrase so the caller doesn't have to add suffix words that
// only make sense on some branches.
const computeEta = (state: RestoreState): string => {
if (state.status !== "running") return "—"
if (!state.steps_done || state.steps_done <= 0) return "estimating…"
if (!state.steps_done || state.steps_done <= 0) return "estimating time…"
const elapsedSec = Math.max(1, Math.round((Date.now() - new Date(state.started_at).getTime()) / 1000))
const perStep = elapsedSec / state.steps_done
const remaining = Math.max(0, state.steps_total - state.steps_done)
const eta = Math.round(perStep * remaining)
if (eta < 60) return `~${eta}s`
if (eta < 3600) return `~${Math.round(eta / 60)}m`
return `~${Math.round(eta / 3600)}h`
if (eta < 60) return `~${eta}s left`
if (eta < 3600) return `~${Math.round(eta / 60)}m left`
return `~${Math.round(eta / 3600)}h left`
}
// ── Small building blocks ─────────────────────────────────────
@@ -316,7 +319,7 @@ const RestoreDetailModal: React.FC<{
<span>{state.current_step || "—"}</span>
<span>
{state.steps_done}/{state.steps_total} steps
{state.status === "running" && ` · ETA ${computeEta(state)}`}
{state.status === "running" && ` · ${computeEta(state)}`}
</span>
</div>
<div className="h-2 rounded-full bg-muted overflow-hidden">
@@ -552,7 +555,7 @@ export const RestoreProgressCard: React.FC = () => {
</span>
<span>
{state.steps_done}/{state.steps_total} steps
{state.status === "running" && ` · ETA ${computeEta(state)}`}
{state.status === "running" && ` · ${computeEta(state)}`}
{state.summary?.duration && state.status !== "running" && ` · ${state.summary.duration}`}
</span>
</div>

4
scripts/backup_restore/backup_host.sh
View File

@@ -1752,7 +1752,7 @@ _rs_offer_reboot_after_pending() {
bg_block+=" • ${label} (${eta})"$'\n'
done
bg_block+=$'\n'"$(translate "Monitor progress:")"$'\n'
bg_block+=" • $(translate "ProxMenux Monitor → Backups tab (live progress card with ETA, logs, rollback delta)")"$'\n'
bg_block+=" • $(translate "ProxMenux Monitor → Backups tab (live progress card with estimated time, logs, rollback delta)")"$'\n'
bg_block+=" • tail -f /var/log/proxmenux/proxmenux-cluster-postboot-*.log"$'\n'
bg_block+=" • systemctl status proxmenux-apply-cluster-postboot.service"$'\n\n'
bg_block+="$(translate "If notifications are enabled (Telegram/Discord/ntfy/...), you will receive a \"Host restore finished\" message when all background tasks complete.")"$'\n\n'
@@ -2683,7 +2683,7 @@ _rs_run_complete_guided() {
body+=$'\n'"${RS_HYDRATION_SUMMARY}"
fi
body+=$'\n'"\Zb\Z4$(translate "A reboot is required to finish the restore.")\Zn"$'\n\n'
body+="$(translate "After the reboot you can follow the post-restore work live from ProxMenux Monitor → Backups tab (ETA, per-component status, log tail, rollback delta).")"$'\n\n'
body+="$(translate "After the reboot you can follow the post-restore work live from ProxMenux Monitor → Backups tab (estimated time, per-component status, log tail, rollback delta).")"$'\n\n'
body+="$(translate "If notifications are enabled (Telegram/Discord/ntfy/...), you will receive a \"Host restore finished\" message when all background tasks complete.")"$'\n\n'
body+="\Zb$(translate "Continue?")\ZB"