mirror of
https://github.com/MacRimi/ProxMenux.git
synced 2026-07-26 18:38:30 +00:00
update 1.2.2.2 pre-beta
This commit is contained in:
MacRimi
Binary file not shown.
@@ -1 +1 @@
|
||||
79e28fc3a9f60ee3714c587d2dfd48d6d8e0a5b4407ec7a55258de40762ed5e4 ProxMenux-1.2.2.2-beta.AppImage
|
||||
eae86502621e2ebb7d021b123d8161195e8c8e6441cf1a0e1c752fb206420e59 ProxMenux-1.2.2.2-beta.AppImage
|
||||
|
||||
@@ -43,6 +43,7 @@ import {
|
||||
ShieldCheck,
|
||||
Info,
|
||||
ListTree,
|
||||
History,
|
||||
} from "lucide-react"
|
||||
import { ScriptTerminalModal } from "./script-terminal-modal"
|
||||
import { fetchApi, getApiUrl } from "../lib/api-config"
|
||||
@@ -1244,40 +1245,50 @@ function InspectModal({
|
||||
<Dialog open={open} onOpenChange={(v) => { if (!v) onClose() }}>
|
||||
<DialogContent key={archiveKey} className="max-w-3xl bg-card border-border p-0 flex flex-col gap-0 max-h-[90vh]">
|
||||
<DialogHeader className="px-4 sm:px-6 pt-4 pb-3 shrink-0 border-b border-border">
|
||||
<DialogTitle className="flex items-center gap-2 flex-wrap text-base">
|
||||
<DialogTitle className="flex items-center gap-2 flex-wrap text-base pr-8">
|
||||
<DatabaseBackup className="h-5 w-5 text-blue-500 shrink-0" />
|
||||
<span className="font-mono text-xs sm:text-sm break-all flex-1 min-w-0">{archive?.display_id}</span>
|
||||
{archive && (
|
||||
<Badge variant="outline" className={`text-[10px] uppercase tracking-wide shrink-0 ${
|
||||
archive.source === "pbs"
|
||||
? "text-purple-400 border-purple-500/40 bg-purple-500/10"
|
||||
: archive.source === "borg"
|
||||
? "text-fuchsia-400 border-fuchsia-500/40 bg-fuchsia-500/10"
|
||||
: "text-blue-400 border-blue-500/40 bg-blue-500/10"
|
||||
}`}>
|
||||
{archive.source}
|
||||
</Badge>
|
||||
)}
|
||||
{remoteArc?.encrypted && (
|
||||
<Badge variant="outline" className="text-[10px] text-emerald-400 border-emerald-500/40 bg-emerald-500/10 inline-flex items-center gap-1 shrink-0">
|
||||
<Lock className="h-3 w-3" />
|
||||
</Badge>
|
||||
)}
|
||||
</DialogTitle>
|
||||
</DialogHeader>
|
||||
|
||||
{/* ── Body: same shape for the 3 backends ─────────────── */}
|
||||
<ScrollArea className="flex-1 min-h-0">
|
||||
<div className="px-4 sm:px-6 py-4 space-y-4">
|
||||
{/* Snapshot info — uniform grid, with backend-specific
|
||||
rows mixed in only when they carry data. */}
|
||||
{/* Backup info — uniform grid, with backend-specific
|
||||
rows mixed in only when they carry data. Backend +
|
||||
encryption badges live here (instead of the header,
|
||||
where they used to overlap the close button). */}
|
||||
<section className="rounded-md border border-border bg-background/40 p-3 space-y-1 text-xs">
|
||||
<div className="text-[10px] uppercase tracking-wider text-muted-foreground">Snapshot</div>
|
||||
<div className="flex items-center justify-between gap-2 flex-wrap">
|
||||
<div className="text-[10px] uppercase tracking-wider text-muted-foreground">Backup</div>
|
||||
<div className="flex items-center gap-1.5">
|
||||
{archive && (
|
||||
<Badge variant="outline" className={`text-[10px] uppercase tracking-wide ${
|
||||
archive.source === "pbs"
|
||||
? "text-purple-400 border-purple-500/40 bg-purple-500/10"
|
||||
: archive.source === "borg"
|
||||
? "text-fuchsia-400 border-fuchsia-500/40 bg-fuchsia-500/10"
|
||||
: "text-blue-400 border-blue-500/40 bg-blue-500/10"
|
||||
}`}>
|
||||
{archive.source}
|
||||
</Badge>
|
||||
)}
|
||||
{remoteArc?.encrypted && (
|
||||
<Badge
|
||||
variant="outline"
|
||||
className="text-emerald-400 border-emerald-500/40 bg-emerald-500/10"
|
||||
title="Encrypted"
|
||||
>
|
||||
<Lock className="h-3.5 w-3.5" />
|
||||
</Badge>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
<div className="grid grid-cols-1 sm:grid-cols-2 gap-x-4 gap-y-1">
|
||||
{/* Time + size — present for every backend. */}
|
||||
{archive && (archive.source === "pbs" || archive.source === "borg") && remoteArc ? (
|
||||
<>
|
||||
<div><span className="text-muted-foreground">Snapshot time:</span> {formatMtime(remoteArc.backup_time)}</div>
|
||||
<div><span className="text-muted-foreground">Backup time:</span> {formatMtime(remoteArc.backup_time)}</div>
|
||||
{remoteArc.size_bytes > 0 && <div><span className="text-muted-foreground">Size:</span> {formatBytes(remoteArc.size_bytes)}</div>}
|
||||
<div><span className="text-muted-foreground">Repository:</span> <code className="font-mono break-all">{remoteArc.repo_repository}</code></div>
|
||||
<div><span className="text-muted-foreground">Repo name:</span> <code className="font-mono">{remoteArc.repo_name}</code></div>
|
||||
@@ -1303,7 +1314,7 @@ function InspectModal({
|
||||
{/* PBS pxar files list — only PBS exposes this. */}
|
||||
{remoteArc?.files && remoteArc.files.length > 0 && (
|
||||
<div className="pt-2 mt-2 border-t border-border/50">
|
||||
<div className="text-[10px] uppercase tracking-wider text-muted-foreground mb-1">Files in this snapshot</div>
|
||||
<div className="text-[10px] uppercase tracking-wider text-muted-foreground mb-1">Files in this backup</div>
|
||||
<ul className="space-y-0.5">
|
||||
{remoteArc.files.map((f) => (
|
||||
<li key={f.filename} className="font-mono text-[11px] flex items-center justify-between gap-2">
|
||||
@@ -3219,6 +3230,7 @@ function CreateJobDialog({
|
||||
<Button
|
||||
onClick={handleCreate}
|
||||
disabled={!canSubmit || submitting}
|
||||
className="bg-blue-600 hover:bg-blue-700 text-white"
|
||||
>
|
||||
{submitting ? (
|
||||
<Loader2 className="h-4 w-4 animate-spin mr-2" />
|
||||
@@ -5188,8 +5200,12 @@ function AddDestinationDialog({
|
||||
</div>
|
||||
<div className="flex justify-end gap-2 pt-3 border-t border-border">
|
||||
<Button variant="ghost" onClick={onClose} disabled={submitting}>Cancel</Button>
|
||||
<Button onClick={handleSave} disabled={!canSubmit || submitting}>
|
||||
{submitting ? <Loader2 className="h-4 w-4 animate-spin mr-2" /> : <Plus className="h-4 w-4 mr-2" />}
|
||||
<Button
|
||||
onClick={handleSave}
|
||||
disabled={!canSubmit || submitting}
|
||||
className="bg-blue-600 hover:bg-blue-700 text-white"
|
||||
>
|
||||
{submitting ? <Loader2 className="h-4 w-4 animate-spin mr-2" /> : <Save className="h-4 w-4 mr-2" />}
|
||||
Save
|
||||
</Button>
|
||||
</div>
|
||||
@@ -6040,7 +6056,7 @@ function JobDetailModal({
|
||||
or path string from forcing a horizontal scrollbar. */}
|
||||
<DialogContent className="max-w-3xl bg-card border-border overflow-hidden">
|
||||
<DialogHeader>
|
||||
<DialogTitle className="flex items-center gap-2 flex-wrap text-base">
|
||||
<DialogTitle className="flex items-center gap-2 flex-wrap text-base pr-8">
|
||||
<DatabaseBackup className="h-5 w-5 text-blue-500" />
|
||||
<span className="font-mono break-all">{detail?.id ?? jobId}</span>
|
||||
{detail && (
|
||||
@@ -6048,6 +6064,18 @@ function JobDetailModal({
|
||||
<Badge variant="outline" className={`text-[10px] uppercase tracking-wide ${methodBadgeCls(detail.method)}`}>
|
||||
{detail.method}
|
||||
</Badge>
|
||||
{/* Encryption badge — mirrors the InspectModal one
|
||||
so the operator sees the lock in both the summary
|
||||
list and the job detail view. */}
|
||||
{(detail.pbs_encrypt || (detail.borg_encrypt_mode && detail.borg_encrypt_mode !== "none")) && (
|
||||
<Badge
|
||||
variant="outline"
|
||||
className="text-emerald-400 border-emerald-500/40 bg-emerald-500/10"
|
||||
title="Encrypted"
|
||||
>
|
||||
<Lock className="h-3.5 w-3.5" />
|
||||
</Badge>
|
||||
)}
|
||||
{detail.attached && (
|
||||
<Badge variant="outline" className="text-[10px] text-blue-400 border-blue-400/40 bg-blue-500/5">
|
||||
attached
|
||||
@@ -6228,70 +6256,73 @@ function JobDetailModal({
|
||||
)}
|
||||
|
||||
{detail && (
|
||||
<div className="border-t border-border pt-3 flex flex-wrap gap-2 justify-end">
|
||||
<Button
|
||||
size="sm"
|
||||
onClick={handleRun}
|
||||
disabled={running || busy !== ""}
|
||||
variant="outline"
|
||||
// Button's outline variant sets `hover:text-accent-foreground`,
|
||||
// which washes the accent color to near-white on hover. The
|
||||
// `!` modifier on `text-*` keeps our accent color across both
|
||||
// states so the buttons read as Run / Disable / Edit / Delete
|
||||
// at a glance instead of four near-white outlines.
|
||||
className="bg-blue-500/10 border-blue-500/40 !text-blue-400 hover:bg-blue-500/20 hover:!text-blue-300"
|
||||
title={detail.attached
|
||||
? "Trigger an ad-hoc run now (the PVE timer keeps its own schedule)"
|
||||
: "Trigger this job now"}
|
||||
>
|
||||
{running ? (
|
||||
<Loader2 className="h-3.5 w-3.5 mr-1 animate-spin" />
|
||||
) : (
|
||||
<PlayCircle className="h-3.5 w-3.5 mr-1" />
|
||||
)}
|
||||
{running ? "Running…" : "Run now"}
|
||||
</Button>
|
||||
<Button
|
||||
size="sm"
|
||||
variant="outline"
|
||||
disabled={running || busy !== ""}
|
||||
className={detail.enabled
|
||||
? "bg-amber-500/10 border-amber-500/40 !text-amber-400 hover:bg-amber-500/20 hover:!text-amber-300"
|
||||
: "bg-emerald-500/10 border-emerald-500/40 !text-emerald-400 hover:bg-emerald-500/20 hover:!text-emerald-300"}
|
||||
onClick={() => {
|
||||
if (detail.enabled) setShowDisableConfirm(true)
|
||||
else handleToggle()
|
||||
}}
|
||||
>
|
||||
{busy === "toggle" ? (
|
||||
<Loader2 className="h-3.5 w-3.5 mr-1 animate-spin" />
|
||||
) : detail.enabled ? (
|
||||
<Power className="h-3.5 w-3.5 mr-1" />
|
||||
) : (
|
||||
<CheckCircle2 className="h-3.5 w-3.5 mr-1" />
|
||||
)}
|
||||
{detail.enabled ? "Disable" : "Enable"}
|
||||
</Button>
|
||||
<Button
|
||||
size="sm"
|
||||
variant="outline"
|
||||
disabled={running || busy !== ""}
|
||||
className="bg-emerald-500/10 border-emerald-500/40 !text-emerald-400 hover:bg-emerald-500/20 hover:!text-emerald-300"
|
||||
onClick={() => onEdit(detail.id)}
|
||||
>
|
||||
<Pencil className="h-3.5 w-3.5 mr-1" />
|
||||
Edit
|
||||
</Button>
|
||||
<Button
|
||||
size="sm"
|
||||
variant="outline"
|
||||
disabled={running || busy !== ""}
|
||||
className="bg-red-500/10 border-red-500/40 !text-red-400 hover:bg-red-500/20 hover:!text-red-300"
|
||||
onClick={() => onRequestDelete(detail.id)}
|
||||
>
|
||||
<Trash2 className="h-3.5 w-3.5 mr-1" />
|
||||
Delete
|
||||
</Button>
|
||||
// Layout mirrors the InspectModal footer: primary action on
|
||||
// the left in solid green (Run, matches Restore), secondary
|
||||
// Edit next to it in blue outline, then state-changers on
|
||||
// the right (Disable / Delete) — both outlined to read as
|
||||
// less prominent than Run.
|
||||
<div className="border-t border-border pt-3 flex items-center justify-between gap-2 flex-wrap">
|
||||
<div className="flex items-center gap-2 flex-wrap">
|
||||
<Button
|
||||
size="sm"
|
||||
onClick={handleRun}
|
||||
disabled={running || busy !== ""}
|
||||
className="bg-green-600 hover:bg-green-700 text-white"
|
||||
title={detail.attached
|
||||
? "Trigger an ad-hoc run now (the PVE timer keeps its own schedule)"
|
||||
: "Trigger this job now"}
|
||||
>
|
||||
{running ? (
|
||||
<Loader2 className="h-3.5 w-3.5 mr-1 animate-spin" />
|
||||
) : (
|
||||
<PlayCircle className="h-3.5 w-3.5 mr-1" />
|
||||
)}
|
||||
{running ? "Running…" : "Run now"}
|
||||
</Button>
|
||||
<Button
|
||||
size="sm"
|
||||
variant="outline"
|
||||
disabled={running || busy !== ""}
|
||||
className="bg-blue-500/10 border-blue-500/40 !text-blue-400 hover:bg-blue-500/20 hover:!text-blue-300"
|
||||
onClick={() => onEdit(detail.id)}
|
||||
>
|
||||
<Pencil className="h-3.5 w-3.5 mr-1" />
|
||||
Edit
|
||||
</Button>
|
||||
</div>
|
||||
<div className="flex items-center gap-2 flex-wrap">
|
||||
<Button
|
||||
size="sm"
|
||||
variant="outline"
|
||||
disabled={running || busy !== ""}
|
||||
className={detail.enabled
|
||||
? "bg-amber-500/10 border-amber-500/40 !text-amber-400 hover:bg-amber-500/20 hover:!text-amber-300"
|
||||
: "bg-emerald-500/10 border-emerald-500/40 !text-emerald-400 hover:bg-emerald-500/20 hover:!text-emerald-300"}
|
||||
onClick={() => {
|
||||
if (detail.enabled) setShowDisableConfirm(true)
|
||||
else handleToggle()
|
||||
}}
|
||||
>
|
||||
{busy === "toggle" ? (
|
||||
<Loader2 className="h-3.5 w-3.5 mr-1 animate-spin" />
|
||||
) : detail.enabled ? (
|
||||
<Power className="h-3.5 w-3.5 mr-1" />
|
||||
) : (
|
||||
<CheckCircle2 className="h-3.5 w-3.5 mr-1" />
|
||||
)}
|
||||
{detail.enabled ? "Disable" : "Enable"}
|
||||
</Button>
|
||||
<Button
|
||||
size="sm"
|
||||
variant="outline"
|
||||
disabled={running || busy !== ""}
|
||||
className="bg-red-500/10 border-red-500/40 !text-red-400 hover:bg-red-500/20 hover:!text-red-300"
|
||||
onClick={() => onRequestDelete(detail.id)}
|
||||
>
|
||||
<Trash2 className="h-3.5 w-3.5 mr-1" />
|
||||
Delete
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</DialogContent>
|
||||
@@ -6886,7 +6917,7 @@ function ArchiveContentsModal({
|
||||
})()}
|
||||
|
||||
{data.rollback_plan && (
|
||||
<ContentsSection icon={AlertTriangle} title="Rollback plan" iconColor="text-amber-400">
|
||||
<ContentsSection icon={History} title="Rollback plan" iconColor="text-blue-400">
|
||||
<RollbackPlanView plan={data.rollback_plan} />
|
||||
</ContentsSection>
|
||||
)}
|
||||
@@ -6924,10 +6955,6 @@ function ArchiveContentsModal({
|
||||
</div>
|
||||
</ScrollArea>
|
||||
)}
|
||||
|
||||
<div className="flex justify-end px-6 py-3 border-t border-border shrink-0">
|
||||
<Button variant="ghost" onClick={onClose}>Close</Button>
|
||||
</div>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
)
|
||||
@@ -7180,9 +7207,8 @@ function RollbackPlanView({ plan }: { plan: RollbackPlan }) {
|
||||
<div className="space-y-3 text-xs">
|
||||
{hasDestructive && (
|
||||
<div className="rounded-md border border-red-500/40 bg-red-500/5 p-3 space-y-2">
|
||||
<div className="text-[11px] font-semibold uppercase tracking-wider text-red-400 flex items-center gap-1.5">
|
||||
<AlertTriangle className="h-3.5 w-3.5" />
|
||||
Will be removed (created after the backup)
|
||||
<div className="text-[11px] font-semibold uppercase tracking-wider text-red-400">
|
||||
Not in backup — will be deleted on rollback
|
||||
</div>
|
||||
{plan.vms_to_remove.length > 0 && (
|
||||
<div>
|
||||
@@ -7207,19 +7233,18 @@ function RollbackPlanView({ plan }: { plan: RollbackPlan }) {
|
||||
|
||||
{hasRollback && (
|
||||
<div className="rounded-md border border-emerald-500/40 bg-emerald-500/5 p-3 space-y-2">
|
||||
<div className="text-[11px] font-semibold uppercase tracking-wider text-emerald-400 flex items-center gap-1.5">
|
||||
<DatabaseBackup className="h-3.5 w-3.5" />
|
||||
Will be (re)applied from backup
|
||||
<div className="text-[11px] font-semibold uppercase tracking-wider text-emerald-400">
|
||||
Configurations included in backup
|
||||
</div>
|
||||
{plan.vms_to_restore.length > 0 && (
|
||||
<div>
|
||||
<span className="text-muted-foreground">VMs:</span>
|
||||
<span className="text-muted-foreground">VM configs:</span>
|
||||
{plan.vms_to_restore.map((id) => <Pill key={id} tone="green">{id}</Pill>)}
|
||||
</div>
|
||||
)}
|
||||
{plan.lxcs_to_restore.length > 0 && (
|
||||
<div>
|
||||
<span className="text-muted-foreground">LXCs:</span>
|
||||
<span className="text-muted-foreground">LXC configs:</span>
|
||||
{plan.lxcs_to_restore.map((id) => <Pill key={id} tone="green">{id}</Pill>)}
|
||||
</div>
|
||||
)}
|
||||
@@ -7229,6 +7254,9 @@ function RollbackPlanView({ plan }: { plan: RollbackPlan }) {
|
||||
{plan.components_to_reinstall.map((c) => <Pill key={c} tone="green">{c}</Pill>)}
|
||||
</div>
|
||||
)}
|
||||
<div className="text-[10px] text-muted-foreground pt-1">
|
||||
Only the /etc/pve config is restored — disk images stay where they live.
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
@@ -92,33 +92,59 @@ export function TwoFactorSetup({ open, onClose, onSuccess }: TwoFactorSetupProps
|
||||
const copyToClipboard = async (text: string, type: "secret" | "codes") => {
|
||||
let ok = false
|
||||
|
||||
// Preferred path (HTTPS / localhost). On plain HTTP the Promise rejects,
|
||||
// so we catch and fall through to the textarea fallback.
|
||||
// Path 1: modern Clipboard API. Only works on HTTPS / localhost.
|
||||
try {
|
||||
if (navigator.clipboard && window.isSecureContext) {
|
||||
if (navigator.clipboard?.writeText) {
|
||||
await navigator.clipboard.writeText(text)
|
||||
ok = true
|
||||
}
|
||||
} catch {
|
||||
// fall through to execCommand fallback
|
||||
// fall through
|
||||
}
|
||||
|
||||
// Path 2: legacy execCommand. Picky — some browsers (iOS Safari
|
||||
// especially) refuse to copy from an element placed off-screen
|
||||
// (`left: -9999px`), which is the previous version's mistake.
|
||||
// Keep the textarea inside the viewport but visually invisible.
|
||||
if (!ok) {
|
||||
const textarea = document.createElement("textarea")
|
||||
textarea.value = text
|
||||
textarea.style.position = "fixed"
|
||||
textarea.style.top = "0"
|
||||
textarea.style.left = "0"
|
||||
textarea.style.width = "2em"
|
||||
textarea.style.height = "2em"
|
||||
textarea.style.padding = "0"
|
||||
textarea.style.border = "none"
|
||||
textarea.style.outline = "none"
|
||||
textarea.style.boxShadow = "none"
|
||||
textarea.style.background = "transparent"
|
||||
textarea.style.opacity = "0"
|
||||
textarea.setAttribute("readonly", "")
|
||||
textarea.setAttribute("aria-hidden", "true")
|
||||
document.body.appendChild(textarea)
|
||||
try {
|
||||
const textarea = document.createElement("textarea")
|
||||
textarea.value = text
|
||||
textarea.style.position = "fixed"
|
||||
textarea.style.left = "-9999px"
|
||||
textarea.style.top = "-9999px"
|
||||
textarea.style.opacity = "0"
|
||||
textarea.readOnly = true
|
||||
document.body.appendChild(textarea)
|
||||
textarea.focus()
|
||||
textarea.select()
|
||||
textarea.setSelectionRange(0, text.length)
|
||||
ok = document.execCommand("copy")
|
||||
document.body.removeChild(textarea)
|
||||
} catch {
|
||||
ok = false
|
||||
} finally {
|
||||
document.body.removeChild(textarea)
|
||||
}
|
||||
}
|
||||
|
||||
// Path 3: last-resort window.prompt — ugly but unblockable. The
|
||||
// user can select+copy from the prompt manually. This guarantees
|
||||
// they can finish the 2FA setup even on plain-HTTP Monitor where
|
||||
// both the Clipboard API and execCommand may be locked down.
|
||||
if (!ok) {
|
||||
try {
|
||||
window.prompt("Copy this value:", text)
|
||||
ok = true
|
||||
} catch {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1219,6 +1219,16 @@ class HealthMonitor:
|
||||
WARNING_MIN_SAMPLES = 25 # ~250s of sustained elevated CPU
|
||||
RECOVERY_MIN_SAMPLES = 10 # ~100s of recovery
|
||||
|
||||
# Build the `details` payload the cpu_high notification
|
||||
# template (notification_templates.py) expects: `value`
|
||||
# (already-formatted percent), `cores` (CPU count) and a
|
||||
# human-readable `details` line. The previous payload only
|
||||
# carried `cpu_percent`/`duration`, which left the template
|
||||
# placeholders blank — the user got "High CPU usage — %"
|
||||
# and "CPU usage has reached % on cores." with no values.
|
||||
cpu_count = os.cpu_count() or 1
|
||||
value_str = f"{cpu_percent:.0f}"
|
||||
|
||||
if len(critical_samples) >= CRITICAL_MIN_SAMPLES:
|
||||
# Calculate actual duration from oldest to newest sample
|
||||
oldest = min(s['time'] for s in critical_samples)
|
||||
@@ -1231,7 +1241,13 @@ class HealthMonitor:
|
||||
category='cpu',
|
||||
severity='CRITICAL',
|
||||
reason=reason,
|
||||
details={'cpu_percent': cpu_percent, 'duration': actual_duration}
|
||||
details={
|
||||
'value': value_str,
|
||||
'cores': cpu_count,
|
||||
'details': f'Sustained for {actual_duration}s above {self.CPU_CRITICAL}%.',
|
||||
'cpu_percent': cpu_percent,
|
||||
'duration': actual_duration,
|
||||
},
|
||||
)
|
||||
elif len(warning_samples) >= WARNING_MIN_SAMPLES and len(recovery_samples) < RECOVERY_MIN_SAMPLES:
|
||||
oldest = min(s['time'] for s in warning_samples)
|
||||
@@ -1244,7 +1260,13 @@ class HealthMonitor:
|
||||
category='cpu',
|
||||
severity='WARNING',
|
||||
reason=reason,
|
||||
details={'cpu_percent': cpu_percent, 'duration': actual_duration}
|
||||
details={
|
||||
'value': value_str,
|
||||
'cores': cpu_count,
|
||||
'details': f'Sustained for {actual_duration}s above {self.CPU_WARNING}%.',
|
||||
'cpu_percent': cpu_percent,
|
||||
'duration': actual_duration,
|
||||
},
|
||||
)
|
||||
else:
|
||||
status = 'OK'
|
||||
|
||||
@@ -1533,7 +1533,22 @@ class NotificationManager:
|
||||
def _flush_digest_for_channel(self, ch_name: str, channel: Any,
|
||||
now: datetime) -> None:
|
||||
"""Read pending rows for the channel, render a grouped summary,
|
||||
send it, and delete the buffer entries on success."""
|
||||
send it, and delete the buffer entries on success.
|
||||
|
||||
Every path through here records a `digest` entry in the
|
||||
notification history (success or fail, empty buffer or not) and
|
||||
bumps `_stats['total_sent']` / `total_errors` accordingly — the
|
||||
rest of the notification system does this in
|
||||
`_dispatch_to_channels`, and skipping it here was the reason the
|
||||
operator's `/api/notifications/history` and `total_sent` counter
|
||||
showed zero digest entries even when the schedule was firing
|
||||
(issue #233).
|
||||
"""
|
||||
host = _hostname(self._config)
|
||||
summary_title = (
|
||||
f"{host}: 24h summary ({now.strftime('%Y-%m-%d %H:%M')})"
|
||||
)
|
||||
|
||||
try:
|
||||
conn = sqlite3.connect(str(DB_PATH), timeout=10)
|
||||
conn.execute('PRAGMA journal_mode=WAL')
|
||||
@@ -1547,6 +1562,12 @@ class NotificationManager:
|
||||
conn.close()
|
||||
except Exception as e:
|
||||
print(f"[NotificationManager] digest read failed for {ch_name}: {e}")
|
||||
self._record_history(
|
||||
'digest', ch_name, summary_title,
|
||||
f'digest read failed: {e}', 'INFO',
|
||||
False, str(e), 'digest_scheduler',
|
||||
)
|
||||
self._stats['total_errors'] += 1
|
||||
return
|
||||
|
||||
# Mark `last_at` even if there's nothing to send — otherwise an
|
||||
@@ -1554,24 +1575,46 @@ class NotificationManager:
|
||||
self._save_setting(f'{ch_name}.digest_last_at', now.isoformat())
|
||||
|
||||
if not rows:
|
||||
# Empty digest: don't ping the channel (no point in sending
|
||||
# "nothing to report"), but DO log the run in history so the
|
||||
# operator can see the schedule fired. Without this the digest
|
||||
# looked dead silent when in fact it was working — there was
|
||||
# just nothing INFO non-exempt to summarize.
|
||||
self._record_history(
|
||||
'digest', ch_name, summary_title,
|
||||
'No INFO events buffered for this digest window.',
|
||||
'INFO', True, '', 'digest_scheduler',
|
||||
)
|
||||
return
|
||||
|
||||
host = _hostname(self._config)
|
||||
summary_title = (
|
||||
f"{host}: 24h summary ({now.strftime('%Y-%m-%d %H:%M')})"
|
||||
)
|
||||
summary_body = self._compose_digest_body(rows)
|
||||
|
||||
result: dict = {'success': False, 'error': ''}
|
||||
try:
|
||||
channel.send(summary_title, summary_body, severity='INFO',
|
||||
data={'_digest': True, '_count': len(rows)})
|
||||
result = channel.send(summary_title, summary_body, severity='INFO',
|
||||
data={'_digest': True, '_count': len(rows)}) or result
|
||||
except Exception as e:
|
||||
print(f"[NotificationManager] digest send failed for "
|
||||
f"{ch_name}: {e}")
|
||||
return
|
||||
result = {'success': False, 'error': str(e)}
|
||||
|
||||
if result.get('success'):
|
||||
self._stats['total_sent'] += 1
|
||||
self._stats['last_sent_at'] = datetime.now().isoformat()
|
||||
else:
|
||||
self._stats['total_errors'] += 1
|
||||
self._record_history(
|
||||
'digest', ch_name, summary_title, summary_body, 'INFO',
|
||||
result.get('success', False), result.get('error', '') or '',
|
||||
'digest_scheduler',
|
||||
)
|
||||
|
||||
# Delete only after a successful send so a transient failure
|
||||
# doesn't lose the day's data.
|
||||
# doesn't lose the day's data. The pre-fix version deleted
|
||||
# unconditionally as long as `channel.send` didn't raise — a
|
||||
# silent `{'success': False}` would still wipe the buffer.
|
||||
if not result.get('success'):
|
||||
return
|
||||
try:
|
||||
ids = [r[0] for r in rows]
|
||||
conn = sqlite3.connect(str(DB_PATH), timeout=10)
|
||||
|
||||
@@ -26,7 +26,11 @@ ensure_repositories() {
|
||||
|
||||
if (( pve_version >= 9 )); then
|
||||
# ===== PVE 9 (Debian 13 - trixie) =====
|
||||
# proxmox.sources (no-subscription) - create if missing
|
||||
# proxmox.sources (no-subscription) - create if missing.
|
||||
# chmod 0644 explicit on every new .sources file: under the default
|
||||
# root umask 0027 the redirect would land at 0640, which the PVE 9
|
||||
# webgui's repository manager treats as unparseable and silently
|
||||
# hides the source — issue #230.
|
||||
if [[ ! -f /etc/apt/sources.list.d/proxmox.sources ]]; then
|
||||
cat > /etc/apt/sources.list.d/proxmox.sources <<'EOF'
|
||||
Enabled: true
|
||||
@@ -36,6 +40,7 @@ Suites: trixie
|
||||
Components: pve-no-subscription
|
||||
Signed-By: /usr/share/keyrings/proxmox-archive-keyring.gpg
|
||||
EOF
|
||||
chmod 0644 /etc/apt/sources.list.d/proxmox.sources
|
||||
need_update=true
|
||||
fi
|
||||
|
||||
@@ -54,6 +59,7 @@ Suites: trixie-security
|
||||
Components: main contrib non-free-firmware
|
||||
Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
|
||||
EOF
|
||||
chmod 0644 /etc/apt/sources.list.d/debian.sources
|
||||
need_update=true
|
||||
fi
|
||||
|
||||
|
||||
@@ -129,6 +129,7 @@ Suites: ${TARGET_CODENAME}
|
||||
Components: pve-no-subscription
|
||||
Signed-By: /usr/share/keyrings/proxmox-archive-keyring.gpg
|
||||
EOF
|
||||
chmod 0644 /etc/apt/sources.list.d/proxmox.sources
|
||||
msg_ok "$(translate "Proxmox VE 9.x no-subscription repository created")" | tee -a "$screen_capture"
|
||||
changes_made=true
|
||||
|
||||
@@ -146,6 +147,7 @@ Suites: ${TARGET_CODENAME}-security
|
||||
Components: main contrib non-free non-free-firmware
|
||||
Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
|
||||
EOF
|
||||
chmod 0644 /etc/apt/sources.list.d/debian.sources
|
||||
|
||||
msg_ok "$(translate "Debian repositories configured for $TARGET_CODENAME")"
|
||||
|
||||
|
||||
@@ -52,6 +52,10 @@ ensure_repositories() {
|
||||
|
||||
if (( pve_version >= 9 )); then
|
||||
# ===== PVE 9 (Debian 13 - trixie) =====
|
||||
# Force 0644 (world-readable) on every .sources file we drop.
|
||||
# Under the default root umask 0027 the redirect would land at
|
||||
# 0640, which the PVE 9 webgui's repository manager treats as
|
||||
# unparseable and silently hides the source — issue #230.
|
||||
if [[ ! -f /etc/apt/sources.list.d/proxmox.sources ]]; then
|
||||
cat > /etc/apt/sources.list.d/proxmox.sources <<'EOF'
|
||||
Enabled: true
|
||||
@@ -61,6 +65,7 @@ Suites: trixie
|
||||
Components: pve-no-subscription
|
||||
Signed-By: /usr/share/keyrings/proxmox-archive-keyring.gpg
|
||||
EOF
|
||||
chmod 0644 /etc/apt/sources.list.d/proxmox.sources
|
||||
need_update=true
|
||||
fi
|
||||
|
||||
@@ -78,6 +83,7 @@ Suites: trixie-security
|
||||
Components: main contrib non-free-firmware
|
||||
Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
|
||||
EOF
|
||||
chmod 0644 /etc/apt/sources.list.d/debian.sources
|
||||
need_update=true
|
||||
fi
|
||||
|
||||
|
||||
@@ -988,6 +988,7 @@ Suites: ${target_codename}
|
||||
Components: no-subscription
|
||||
Signed-By: /usr/share/keyrings/proxmox-archive-keyring.gpg
|
||||
EOF
|
||||
chmod 0644 /etc/apt/sources.list.d/ceph.sources
|
||||
msg_ok "$(translate "Ceph repository configured for PVE 9")"
|
||||
|
||||
else
|
||||
|
||||
246
scripts/utilities/proxmenux_debug.sh
Executable file
246
scripts/utilities/proxmenux_debug.sh
Executable file
@@ -0,0 +1,246 @@
|
||||
#!/usr/bin/env bash
|
||||
# ==========================================================
|
||||
# ProxMenux Debug Snapshot
|
||||
# ==========================================================
|
||||
# Author : MacRimi
|
||||
# License : GPL-3.0
|
||||
# ==========================================================
|
||||
# Description:
|
||||
# Emits a single GitHub-pasteable text block describing the
|
||||
# current host + ProxMenux state, intended for collaborator
|
||||
# bug reports. The operator runs this after reproducing an
|
||||
# issue (especially in the host-backup / restore flow) and
|
||||
# pastes the output verbatim in the discussion thread.
|
||||
#
|
||||
# Design rules:
|
||||
# • read-only — never modifies anything on the host.
|
||||
# • no network round-trip — everything is local.
|
||||
# • redacts hostnames, public IPs, MAC addresses and
|
||||
# credentials from the captured output before printing.
|
||||
# • single self-contained script, no external deps beyond
|
||||
# standard Proxmox tooling (jq optional).
|
||||
#
|
||||
# Usage:
|
||||
# bash /usr/local/share/proxmenux/scripts/utilities/proxmenux_debug.sh
|
||||
# # or capture to a file then upload:
|
||||
# bash .../proxmenux_debug.sh > /tmp/proxmenux-debug.txt
|
||||
# ==========================================================
|
||||
set -u
|
||||
|
||||
# ── Redaction helpers ──────────────────────────────────────
|
||||
_HOSTNAME_REAL="$(hostname 2>/dev/null || echo host)"
|
||||
_HOSTNAME_TOKEN="<host>"
|
||||
|
||||
# Replace the real hostname plus common public/PII patterns
|
||||
# in any captured output. Keeps the report shareable.
|
||||
_redact() {
|
||||
sed -E \
|
||||
-e "s/${_HOSTNAME_REAL}/${_HOSTNAME_TOKEN}/g" \
|
||||
-e 's/([0-9]{1,3}\.){3}[0-9]{1,3}/<ip>/g' \
|
||||
-e 's/([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}/<mac>/g' \
|
||||
-e 's/(password|passphrase|secret|token|api[_-]?key)[[:space:]]*[:=][[:space:]]*"?[^"[:space:]]+"?/\1=<redacted>/gi'
|
||||
}
|
||||
|
||||
_header() { echo; echo "── $1 ──"; }
|
||||
_kv() { printf '%-22s %s\n' "$1:" "$2"; }
|
||||
_hash() {
|
||||
[ -f "$1" ] && sha256sum "$1" 2>/dev/null | awk -v p="$1" '{print substr($1,1,16)"… "p}' \
|
||||
|| echo "(missing) $1"
|
||||
}
|
||||
|
||||
# ── Banner ─────────────────────────────────────────────────
|
||||
echo "============================================================"
|
||||
echo " ProxMenux Debug Snapshot"
|
||||
echo " Generated: $(date -Iseconds 2>/dev/null || date)"
|
||||
echo "============================================================"
|
||||
|
||||
# ── ProxMenux + Proxmox + Hardware ─────────────────────────
|
||||
_header "Versions"
|
||||
PMX_VERSION="(unknown)"
|
||||
if [ -f /usr/local/share/proxmenux/monitor-app/web/package.json ]; then
|
||||
PMX_VERSION=$(grep -oE '"version":[[:space:]]*"[^"]*"' \
|
||||
/usr/local/share/proxmenux/monitor-app/web/package.json \
|
||||
| head -1 | sed -E 's/.*"version":[[:space:]]*"([^"]+)".*/\1/')
|
||||
fi
|
||||
PVE_VERSION="(not a Proxmox host)"
|
||||
command -v pveversion >/dev/null 2>&1 && PVE_VERSION=$(pveversion 2>/dev/null | head -1)
|
||||
_kv "ProxMenux" "$PMX_VERSION"
|
||||
_kv "Proxmox VE" "$PVE_VERSION"
|
||||
_kv "Kernel" "$(uname -r 2>/dev/null)"
|
||||
_kv "Distro" "$(grep -E '^PRETTY_NAME=' /etc/os-release 2>/dev/null | cut -d= -f2 | tr -d '\"')"
|
||||
_kv "Uptime" "$(uptime -p 2>/dev/null || uptime)"
|
||||
|
||||
_header "Hardware"
|
||||
_kv "CPU model" "$(grep -m1 'model name' /proc/cpuinfo 2>/dev/null | cut -d: -f2 | sed 's/^ //')"
|
||||
_kv "CPU cores" "$(nproc 2>/dev/null)"
|
||||
_kv "RAM total" "$(grep -m1 MemTotal /proc/meminfo 2>/dev/null | awk '{printf "%.1f GB\n", $2/1024/1024}')"
|
||||
_kv "Boot mode" "$([ -d /sys/firmware/efi ] && echo UEFI || echo BIOS)"
|
||||
|
||||
if command -v lspci >/dev/null 2>&1; then
|
||||
_kv "NVIDIA GPU" "$(lspci -nn 2>/dev/null | grep -iE 'nvidia.*(vga|3d)' | sed -E 's/^[0-9a-f]{2}:[0-9a-f]{2}\.[0-9]+ //' | head -1 | cut -c1-90)"
|
||||
_kv "AMD GPU" "$(lspci -nn 2>/dev/null | grep -iE 'amd.*(vga|3d)|advanced micro.*(vga|3d)' | sed -E 's/^[0-9a-f]{2}:[0-9a-f]{2}\.[0-9]+ //' | head -1 | cut -c1-90)"
|
||||
_kv "Intel iGPU" "$(lspci -nn 2>/dev/null | grep -iE 'intel.*(vga|3d|display)' | sed -E 's/^[0-9a-f]{2}:[0-9a-f]{2}\.[0-9]+ //' | head -1 | cut -c1-90)"
|
||||
fi
|
||||
|
||||
# Show whichever NVIDIA devices live on this host along with the
|
||||
# driver they're currently bound to — the single most useful piece
|
||||
# of info for any GPU passthrough / restore bug.
|
||||
if lspci -d 10de: 2>/dev/null | grep -q .; then
|
||||
_header "NVIDIA bind state"
|
||||
while IFS= read -r bdf; do
|
||||
[ -z "$bdf" ] && continue
|
||||
drv=$(basename "$(readlink "/sys/bus/pci/devices/$bdf/driver" 2>/dev/null)" 2>/dev/null || echo "(none)")
|
||||
override=$(cat "/sys/bus/pci/devices/$bdf/driver_override" 2>/dev/null || true)
|
||||
echo " $bdf driver=$drv override=${override:-(unset)}"
|
||||
done < <(lspci -D -d 10de: 2>/dev/null | awk '{print $1}')
|
||||
echo
|
||||
echo " nvidia-smi:"
|
||||
if command -v nvidia-smi >/dev/null 2>&1; then
|
||||
nvidia-smi --query-gpu=name,driver_version,memory.total --format=csv,noheader 2>&1 | sed 's/^/ /' | head -4
|
||||
else
|
||||
echo " nvidia-smi not installed"
|
||||
fi
|
||||
fi
|
||||
|
||||
# ── Components ─────────────────────────────────────────────
|
||||
_header "ProxMenux components_status.json"
|
||||
CSF=/usr/local/share/proxmenux/components_status.json
|
||||
if [ -f "$CSF" ] && command -v jq >/dev/null 2>&1; then
|
||||
jq -r 'to_entries[] | " \(.key): status=\(.value.status) version=\(.value.version // "-") patched=\(.value.patched // "-")"' "$CSF"
|
||||
elif [ -f "$CSF" ]; then
|
||||
sed -E 's/[[:space:]]+/ /g' "$CSF" | head -40
|
||||
else
|
||||
echo " (no components registered)"
|
||||
fi
|
||||
|
||||
# ── Script integrity ───────────────────────────────────────
|
||||
_header "Script SHA-256 (first 16 chars · for drift detection)"
|
||||
for f in \
|
||||
/usr/local/share/proxmenux/scripts/backup_restore/backup_host.sh \
|
||||
/usr/local/share/proxmenux/scripts/backup_restore/lib_host_backup_common.sh \
|
||||
/usr/local/share/proxmenux/scripts/backup_restore/run_scheduled_backup.sh \
|
||||
/usr/local/share/proxmenux/scripts/backup_restore/apply_pending_restore.sh \
|
||||
/usr/local/share/proxmenux/scripts/backup_restore/apply_cluster_postboot.sh \
|
||||
/usr/local/share/proxmenux/scripts/backup_restore/restore/monitor_apply.sh \
|
||||
/usr/local/share/proxmenux/scripts/backup_restore/restore/compute_rollback_plan.sh \
|
||||
/usr/local/share/proxmenux/scripts/gpu_tpu/nvidia_installer.sh \
|
||||
/usr/local/share/proxmenux/scripts/gpu_tpu/switch_gpu_mode.sh \
|
||||
/usr/local/share/proxmenux/scripts/gpu_tpu/switch_gpu_mode_direct.sh \
|
||||
/usr/local/share/proxmenux/scripts/global/utils-install-functions.sh
|
||||
do
|
||||
echo " $(_hash "$f")"
|
||||
done
|
||||
|
||||
# ── Backup / restore state ────────────────────────────────
|
||||
_header "Backup jobs"
|
||||
JOBS_DIR=/var/lib/proxmenux/backup-jobs
|
||||
if [ -d "$JOBS_DIR" ]; then
|
||||
for env_f in "$JOBS_DIR"/*.env; do
|
||||
[ -f "$env_f" ] || continue
|
||||
name=$(basename "$env_f" .env)
|
||||
backend=$(grep -E '^BACKEND=' "$env_f" 2>/dev/null | cut -d= -f2)
|
||||
mode=$(grep -E '^PROFILE_MODE=' "$env_f" 2>/dev/null | cut -d= -f2)
|
||||
enabled=$(grep -E '^ENABLED=' "$env_f" 2>/dev/null | cut -d= -f2)
|
||||
manual=$(grep -E '^MANUAL_RUN=' "$env_f" 2>/dev/null | cut -d= -f2)
|
||||
status_f="/var/log/proxmenux/backup-jobs/${name}-last.status"
|
||||
result=$(grep -E '^RESULT=' "$status_f" 2>/dev/null | cut -d= -f2)
|
||||
echo " $name backend=$backend profile=$mode enabled=${enabled:-?} manual=${manual:-0} last=${result:-(no runs)}"
|
||||
done | sort -u
|
||||
else
|
||||
echo " (no jobs dir)"
|
||||
fi
|
||||
|
||||
_header "Pending restore"
|
||||
PEND=/var/lib/proxmenux/restore-pending
|
||||
if [ -d "$PEND" ]; then
|
||||
current=$(readlink -f "$PEND/current" 2>/dev/null)
|
||||
[ -n "$current" ] && echo " current → $current"
|
||||
echo " pending dirs:"
|
||||
ls -1t "$PEND" 2>/dev/null | grep -vE '^current$|^completed$' | sed 's/^/ /'
|
||||
echo " completed (last 3):"
|
||||
ls -1t "$PEND/completed" 2>/dev/null | head -3 | sed 's/^/ /'
|
||||
# Surface the latest rollback.json if present — this is the
|
||||
# single most useful piece of info for restore bugs (it shows
|
||||
# what the rollback plan computed before the operator clicked).
|
||||
latest_completed=$(ls -t "$PEND/completed" 2>/dev/null | head -1)
|
||||
if [ -n "$latest_completed" ] && [ -f "$PEND/completed/$latest_completed/rollback.json" ]; then
|
||||
echo " latest rollback.json:"
|
||||
sed 's/^/ /' "$PEND/completed/$latest_completed/rollback.json"
|
||||
echo
|
||||
if [ -f "$PEND/completed/$latest_completed/plan.env" ]; then
|
||||
echo " latest plan.env:"
|
||||
sed 's/^/ /' "$PEND/completed/$latest_completed/plan.env"
|
||||
fi
|
||||
fi
|
||||
else
|
||||
echo " (no pending restore dir)"
|
||||
fi
|
||||
|
||||
# ── VFIO / passthrough artefacts ──────────────────────────
|
||||
_header "VFIO / passthrough artefacts on host"
|
||||
for f in \
|
||||
/etc/modprobe.d/proxmenux-nvidia-vfio-blacklist.conf \
|
||||
/etc/modprobe.d/nvidia-blacklist.conf \
|
||||
/etc/modprobe.d/vfio.conf \
|
||||
/etc/udev/rules.d/10-proxmenux-vfio-bind.rules \
|
||||
/etc/modules-load.d/nvidia-vfio.conf \
|
||||
/etc/proxmenux/vfio-bind.bdfs
|
||||
do
|
||||
if [ -e "$f" ]; then
|
||||
sz=$(stat -c%s "$f" 2>/dev/null || echo "?")
|
||||
echo " present (${sz} bytes): $f"
|
||||
else
|
||||
echo " absent : $f"
|
||||
fi
|
||||
done
|
||||
|
||||
# ── Recent logs (last 30 lines each) ──────────────────────
|
||||
_header "Latest cluster-postboot log (last 30 lines)"
|
||||
last_pb=$(ls -t /var/log/proxmenux/proxmenux-cluster-postboot-*.log 2>/dev/null | head -1)
|
||||
[ -n "$last_pb" ] && tail -30 "$last_pb" | _redact || echo " (no cluster-postboot logs)"
|
||||
|
||||
_header "Latest restore-onboot log (last 30 lines)"
|
||||
last_ob=$(ls -t /var/log/proxmenux/proxmenux-restore-onboot-*.log 2>/dev/null | head -1)
|
||||
[ -n "$last_ob" ] && tail -30 "$last_ob" | _redact || echo " (no restore-onboot logs)"
|
||||
|
||||
_header "Latest backup runner log (last 30 lines)"
|
||||
last_bj=$(ls -t /var/log/proxmenux/backup-jobs/*.log 2>/dev/null | head -1)
|
||||
[ -n "$last_bj" ] && tail -30 "$last_bj" | _redact || echo " (no backup-job logs)"
|
||||
|
||||
_header "proxmenux-monitor.service (last 20 lines, errors only)"
|
||||
journalctl -u proxmenux-monitor.service -n 200 --no-pager 2>/dev/null \
|
||||
| grep -iE 'error|exception|traceback|failed' \
|
||||
| tail -20 | _redact \
|
||||
|| echo " (no errors)"
|
||||
|
||||
# ── Notifications config + last events ─────────────────────
|
||||
_header "Notifications status"
|
||||
NOTIF_DB=/usr/local/share/proxmenux/monitor.db
|
||||
if [ -f "$NOTIF_DB" ] && command -v sqlite3 >/dev/null 2>&1; then
|
||||
echo " channels configured:"
|
||||
sqlite3 "$NOTIF_DB" \
|
||||
"SELECT ' '||setting_key||' = '||substr(setting_value,1,20)||'…' \
|
||||
FROM user_settings \
|
||||
WHERE setting_key LIKE 'notifications.%enabled' \
|
||||
OR setting_key LIKE 'notifications.%digest%' \
|
||||
OR setting_key LIKE 'notifications.quiet_hours%' \
|
||||
OR setting_key LIKE '%.digest_last_at';" 2>/dev/null | _redact || echo " (sqlite query failed)"
|
||||
echo " history (last 5):"
|
||||
sqlite3 -separator ' | ' "$NOTIF_DB" \
|
||||
"SELECT sent_at, channel, event_type, substr(title,1,40) FROM notification_history ORDER BY sent_at DESC LIMIT 5;" \
|
||||
2>/dev/null | sed 's/^/ /' | _redact || echo " (no history)"
|
||||
else
|
||||
echo " (no monitor.db or sqlite3 missing)"
|
||||
fi
|
||||
|
||||
# ── Guests (count only — config-level data stays private) ──
|
||||
_header "Guests on this host (count only)"
|
||||
qm_count=$(qm list 2>/dev/null | awk 'NR>1' | wc -l)
|
||||
pct_count=$(pct list 2>/dev/null | awk 'NR>1' | wc -l)
|
||||
_kv "VMs" "$qm_count"
|
||||
_kv "LXCs" "$pct_count"
|
||||
|
||||
echo
|
||||
echo "============================================================"
|
||||
echo " End of debug snapshot. Paste the above in the GitHub thread."
|
||||
echo "============================================================"
|
||||
Reference in New Issue
Block a user