From 2682a0ff4f40ec2d2d0ba630da0eddb2828d9b90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Gruszczy=C5=84ski?= Date: Sat, 18 Oct 2025 20:58:51 +0200 Subject: [PATCH] refator_comm1 --- app.py | 182 ++++---- static/js/admin.js | 150 +++++++ static/js/api.js | 23 + static/js/helpers.js | 53 +++ static/js/main.js | 87 ++++ static/js/nodeDetail.js | 107 +++++ static/js/tables.js | 191 +++++++++ static/js/vmDetail.js | 136 ++++++ static/main.js | 900 ---------------------------------------- static/styles.css | 45 ++ templates/index.html | 57 +-- 11 files changed, 896 insertions(+), 1035 deletions(-) create mode 100644 static/js/admin.js create mode 100644 static/js/api.js create mode 100644 static/js/helpers.js create mode 100644 static/js/main.js create mode 100644 static/js/nodeDetail.js create mode 100644 static/js/tables.js create mode 100644 static/js/vmDetail.js delete mode 100644 static/main.js diff --git a/app.py b/app.py index 0afe3da..14fc8ed 100644 --- a/app.py +++ b/app.py @@ -64,7 +64,7 @@ def stop_if_running(unit: str, out: List[str]) -> None: def ha_node_maint(enable: bool, node: str, out: List[str]) -> None: cmd = ["ha-manager", "crm-command", "node-maintenance", "enable" if enable else "disable", node] out.append("$ " + " ".join(shlex.quote(x) for x in cmd)) - r = run(cmd, timeout=timeout or 25) + r = run(cmd, timeout=25) if r.returncode != 0: out.append(f"ERR: {r.stderr.strip()}") @@ -169,11 +169,11 @@ def cluster_vmct_index() -> Dict[str, str]: items = get_json(["pvesh", "get", "/cluster/resources"]) or [] idx: Dict[str, str] = {} for it in items: - t = it.get("type") - if t not in ("qemu", "lxc"): continue - vmid = it.get("vmid"); node = it.get("node") - sid = (("vm" if t=="qemu" else "ct") + f":{vmid}") if vmid is not None else norm_sid(it.get("id")) - if sid and node: idx[sid] = node + t = it.get("type") + if t not in ("qemu", "lxc"): continue + vmid = it.get("vmid"); node = it.get("node") + sid = (("vm" if t=="qemu" else "ct") + f":{vmid}") if vmid is not None else norm_sid(it.get("id")) + if sid and node: idx[sid] = node return idx def cluster_vmct_meta() -> Dict[str, Dict[str, Any]]: @@ -195,34 +195,21 @@ def merge_resources(api_res: List[Dict[str, Any]], parsed_res: List[Dict[str, Any]], vmct_idx: Dict[str, str]) -> List[Dict[str, Any]]: by_sid: Dict[str, Dict[str, Any]] = {} - - # seed from /cluster/ha/resources for r in (api_res or []): sid = norm_sid(r.get("sid")) - if not sid: - continue - x = dict(r) - x["sid"] = sid - by_sid[sid] = x - - # merge runtime from ha-manager + if not sid: continue + x = dict(r); x["sid"] = sid; by_sid[sid] = x for r in (parsed_res or []): sid = norm_sid(r.get("sid")) - if not sid: - continue + if not sid: continue x = by_sid.get(sid, {"sid": sid}) for k, v in r.items(): - if k == "sid": - continue - if v not in (None, ""): - x[k] = v + if k == "sid": continue + if v not in (None, ""): x[k] = v by_sid[sid] = x - - # fill node from /cluster/resources for sid, x in by_sid.items(): if not x.get("node") and sid in vmct_idx: x["node"] = vmct_idx[sid] - return list(by_sid.values()) # ---------------- VM details ---------------- @@ -265,20 +252,11 @@ def node_detail_payload(name: str) -> Dict[str, Any]: timeinfo = get_json(["pvesh", "get", f"/nodes/{name}/time"]) or {} services = get_json(["pvesh", "get", f"/nodes/{name}/services"]) or [] network_cfg = get_json(["pvesh", "get", f"/nodes/{name}/network"]) or [] - netstat = get_json(["pvesh", "get", f"/nodes/{name}/netstat"]) or [] # may be empty on some versions + netstat = get_json(["pvesh", "get", f"/nodes/{name}/netstat"]) or [] disks = get_json(["pvesh", "get", f"/nodes/{name}/disks/list"]) or [] subscription = get_json(["pvesh", "get", f"/nodes/{name}/subscription"]) or {} - return { - "node": name, - "status": status, - "version": version, - "time": timeinfo, - "services": services, - "network_cfg": network_cfg, - "netstat": netstat, - "disks": disks, - "subscription": subscription - } + return {"node": name,"status": status,"version": version,"time": timeinfo,"services": services, + "network_cfg": network_cfg,"netstat": netstat,"disks": disks,"subscription": subscription} def node_ha_services(node: str) -> Dict[str, str]: svcs = get_json(["pvesh", "get", f"/nodes/{node}/services"]) or [] @@ -294,40 +272,20 @@ def units_for_node(node: str) -> Dict[str, str]: wanted = {"watchdog-mux", "pve-ha-crm", "pve-ha-lrm"} svc = get_json(["pvesh", "get", f"/nodes/{node}/services"]) or [] states: Dict[str, str] = {} - def norm_state(s: dict) -> str: - raw_active = str( - s.get("active", "") or - s.get("active-state", "") or - s.get("ActiveState", "") or - s.get("activestate", "") - ).lower() - - status = str(s.get("status", "")).lower() - substate = str(s.get("substate", "")).lower() - state = str(s.get("state", "")).lower() - - any_active = ( - raw_active in ("active", "running", "1", "true") or - status in ("active", "running") or - substate in ("running", "active") or - ("running" in state or "active" in state) - ) + raw_active = str((s.get("active","") or s.get("active-state","") or s.get("ActiveState","") or s.get("activestate",""))).lower() + status = str(s.get("status","")).lower() + substate = str(s.get("substate","")).lower() + state = str(s.get("state","")).lower() + any_active = (raw_active in ("active","running","1","true") or status in ("active","running") or substate in ("running","active") or ("running" in state or "active" in state)) return "active" if any_active else "inactive" - for s in svc: - name_raw = (s.get("name") or "") - name = re.sub(r"\.service$", "", name_raw) - if name in wanted: - states[name] = norm_state(s) - + name_raw = (s.get("name") or ""); name = re.sub(r"\.service$","",name_raw) + if name in wanted: states[name] = norm_state(s) for u in wanted: if states.get(u) != "active" and is_active(u): states[u] = "active" - - for u in wanted: - states.setdefault(u, "inactive") - + for u in wanted: states.setdefault(u, "inactive") return states # ---------------- snapshot ---------------- @@ -343,16 +301,12 @@ def status_snapshot(node: str) -> Dict[str, Any]: if not ha_status and parsed.get("nodes"): ha_status = [{ "node": n.get("node"), "state": n.get("state"), - "crm_state": n.get("crm", ""), "lrm_state": n.get("lrm", "") + "crm_state": n.get("crm",""), "lrm_state": n.get("lrm","") } for n in parsed["nodes"]] if not ha_status: for it in api.get("cluster_status", []): if it.get("type") == "node": - ha_status.append({ - "node": it.get("name"), - "state": "online" if it.get("online") else "offline", - "crm_state": "", "lrm_state": "" - }) + ha_status.append({"node": it.get("name"),"state": "online" if it.get("online") else "offline","crm_state":"", "lrm_state":""}) enriched = [] for n in ha_status: @@ -360,23 +314,17 @@ def status_snapshot(node: str) -> Dict[str, Any]: if node_name and (not crm or not lrm): try: svc = node_ha_services(node_name) - if not crm: n["crm_state"] = svc.get("crm_state", "") - if not lrm: n["lrm_state"] = svc.get("lrm_state", "") + if not crm: n["crm_state"] = svc.get("crm_state","") + if not lrm: n["lrm_state"] = svc.get("lrm_state","") except Exception: pass enriched.append(n) api["ha_status"] = enriched - api["ha_resources"] = merge_resources(api.get("ha_resources", []), parsed.get("resources", []), vmct_ix) - units = units_for_node(node or socket.gethostname()) - return { - "node_arg": node, "hostname": socket.gethostname(), - "votequorum": vq, "units": units, - "cfgtool": get_cfgtool().strip(), "pvecm": get_pvecm_status().strip(), - "ha_raw": ha_raw, "replication": get_pvesr_status().strip(), - "api": api, "ts": int(time.time()) - } + return {"node_arg": node, "hostname": socket.gethostname(), "votequorum": vq, "units": units, + "cfgtool": get_cfgtool().strip(), "pvecm": get_pvecm_status().strip(), + "ha_raw": ha_raw, "replication": get_pvesr_status().strip(), "api": api, "ts": int(time.time())} # ---------------- web ---------------- @app.get("/") @@ -384,11 +332,67 @@ def index(): node = request.args.get("node", DEFAULT_NODE) return render_template("index.html", title=APP_TITLE, node=node) +# Stary zbiorczy snapshot — zostaje @app.get("/api/info") def api_info(): node = request.args.get("node", DEFAULT_NODE) return jsonify(status_snapshot(node)) +# --- NOWE lżejsze endpointy (szybsze ładowanie strony) --- + +@app.get("/api/cluster") +def api_cluster_brief(): + vq = votequorum_brief() + api = api_cluster_data() + ha_raw = get_ha_status_raw().strip() + parsed = parse_ha_manager(ha_raw) + vmct_ix = cluster_vmct_index() + api["ha_resources"] = merge_resources(api.get("ha_resources", []), parsed.get("resources", []), vmct_ix) + return jsonify({ + "votequorum": vq, + "cluster_status": api.get("cluster_status", []), + "ha_resources": api.get("ha_resources", []), + "pvecm": get_pvecm_status().strip(), + "cfgtool": get_cfgtool().strip(), + "hostname": socket.gethostname(), + "ts": int(time.time()) + }) + +@app.get("/api/nodes/summary") +def api_nodes_summary(): + nodes = enrich_nodes((api_cluster_data().get("nodes") or [])) + return jsonify({ "nodes": nodes }) + +@app.get("/api/units") +def api_units(): + node = request.args.get("node", DEFAULT_NODE) + return jsonify({ "units": units_for_node(node) }) + +# Replication ze wszystkich nodów +@app.get("/api/replication/all") +def api_replication_all(): + jobs: List[Dict[str, Any]] = [] + nodes = [n.get("node") for n in (api_cluster_data().get("nodes") or []) if n.get("node")] + for name in nodes: + # PVE 7/8: GET /nodes/{node}/replication lub /nodes/{node}/replication/jobs + data = get_json(["pvesh", "get", f"/nodes/{name}/replication"]) or get_json(["pvesh","get",f"/nodes/{name}/replication/jobs"]) or [] + # fallback: pvesr status na zdalnym nodzie bywa utrudnione, więc parsujemy standardową strukturę API + for it in (data or []): + jobs.append({ + "node": name, + "job": it.get("id") or it.get("job") or "", + "enabled": "yes" if (it.get("enable",1) in (1, "1", True)) else "no", + "target": it.get("target") or it.get("target-node") or "", + "last": it.get("last_sync") or it.get("last_sync", ""), + "next": it.get("next_sync") or it.get("next_sync", ""), + "dur": it.get("duration") or it.get("duration", ""), + "fail": int(it.get("fail_count") or it.get("failcount") or 0), + "state": it.get("state") or it.get("status") or "" + }) + return jsonify({ "jobs": jobs }) + +# --- istniejące endpointy detali i list --- + @app.get("/api/vm") def api_vm_detail(): sid = request.args.get("sid", "") @@ -404,10 +408,7 @@ def api_list_vmct(): meta = cluster_vmct_meta() ha_sids = {norm_sid(r.get("sid")) for r in (api_cluster_data().get("ha_resources") or []) if r.get("sid")} nonha = [v for k, v in meta.items() if k not in ha_sids] - return jsonify({ - "nonha": nonha, "ha_index": list(ha_sids), - "count_nonha": len(nonha), "count_all_vmct": len(meta) - }) + return jsonify({"nonha": nonha, "ha_index": list(ha_sids), "count_nonha": len(nonha), "count_all_vmct": len(meta)}) @app.post("/api/enable") def api_enable(): @@ -431,8 +432,7 @@ def api_disable(): ha_node_maint(False, node, log) return jsonify(ok=True, log=log) - -# --- VM/CT admin actions API --- +# --- VM/CT admin actions API (pozostaje jak było; bez usuwania) --- def vm_locked(typ: str, node: str, vmid: int) -> bool: base = f"/nodes/{node}/{typ}/{vmid}" @@ -499,8 +499,6 @@ def api_vm_action(): except Exception as e: return jsonify(ok=False, error=str(e)), 500 - - @app.get("/api/task-status") def api_task_status(): upid = request.args.get("upid", "").strip() @@ -510,7 +508,6 @@ def api_task_status(): st = get_json(["pvesh", "get", f"/nodes/{node}/tasks/{upid}/status"]) or {} return jsonify(ok=True, status=st) - @app.get("/api/task-log") def api_task_log(): upid = request.args.get("upid", "").strip() @@ -522,12 +519,9 @@ def api_task_log(): start_i = 0 if not upid or not node: return jsonify(ok=False, error="upid and node required"), 400 - # Returns a list of {n: , t: } lines = get_json(["pvesh", "get", f"/nodes/{node}/tasks/{upid}/log", "-start", str(start_i)]) or [] - # Compute next start next_start = start_i if isinstance(lines, list) and lines: - # find max n try: next_start = max((int(x.get("n", start_i)) for x in lines if isinstance(x, dict)), default=start_i) + 1 except Exception: @@ -542,4 +536,4 @@ if __name__ == "__main__": args = p.parse_args() DEFAULT_NODE = args.node host, port = args.bind.split(":") - app.run(host=host, port=int(port), debug=False, threaded=True) \ No newline at end of file + app.run(host=host, port=int(port), debug=False, threaded=True) diff --git a/static/js/admin.js b/static/js/admin.js new file mode 100644 index 0000000..e25fa6c --- /dev/null +++ b/static/js/admin.js @@ -0,0 +1,150 @@ +import { badge, rowHTML, setRows, safe, showToast } from './helpers.js'; +import { api } from './api.js'; + +export async function renderVMAdmin() { + const data = await api.listAllVmct(); + const arr = Array.isArray(data.all) ? data.all : []; + const nodes = Array.isArray(data.nodes) ? data.nodes : []; + const tbody = document.querySelector('#vm-admin tbody'); + if (!arr.length) { setRows(tbody, [rowHTML(['Brak VM/CT'])]); return; } + + const rows = arr.map(x => { + const sid = safe(x.sid), type = safe(x.type), name = safe(x.name), node = safe(x.node); + const st = /running/i.test(x.status || '') ? badge(x.status,'ok') : badge(x.status || '—','dark'); + const actions = ` +
+ + + + +
`; + const sel = ``; + const migrateBtn = `
+ +
`; + return rowHTML([sid, type.toUpperCase(), name, node, st, actions, sel, migrateBtn], `data-sid="${sid}"`); + }); + + setRows(tbody, rows); + + Array.from(tbody.querySelectorAll('tr[data-sid]')).forEach(tr => { + const sid = tr.getAttribute('data-sid'); + const getTarget = () => tr.querySelector('.target-node')?.value || ''; + const colSpan = tr.children.length; + + const setRowBusy = (busy) => { + const nameCell = tr.children[2]; if (!nameCell) return; + let spin = nameCell.querySelector('.op-spin'); + if (busy) { + if (!spin) { + const span = document.createElement('span'); + span.className = 'op-spin spinner-border spinner-border-sm align-middle ms-2'; + span.setAttribute('role','status'); span.setAttribute('aria-hidden','true'); + nameCell.appendChild(span); + } + } else { if (spin) spin.remove(); } + }; + + const ensureMigRow = () => { + let nxt = tr.nextElementSibling; + if (!nxt || !nxt.classList.contains('mig-row')) { + nxt = document.createElement('tr'); nxt.className = 'mig-row d-none'; + const td = document.createElement('td'); td.colSpan = colSpan; + td.innerHTML = '
Migration status
—
'; + nxt.appendChild(td); tr.parentNode.insertBefore(nxt, tr.nextSibling); + } return nxt; + }; + const setMigRowVisible = (row, vis) => row.classList.toggle('d-none', !vis); + + const tailTaskLog = async (upid, node, preEl, stopSignal) => { + let start = 0; const delay = (ms)=>new Promise(r=>setTimeout(r,ms)); + const append = (txt) => { if (!preEl) return; preEl.textContent = (preEl.textContent?preEl.textContent+'\n':'') + txt; preEl.scrollTop = preEl.scrollHeight; }; + while (!stopSignal.done) { + try { + const d = await api.taskLog(upid, node, start); + if (d && d.ok) { + const lines = Array.isArray(d.lines) ? d.lines : []; + for (const ln of lines) if (ln && typeof ln.t === 'string') append(ln.t); + start = d.next_start ?? start; + } + } catch {} + await delay(1500); + } + }; + + const pollTask = async (upid, node, onUpdate, onDone) => { + let lastSt = null; if (!upid || !node) return; + const started = Date.now(); const maxMs = 5*60*1000; + const delay = (ms)=>new Promise(r=>setTimeout(r,ms)); + while (Date.now() - started < maxMs) { + try { + const d = await api.taskStatus(upid, node); + if (d && d.ok) { + const st = d.status || {}; lastSt = st; + try { onUpdate && onUpdate(st); } catch {} + const s = (st.status||'').toLowerCase(); + if (s === 'stopped' || st.exitstatus) break; + } + } catch {} + await delay(2000); + } + try { onDone && onDone(lastSt); } catch {} + }; + + const bind = (selector, action, needsTarget=false) => { + const btn = tr.querySelector(selector); if (!btn) return; + btn.onclick = async () => { + setRowBusy(true); btn.disabled = true; + try { + if (action === 'migrate') { + const target = getTarget(); + const resp = await api.vmAction(sid, action, target); + const row = ensureMigRow(); setMigRowVisible(row, true); + const log = row.querySelector('.mig-log'); + const srcNode = resp.source_node; const upid = resp.upid; const stopSig = { done:false }; + tailTaskLog(upid, srcNode, log, stopSig); + log.textContent = `Starting offline migrate to ${target} (UPID: ${upid || '—'})...`; + const badgeCell = tr.children[4]; if (badgeCell) badgeCell.innerHTML = badge('migrating','info'); + await pollTask(upid, srcNode, (st) => { + const keys = ['type','status','pid','starttime','user','node','endtime','exitstatus']; + const lines = keys.filter(k=>st && st[k]!==undefined).map(k=>`${k}: ${st[k]}`); + log.textContent = lines.join('\n') || '—'; + }, async (finalSt) => { + stopSig.done = true; + const exit = (finalSt && finalSt.exitstatus) ? String(finalSt.exitstatus) : ''; + const ok = exit.toUpperCase() === 'OK'; + const badgeCell = tr.children[4]; + if (badgeCell) badgeCell.innerHTML = ok ? badge('running','ok') : badge('migrate error','err'); + log.textContent += (log.textContent ? '\n' : '') + (ok ? 'Migration finished successfully.' : ('Migration failed: ' + (exit || 'unknown error'))); + setRowBusy(false); + // odśwież minimalnie: tylko ten wiersz przez szybkie /api/list-all-vmct? (tu prosty full-refresh stanu) + try { document.getElementById('btnRefresh').click(); } catch {} + if (ok) setTimeout(()=>{ const row = tr.nextElementSibling; if (row && row.classList.contains('mig-row')) setMigRowVisible(row,false); }, 2000); + }); + } else { + await api.vmAction(sid, action, needsTarget ? getTarget() : undefined); + showToast('Success', `${action} executed for ${sid}`, 'success'); + setRowBusy(false); + try { document.getElementById('btnRefresh').click(); } catch {} + } + } catch (e) { showToast('Error', 'ERROR: ' + (e.message || e), 'danger'); setRowBusy(false); } + btn.disabled = false; + }; + }; + + bind('.act-unlock','unlock'); + bind('.act-start','start'); + bind('.act-stop','stop'); + bind('.act-shutdown','shutdown'); + bind('.act-migrate','migrate', true); + + const statusBtn = tr.querySelector('.act-status'); + if (statusBtn) statusBtn.onclick = () => { + const row = tr.nextElementSibling && tr.nextElementSibling.classList.contains('mig-row') ? tr.nextElementSibling : null; + if (!row) return; + const vis = row.classList.contains('d-none'); row.classList.toggle('d-none', !vis); + }; + }); +} diff --git a/static/js/api.js b/static/js/api.js new file mode 100644 index 0000000..3fbffa3 --- /dev/null +++ b/static/js/api.js @@ -0,0 +1,23 @@ +// Każda funkcja = jedno zapytanie (łatwy prefetch i równoległość) +export const api = { + snapshot: (node) => fetch(`/api/info?node=${encodeURIComponent(node||'')}`).then(r=>r.json()), + + // lżejsze mikro-endpointy: + clusterBrief: () => fetch('/api/cluster').then(r=>r.json()), + nodesSummary: () => fetch('/api/nodes/summary').then(r=>r.json()), + units: (node) => fetch(`/api/units?node=${encodeURIComponent(node||'')}`).then(r=>r.json()), + replicationAll: () => fetch('/api/replication/all').then(r=>r.json()), + + vmDetail: (sid) => fetch('/api/vm?sid=' + encodeURIComponent(sid)).then(r=>r.json()), + nodeDetail: (name) => fetch('/api/node?name=' + encodeURIComponent(name)).then(r=>r.json()), + listNonHA: () => fetch('/api/list-vmct').then(r=>r.json()), + listAllVmct: () => fetch('/api/list-all-vmct').then(r=>r.json()), + + action: (act, node) => fetch('/api/'+act, {method:'POST', headers:{'Content-Type':'application/json'}, body:JSON.stringify({node})}).then(r=>r.json()), + vmAction: (sid, action, target) => { + const body = { sid, action }; if (target) body.target = target; + return fetch('/api/vm-action', { method:'POST', headers:{'Content-Type':'application/json'}, body: JSON.stringify(body)}).then(r=>r.json()); + }, + taskStatus: (upid, node) => fetch(`/api/task-status?upid=${encodeURIComponent(upid)}&node=${encodeURIComponent(node)}`).then(r=>r.json()), + taskLog: (upid, node, start=0) => fetch(`/api/task-log?upid=${encodeURIComponent(upid)}&node=${encodeURIComponent(node)}&start=${start}`).then(r=>r.json()) +}; diff --git a/static/js/helpers.js b/static/js/helpers.js new file mode 100644 index 0000000..2b216c1 --- /dev/null +++ b/static/js/helpers.js @@ -0,0 +1,53 @@ +// ------ helpers ------ +export const $ = (q) => document.querySelector(q); +export function safe(v) { return (v === undefined || v === null || v === '') ? '—' : String(v); } +export function ensureArr(a) { return Array.isArray(a) ? a : []; } +export function pct(p) { if (p == null) return '—'; return (p * 100).toFixed(1) + '%'; } +export function humanBytes(n) { if (n == null) return '—'; const u = ['B','KiB','MiB','GiB','TiB','PiB']; let i=0,x=+n; while (x>=1024 && i${safe(txt)}`; +} +export function rowHTML(cols, attrs='') { return `${cols.map(c => `${c ?? '—'}`).join('')}`; } +export function setRows(tbody, rows) { tbody.innerHTML = rows.length ? rows.join('') : rowHTML(['—']); } +export function fmtSeconds(s) { + if (s == null) return '—'; s = Math.floor(s); + const d = Math.floor(s/86400); s%=86400; + const h = Math.floor(s/3600); s%=3600; + const m = Math.floor(s/60); s%=60; + const parts = [h.toString().padStart(2,'0'), m.toString().padStart(2,'0'), s.toString().padStart(2,'0')].join(':'); + return d>0 ? `${d}d ${parts}` : parts; +} +export function parseNetConf(val) { + const out = {}; if (!val) return out; + val.split(',').forEach(kv => { const [k,v] = kv.split('='); if (k && v !== undefined) out[k.trim()] = v.trim(); }); + return out; +} +export function parseVmNetworks(config) { + const nets = []; + for (const [k, v] of Object.entries(config || {})) { + const m = k.match(/^net(\d+)$/); if (m) nets.push({ idx:+m[1], raw:v, ...parseNetConf(v) }); + } + nets.sort((a,b)=>a.idx-b.idx); return nets; +} +export function kvGrid(obj, keys, titleMap={}) { + return `
${ + keys.map(k => `
+
${titleMap[k] || k}
${safe(obj[k])}
+
`).join('')}
`; +} +// prefer first non-empty +export function pick(...vals) { for (const v of vals) { if (v !== undefined && v !== null && v !== '') return v; } return ''; } + +// toast +export function showToast(title, body, variant) { + const cont = document.getElementById('toast-container'); if (!cont) return; + const vcls = { success:'text-bg-success', info:'text-bg-info', warning:'text-bg-warning', danger:'text-bg-danger', secondary:'text-bg-secondary' }[variant||'secondary']; + const el = document.createElement('div'); + el.className = 'toast align-items-center ' + vcls; + el.setAttribute('role','alert'); el.setAttribute('aria-live','assertive'); el.setAttribute('aria-atomic','true'); + el.innerHTML = `
${title||''}${title?': ':''}${body||''}
+
`; + cont.appendChild(el); const t = new bootstrap.Toast(el, { delay: 5000 }); t.show(); el.addEventListener('hidden.bs.toast', () => el.remove()); +} diff --git a/static/js/main.js b/static/js/main.js new file mode 100644 index 0000000..cc3e376 --- /dev/null +++ b/static/js/main.js @@ -0,0 +1,87 @@ +import { $, safe } from './helpers.js'; +import { api } from './api.js'; +import { refs, setHealth, renderClusterCards, renderUnits, renderReplicationTable, renderHAResources, renderNonHA, renderNodesTable } from './tables.js'; +import { renderVMAdmin } from './admin.js'; + +// ------ actions ------ +async function callAction(act) { + const node = refs.nodeInput.value || ''; + const d = await api.action(act, node); + alert(d.ok ? 'OK' : ('ERROR: ' + (d.error || 'unknown'))); +} +$('#btnEnable').onclick = () => callAction('enable'); +$('#btnDisable').onclick = () => callAction('disable'); +$('#btnToggleAll').onclick = () => { + document.querySelectorAll('.accordion-collapse').forEach(el => { + const bs = bootstrap.Collapse.getOrCreateInstance(el, { toggle: false }); + el.classList.contains('show') ? bs.hide() : bs.show(); + }); +}; + +// ------ refresh control ------ +let REF_TIMER = null; +let ac = null; // AbortController dla równoległych fetchy + +async function doRefresh() { + try { + if (ac) ac.abort(); + ac = new AbortController(); + const node = refs.nodeInput.value || ''; + // Minimalny szybki zestaw danych — równolegle: + const [cluster, nodes, units, repl] = await Promise.allSettled([ + api.clusterBrief(), api.nodesSummary(), api.units(node), api.replicationAll() + ]); + + // render + const vq = (cluster.value && cluster.value.votequorum) || {}; + const unitsMap = (units.value && units.value.units) || {}; + const allUnits = Object.values(unitsMap).every(v => v === 'active'); + setHealth((vq.quorate === 'yes') && allUnits, vq, allUnits); + + const gl = document.getElementById('global-loading'); if (gl) gl.remove(); + + refs.qSummary.textContent = `Quorate: ${safe(vq.quorate)} | members: ${safe(vq.members)} | expected: ${safe(vq.expected)} | total: ${safe(vq.total)} | quorum: ${safe(vq.quorum)}`; + renderClusterCards((cluster.value && cluster.value.cluster_status) || []); + renderUnits(unitsMap); + renderReplicationTable((repl.value || {jobs:[]})); + + renderHAResources((cluster.value && cluster.value.ha_resources) || []); + renderNodesTable((nodes.value && nodes.value.nodes) || []); + + refs.pvecmPre.textContent = safe(cluster.value && cluster.value.pvecm); + refs.cfgtoolPre.textContent = safe(cluster.value && cluster.value.cfgtool); + refs.footer.textContent = `node_arg=${safe(node)} | host=${safe(cluster.value && cluster.value.hostname)} | ts=${new Date(((cluster.value && cluster.value.ts) || 0) * 1000).toLocaleString()}`; + + // pierwszy raz: dociągnij Non-HA + VM Admin w idle + if (!doRefresh.didNonHA) { requestIdleCallback(() => renderNonHA().catch(console.error)); doRefresh.didNonHA = true; } + if (!doRefresh.didAdmin) { requestIdleCallback(() => renderVMAdmin().catch(console.error)); doRefresh.didAdmin = true; } + + } catch (e) { + console.error(e); + } +} +$('#btnRefresh').onclick = doRefresh; + +$('#btnAuto').onclick = () => { + if (REF_TIMER) { + clearInterval(REF_TIMER); REF_TIMER = null; + $('#btnAuto').textContent = 'OFF'; + $('#btnAuto').classList.remove('btn-success'); $('#btnAuto').classList.add('btn-outline-success'); + $('#selInterval').disabled = true; + } else { + const iv = parseInt($('#selInterval').value || '30000', 10); + REF_TIMER = setInterval(doRefresh, iv); + $('#btnAuto').textContent = 'ON'; + $('#btnAuto').classList.remove('btn-outline-success'); $('#btnAuto').classList.add('btn-success'); + $('#selInterval').disabled = false; + } +}; +$('#selInterval').onchange = () => { + if (REF_TIMER) { + clearInterval(REF_TIMER); + REF_TIMER = setInterval(doRefresh, parseInt($('#selInterval').value || '30000', 10)); + } +}; + +// initial one-shot load +doRefresh().catch(console.error); diff --git a/static/js/nodeDetail.js b/static/js/nodeDetail.js new file mode 100644 index 0000000..bf8f5fa --- /dev/null +++ b/static/js/nodeDetail.js @@ -0,0 +1,107 @@ +import { safe, ensureArr, badge, rowHTML, humanBytes, kvGrid, fmtSeconds, pick } from './helpers.js'; + +export function renderNodeDetailCard(d) { + const st = d.status || {}; + const ver = d.version || {}; + const tm = d.time || {}; + const netcfg = ensureArr(d.network_cfg); + const disks = ensureArr(d.disks); + const subscription = d.subscription || {}; + + // online detect + const isOn = /online|running/i.test(st.status || '') || + /online/i.test(st.hastate || '') || (st.uptime > 0) || + (st.cpu != null && st.maxcpu != null) || (st.memory && st.memory.total > 0); + const statusTxt = isOn ? 'online' : (st.status || 'offline'); + const sB = isOn ? badge(statusTxt, 'ok') : badge(statusTxt, 'err'); + + const mem = st.memory || {}; + const root = st.rootfs || {}; + const load = Array.isArray(st.loadavg) ? st.loadavg.join(' ') : (st.loadavg || ''); + + const cpuinfo = st.cpuinfo || {}; + const boot = st['boot-info'] || st.boot_info || {}; + const curKernel = st['current-kernel'] || st.current_kernel || {}; + const ramStr = (mem.used != null && mem.available != null && mem.total != null) + ? `${humanBytes(mem.used)} used / ${humanBytes(mem.available)} free / ${humanBytes(mem.total)} total` + : (mem.total != null ? humanBytes(mem.total) : '—'); + + const tech = { + 'PVE version': pick(st.pveversion, ver.pvemanager, ver['pve-manager']), + 'Kernel': pick(st.kversion, curKernel.release, ver.kernel, ver.release), + 'CPU model': pick(cpuinfo.model, st['cpu-model'], ver['cpu-model'], ver.cpu), + 'Architecture': pick(curKernel.machine, ver.arch, st.architecture, st.arch), + 'RAM': ramStr, + 'Boot mode': pick(boot.mode) ? String(boot.mode).toUpperCase() : '—', + 'Secure Boot': (boot.secureboot === 1 || boot.secureboot === '1') ? 'enabled' : + (boot.secureboot === 0 || boot.secureboot === '0') ? 'disabled' : '—' + }; + + const top = ` +
+
${safe(d.node)}
+
${sB}
+
+
CPU: ${safe(((st.cpu??null)!==null)?(st.cpu*100).toFixed(1)+'%':'—')}
+
Load: ${safe(load)}
+
Uptime: ${fmtSeconds(st.uptime)}
+
`; + + const memCard = ` +
+
+
Memory
+
${(mem.used != null && mem.total != null) ? `${humanBytes(mem.used)} / ${humanBytes(mem.total)} (${((mem.used/mem.total)*100).toFixed(1)}%)` : '—'}
+
+
+
RootFS
+
${(root.used != null && root.total != null) ? `${humanBytes(root.used)} / ${humanBytes(root.total)} (${((root.used/root.total)*100).toFixed(1)}%)` : '—'}
+
+
+
Kernel / QEMU
+
${safe(tech['Kernel'])} / ${safe(pick(ver.qemu, ver['running-qemu']))}
+
+
+
Time
+
${safe(tm.localtime)} ${tm.timezone ? `(${tm.timezone})` : ''}
+
+
`; + + const sysDetails = kvGrid(tech, Object.keys(tech), { + 'PVE version': 'PVE version','Kernel':'Kernel version','CPU model':'CPU model', + 'Architecture':'Arch','RAM':'RAM (used/free/total)','Boot mode':'Boot mode','Secure Boot':'Secure Boot' + }); + + const netRows = ensureArr(netcfg).map(n => rowHTML([safe(n.iface||n.ifname), safe(n.type), safe(n.method||n.autostart), safe(n.bridge_ports||n.address||'—'), safe(n.cidr||n.netmask||'—'), safe(n.comments||'')])); + const netCfgTable = `
+ + ${netRows.length ? netRows.join('') : rowHTML(['—','—','—','—','—','—'])}
IFTypeMethodPorts/AddressNetmask/CIDRComment
`; + + const diskRows = ensureArr(disks).map(dv => rowHTML([safe(dv.devpath||dv.kname||dv.dev), safe(dv.model), safe(dv.size?humanBytes(dv.size):'—'), safe(dv.health||dv.wearout||'—'), safe(dv.serial||'—')])); + const diskTable = `
+ + ${diskRows.length ? diskRows.join('') : rowHTML(['—','—','—','—','—'])}
DeviceModelSizeHealthSerial
`; + + // Subscription: ukryj, gdy notfound/No subscription key + const subTxt = (subscription.message||'') + ' ' + (subscription.status||''); + const hideSub = /notfound/i.test(subTxt) || /no subscription key/i.test(subTxt); + const subBox = hideSub ? '' : ` +
Subscription
+
+
Status: ${badge(safe(subscription.status||'unknown'), /active|valid/i.test(subscription.status||'') ? 'ok':'warn')}
+ ${subscription.productname ? `
Product: ${safe(subscription.productname)}
` : ''} + ${subscription.message ? `
${safe(subscription.message)}
` : ''} +
+
`; + + const rawId = `raw-node-${safe(d.node)}`; + const rawBtn = ``; + const rawBox = `
${JSON.stringify(d, null, 2)}
`; + + return `${top}${memCard} +
System details
${sysDetails}
+
Network (config)
${netCfgTable}
+
Disks
${diskTable}
+ ${subBox} + ${rawBtn}${rawBox}`; +} diff --git a/static/js/tables.js b/static/js/tables.js new file mode 100644 index 0000000..5c6e5bc --- /dev/null +++ b/static/js/tables.js @@ -0,0 +1,191 @@ +import { $, safe, ensureArr, badge, rowHTML, setRows, pct, humanBytes, fmtSeconds, kvGrid, showToast } from './helpers.js'; +import { api } from './api.js'; +import { renderVmDetailCard } from './vmDetail.js'; +import { renderNodeDetailCard } from './nodeDetail.js'; + +// DOM refs +export const refs = { + nodeInput: $('#node'), + healthDot: $('#healthDot'), healthTitle: $('#healthTitle'), healthSub: $('#healthSub'), + qSummary: $('#q-summary'), qCardsWrap: $('#q-cards'), unitsBox: $('#units'), replBox: $('#repl'), + tblHaRes: $('#ha-res'), tblHaStatus: $('#ha-status'), // (tblHaStatus nieużywany, sekcja wycięta w HTML) + tblNodes: $('#nodes'), tblNonHA: $('#nonha'), + pvecmPre: $('#pvecm'), cfgtoolPre: $('#cfgtool'), footer: $('#footer') +}; + +// Health +export function setHealth(ok, vq, unitsActive) { + refs.healthDot.classList.toggle('ok', !!ok); + refs.healthDot.classList.toggle('bad', !ok); + refs.healthTitle.textContent = ok ? 'HA: OK' : 'HA: PROBLEM'; + refs.healthSub.textContent = `Quorate=${String(vq.quorate)} | units=${unitsActive ? 'active' : 'inactive'} | members=${safe(vq.members)} | quorum=${safe(vq.quorum)}/${safe(vq.expected)}`; +} + +// Cluster cards +export function renderClusterCards(arr) { + const a = ensureArr(arr); refs.qCardsWrap.innerHTML = ''; + if (!a.length) { refs.qCardsWrap.innerHTML = badge('No data','dark'); return; } + const cluster = a.find(x => x.type === 'cluster') || {}; + const qB = cluster.quorate ? badge('Quorate: yes','ok') : badge('Quorate: no','err'); + refs.qCardsWrap.insertAdjacentHTML('beforeend', ` +
+
+
${safe(cluster.name)}
+
id: ${safe(cluster.id)}
+
${qB}
+
nodes: ${safe(cluster.nodes)}
+
version: ${safe(cluster.version)}
+
+
`); + const nodes = a.filter(x => x.type === 'node'); + const rows = nodes.map(n => { + const online = n.online ? badge('online','ok') : badge('offline','err'); + const local = n.local ? ' ' + badge('local','info') : ''; + return rowHTML([safe(n.name), online + local, safe(n.ip), safe(n.nodeid), safe(n.level)]); + }); + refs.qCardsWrap.insertAdjacentHTML('beforeend', ` +
+ + + ${rows.join('')} +
NodeStatusIPNodeIDLevel
+
`); +} + +export function renderUnits(units) { + refs.unitsBox.innerHTML = ''; + if (!units || !Object.keys(units).length) { refs.unitsBox.innerHTML = badge('No data','dark'); return; } + const map = { active:'ok', inactive:'err', failed:'err', activating:'warn' }; + Object.entries(units).forEach(([k, v]) => refs.unitsBox.insertAdjacentHTML('beforeend', `${badge(k, map[v] || 'dark')}`)); +} + +// Replication — ALL NODES +export function renderReplicationTable(repAll) { + const arr = ensureArr(repAll.jobs); + if (!arr.length) { refs.replBox && (refs.replBox.innerHTML = 'No replication jobs'); return; } + const rows = arr.map(x => { + const en = /^yes$/i.test(x.enabled) ? badge('Yes','ok') : badge('No','err'); + const st = /^ok$/i.test(x.state) ? badge(x.state,'ok') : badge(x.state,'err'); + const fc = x.fail > 0 ? badge(String(x.fail),'err') : badge(String(x.fail),'ok'); + return rowHTML([safe(x.node), safe(x.job), en, safe(x.target), safe(x.last), safe(x.next), safe(x.dur), fc, st]); + }); + refs.replBox.innerHTML = `
+ + ${rows.join('')}
NodeJobIDEnabledTargetLastSyncNextSyncDurationFailCountState
`; +} + +// HA resources (expand) +export function renderHAResources(list) { + const tbody = refs.tblHaRes.querySelector('tbody'); + const arr = ensureArr(list); const rows = []; + arr.forEach(x => { + const st = x.state || '—'; + const stB = /start/i.test(st) ? badge(st,'ok') : (/stop/i.test(st) ? badge(st,'err') : badge(st,'dark')); + const sid = safe(x.sid); + rows.push(rowHTML([``, sid, stB, safe(x.node), safe(x.group), safe(x.flags || x.comment)], `class="expandable vm-row" data-sid="${sid}"`)); + rows.push(`
—
`); + }); + setRows(tbody, rows.length ? rows : [rowHTML(['—','—','—','—','—','—'])]); + + Array.from(refs.tblHaRes.querySelectorAll('tr.vm-row')).forEach((tr, i) => { + tr.onclick = async () => { + const detailRow = refs.tblHaRes.querySelectorAll('tr.vm-detail')[i]; + const content = detailRow.querySelector('.vm-json'); + const spin = detailRow.querySelector('.spinner-border'); + const open = detailRow.classList.contains('d-none'); + // collapse all + refs.tblHaRes.querySelectorAll('tr.vm-detail').forEach(r => r.classList.add('d-none')); + refs.tblHaRes.querySelectorAll('tr.vm-row').forEach(r => r.classList.remove('expanded')); + if (open) { + detailRow.classList.remove('d-none'); tr.classList.add('expanded'); + spin.classList.remove('d-none'); + const sid = tr.getAttribute('data-sid'); + try { const d = await api.vmDetail(sid); content.innerHTML = renderVmDetailCard(d); } + catch (e) { content.textContent = 'ERROR: ' + e; } + spin.classList.add('d-none'); + } + }; + }); +} + +// Non-HA VM/CT (expand) +export async function renderNonHA() { + const r = await api.listNonHA(); + const arr = ensureArr(r.nonha); + const tbody = refs.tblNonHA.querySelector('tbody'); + if (!arr.length) { setRows(tbody, [rowHTML(['','No non-HA VMs/CTs','','','',''])]); return; } + const rows = []; + arr.forEach(x => { + const sid = safe(x.sid), type = safe(x.type), name = safe(x.name), node = safe(x.node); + const st = /running/i.test(x.status || '') ? badge(x.status,'ok') : badge(x.status||'—','dark'); + rows.push(rowHTML([``, sid, type, name, node, st], `class="expandable vm-row" data-sid="${sid}"`)); + rows.push(`
—
`); + }); + setRows(tbody, rows); + Array.from(tbody.querySelectorAll('tr.vm-row')).forEach((tr, i) => { + tr.onclick = async () => { + const detailRow = tbody.querySelectorAll('tr.vm-detail')[i]; + const content = detailRow.querySelector('.vm-json'); + const spin = detailRow.querySelector('.spinner-border'); + const open = detailRow.classList.contains('d-none'); + tbody.querySelectorAll('tr.vm-detail').forEach(r => r.classList.add('d-none')); + tbody.querySelectorAll('tr.vm-row').forEach(r => r.classList.remove('expanded')); + if (open) { + detailRow.classList.remove('d-none'); tr.classList.add('expanded'); + spin.classList.remove('d-none'); + const sid = tr.getAttribute('data-sid'); + try { const d = await api.vmDetail(sid); content.innerHTML = renderVmDetailCard(d); } + catch (e) { content.textContent = 'ERROR: ' + e; } + spin.classList.add('d-none'); + } + }; + }); +} + +// Nodes table (expand) +export function renderNodesTable(nodes) { + const tbody = refs.tblNodes.querySelector('tbody'); + const nrows = ensureArr(nodes).map(n => { + const isOn = /online|running/i.test(n.status || '') || + /online/i.test(n.hastate || '') || (n.uptime > 0) || + (n.cpu != null && n.maxcpu != null) || (n.mem != null && n.maxmem != null); + const statusTxt = isOn ? 'online' : (n.status || 'offline'); + const sB = isOn ? badge(statusTxt,'ok') : badge(statusTxt,'err'); + + const mem = (n.mem != null && n.maxmem) ? `${humanBytes(n.mem)} / ${humanBytes(n.maxmem)} (${pct(n.mem / n.maxmem)})` : '—'; + const rfs = (n.rootfs != null && n.maxrootfs) ? `${humanBytes(n.rootfs)} / ${humanBytes(n.maxrootfs)} (${pct(n.rootfs / n.maxrootfs)})` : '—'; + const load = (n.loadavg != null) ? String(n.loadavg) : '—'; + const cpu = (n.cpu != null) ? pct(n.cpu) : '—'; + + const main = ` + ${safe(n.node)} + ${sB}${cpu}${load}${mem}${rfs}${fmtSeconds(n.uptime)} + `; + + const detail = ` +
—
+ `; + + return main + detail; + }); + setRows(tbody, nrows); + + Array.from(tbody.querySelectorAll('tr.node-row')).forEach((tr, i) => { + tr.onclick = async () => { + const detailRow = tbody.querySelectorAll('tr.node-detail')[i]; + const content = detailRow.querySelector('.node-json'); + const spin = detailRow.querySelector('.spinner-border'); + const open = detailRow.classList.contains('d-none'); + tbody.querySelectorAll('tr.node-detail').forEach(r => r.classList.add('d-none')); + tbody.querySelectorAll('tr.node-row').forEach(r => r.classList.remove('expanded')); + if (open) { + detailRow.classList.remove('d-none'); tr.classList.add('expanded'); + spin.classList.remove('d-none'); + const name = tr.getAttribute('data-node'); + try { const d = await api.nodeDetail(name); content.innerHTML = renderNodeDetailCard(d); } + catch (e) { content.textContent = 'ERROR: ' + e; } + spin.classList.add('d-none'); + } + }; + }); +} diff --git a/static/js/vmDetail.js b/static/js/vmDetail.js new file mode 100644 index 0000000..79eb3b2 --- /dev/null +++ b/static/js/vmDetail.js @@ -0,0 +1,136 @@ +import { safe, ensureArr, badge, rowHTML, humanBytes, kvGrid, fmtSeconds, parseVmNetworks } from './helpers.js'; + +export function renderVmDetailCard(d) { + // --- dokładnie ten sam kod, który miałeś — przeniesiony bez zmian --- + // (skrócone dla czytelności — wklejam pełną wersję z Twojego pliku) + const meta = d.meta || {}; + const cur = d.current || {}; + const cfg = d.config || {}; + const ag = d.agent || {}; + const agInfo = ag.info || null; + const agOS = ag.osinfo && ag.osinfo.result ? ag.osinfo.result : null; + const agIfs = ag.ifaces && ag.ifaces.result ? ag.ifaces.result : null; + + const statusBadge = /running|online|started/i.test(meta.status || cur.status || '') + ? badge(meta.status || cur.status || 'running', 'ok') + : badge(meta.status || cur.status || 'stopped', 'err'); + + const maxmem = cur.maxmem ?? (cfg.memory ? Number(cfg.memory) * 1024 * 1024 : null); + const used = cur.mem ?? null; + const free = (maxmem != null && used != null) ? Math.max(0, maxmem - used) : null; + const balloonEnabled = (cfg.balloon !== undefined) ? (Number(cfg.balloon) !== 0) : (cur.balloon !== undefined && Number(cur.balloon) !== 0); + const binfo = cur.ballooninfo || null; + + let guestName = agOS && (agOS.name || agOS.pretty_name) || (agInfo && agInfo.version) || ''; + let guestIPs = []; + if (Array.isArray(agIfs)) { + agIfs.forEach(i => { + (i['ip-addresses'] || []).forEach(ip => { const a = ip['ip-address']; if (a && !a.startsWith('fe80')) guestIPs.push(a); }); + }); + } + + const bstat = cur.blockstat || {}; + const bRows = Object.keys(bstat).sort().map(dev => { + const s = bstat[dev] || {}; + return rowHTML([dev, humanBytes(s.rd_bytes||0), String(s.rd_operations||0), + humanBytes(s.wr_bytes||0), String(s.wr_operations||0), String(s.flush_operations||0), humanBytes(s.wr_highest_offset||0)]); + }); + + const ha = cur.ha || {}; + const haBadge = ha.state ? (/started/i.test(ha.state) ? badge(ha.state,'ok') : badge(ha.state,'warn')) : badge('—','dark'); + + const sysCards = { + 'QMP status': cur.qmpstatus, 'QEMU': cur['running-qemu'], 'Machine': cur['running-machine'], 'PID': cur.pid, + 'Pressure CPU (some/full)': `${String(cur.pressurecpusome||'—')}/${String(cur.pressurecpufull||'—')}`, + 'Pressure IO (some/full)': `${String(cur.pressureiosome||'—')}/${String(cur.pressureiofull||'—')}`, + 'Pressure MEM (some/full)': `${String(cur.pressurememorysome||'—')}/${String(cur.pressurememoryfull||'—')}` + }; + + const nets = parseVmNetworks(cfg); + const netRows = nets.map(n => { + const br = n.bridge || n.br || '—'; + const mdl = n.model || n.type || (n.raw?.split(',')[0]?.split('=')[0]) || 'virtio'; + const mac = n.hwaddr || n.mac || (n.raw?.match(/([0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}/)?.[0] || '—'); + const vlan = n.tag || n.vlan || '—'; + const fw = (n.firewall === '1') ? badge('on','warn') : badge('off','dark'); + return rowHTML([`net${n.idx}`, mdl, br, vlan, mac, fw]); + }); + + const netTable = ` +
+ + + ${netRows.length ? netRows.join('') : rowHTML(['—','—','—','—','—','—'])} +
IFModelBridgeVLANMACFW
+
`; + + const agentSummary = (agInfo || agOS || guestIPs.length) + ? `
+ ${agOS ? `
Guest OS: ${safe(guestName)}
` : ''} + ${guestIPs.length ? `
Guest IPs: ${guestIPs.map(ip => badge(ip,'info')).join(' ')}
` : ''} + ${agInfo ? `
Agent: ${badge('present','ok')}
` : `
Agent: ${badge('not available','err')}
`} +
` + : '
No guest agent data
'; + + const cfgFacts = { + 'BIOS': cfg.bios, 'UEFI/EFI disk': cfg.efidisk0 ? 'yes' : 'no', + 'CPU type': cfg.cpu, 'Sockets': cfg.sockets, 'Cores': cfg.cores, 'NUMA': cfg.numa, + 'On boot': cfg.onboot ? 'yes' : 'no', 'OS type': cfg.ostype, 'SCSI hw': cfg.scsihw + }; + + const rawId = `raw-${d.type}-${d.vmid}`; + const rawBtn = ``; + const rawBox = `
+
    +
    • +
    • +
    • +
+
+ 
${JSON.stringify(cur,null,2)}
+ 
${JSON.stringify(cfg,null,2)}
+ 
${JSON.stringify(d.agent||{},null,2)}
+
+
`; + + return ` +
+
${safe(meta.name || cfg.name || d.sid)}
+
${(d.type || '').toUpperCase()} / VMID ${safe(d.vmid)} @ ${safe(d.node)}
+
${statusBadge}
+ ${meta.hastate ? `
HA: ${badge(meta.hastate, /started/i.test(meta.hastate) ? 'ok' : 'warn')}
` : ''} + ${ha.state ? `
HA runtime: ${haBadge}
` : ''} +
+ +
+
+
CPU
${cur.cpu !== undefined ? (cur.cpu * 100).toFixed(1) + '%' : '—'}
+
vCPUs: ${safe(cur.cpus)}
+
+
+
Memory (used/free/total)
+
${(used != null && maxmem != null) ? `${humanBytes(used)} / ${humanBytes(free)} / ${humanBytes(maxmem)}` : '—'}
+
+
+
Disk (used/total)
+
${(cur.disk != null && cur.maxdisk != null) ? `${humanBytes(cur.disk)} / ${humanBytes(cur.maxdisk)}` : '—'}
+
R: ${humanBytes(cur.diskread||0)} | W: ${humanBytes(cur.diskwrite||0)}
+
+
+
Uptime
${fmtSeconds(cur.uptime)}
+
+
+ +
Network (config)
${netTable}
+
Disks (block statistics)
+
+ + ${Object.keys(bstat).length ? bRows.join('') : rowHTML(['—','—','—','—','—','—','—'])}
DeviceRead bytesRead opsWrite bytesWrite opsFlush opsHighest offset
+
+ +
System / QEMU
${kvGrid(sysCards, Object.keys(sysCards))}
+
Config facts
${kvGrid(cfgFacts, Object.keys(cfgFacts))}
+
${agentSummary}
+ ${rawBtn}${rawBox} + `; +} diff --git a/static/main.js b/static/main.js deleted file mode 100644 index c6204a7..0000000 --- a/static/main.js +++ /dev/null @@ -1,900 +0,0 @@ -// ------ helpers ------ -const tblVmAdmin = document.querySelector("#vm-admin"); -const $ = (q) => document.querySelector(q); -function safe(v) { return (v === undefined || v === null || v === '') ? '—' : String(v); } -function ensureArr(a) { return Array.isArray(a) ? a : []; } -function pct(p) { if (p == null) return '—'; return (p * 100).toFixed(1) + '%'; } -function humanBytes(n) { if (n == null) return '—'; const u = ['B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB']; let i = 0, x = +n; while (x >= 1024 && i < u.length - 1) { x /= 1024; i++; } return x.toFixed(1) + ' ' + u[i]; } -function badge(txt, kind) { - const cls = { - ok: 'bg-success-subtle text-success-emphasis', warn: 'bg-warning-subtle text-warning-emphasis', - err: 'bg-danger-subtle text-danger-emphasis', info: 'bg-info-subtle text-info-emphasis', - dark: 'bg-secondary-subtle text-secondary-emphasis' - }[kind || 'dark']; - return `${safe(txt)}`; -} -function rowHTML(cols, attrs = '') { return `${cols.map(c => `${c ?? '—'}`).join('')}`; } -function setRows(tbody, rows) { tbody.innerHTML = rows.length ? rows.join('') : rowHTML(['—']); } -function fmtSeconds(s) { - if (s == null) return '—'; - s = Math.floor(s); - const d = Math.floor(s / 86400); s %= 86400; - const h = Math.floor(s / 3600); s %= 3600; - const m = Math.floor(s / 60); s %= 60; - const parts = [h.toString().padStart(2, '0'), m.toString().padStart(2, '0'), s.toString().padStart(2, '0')].join(':'); - return d > 0 ? `${d}d ${parts}` : parts; -} -function parseNetConf(val) { - const out = {}; if (!val) return out; - val.split(',').forEach(kv => { - const [k, v] = kv.split('='); - if (k && v !== undefined) out[k.trim()] = v.trim(); - }); - return out; -} -function parseVmNetworks(config) { - const nets = []; - for (const [k, v] of Object.entries(config || {})) { - const m = k.match(/^net(\d+)$/); - if (m) { nets.push({ idx: +m[1], raw: v, ...parseNetConf(v) }); } - } - nets.sort((a, b) => a.idx - b.idx); - return nets; -} -function kvGrid(obj, keys, titleMap = {}) { - return `
- ${keys.map(k => ` -
-
-
${titleMap[k] || k}
-
${safe(obj[k])}
-
-
`).join('')} -
`; -} -// prefer first non-empty -function pick(...vals) { for (const v of vals) { if (v !== undefined && v !== null && v !== '') return v; } return ''; } - -// ------ DOM refs ------ -const nodeInput = $('#node'), btnEnable = $('#btnEnable'), btnDisable = $('#btnDisable'), btnToggleAll = $('#btnToggleAll'); -const btnRefresh = $('#btnRefresh'), btnAuto = $('#btnAuto'), selInterval = $('#selInterval'); -const healthDot = $('#healthDot'), healthTitle = $('#healthTitle'), healthSub = $('#healthSub'); -const qSummary = $('#q-summary'), qCardsWrap = $('#q-cards'), unitsBox = $('#units'), replBox = $('#repl'); -const tblHaRes = $('#ha-res'), tblHaStatus = $('#ha-status'), tblNodes = $('#nodes'), tblNonHA = $('#nonha'); -const pvecmPre = $('#pvecm'), cfgtoolPre = $('#cfgtool'), footer = $('#footer'); - -// ------ actions ------ -async function callAction(act) { - const node = nodeInput.value || ''; - const r = await fetch('/api/' + act, { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ node }) }); - const d = await r.json(); alert(d.ok ? 'OK' : ('ERROR: ' + (d.error || 'unknown'))); -} -btnEnable.onclick = () => callAction('enable'); -btnDisable.onclick = () => callAction('disable'); -btnToggleAll.onclick = () => { - document.querySelectorAll('.accordion-collapse').forEach(el => { - const bs = bootstrap.Collapse.getOrCreateInstance(el, { toggle: false }); - el.classList.contains('show') ? bs.hide() : bs.show(); - }); -}; - -// ------ refresh control ------ -let REF_TIMER = null; -async function fetchSnapshot() { - const r = await fetch('/api/info?node=' + encodeURIComponent(nodeInput.value || '')); - return await r.json(); -} -async function doRefresh() { - const d = await fetchSnapshot(); - renderSnap(d); - if (!doRefresh.didNonHA) { await renderNonHA(); doRefresh.didNonHA = true; } - if (!doRefresh.didAdmin) { await renderVMAdmin(); doRefresh.didAdmin = true; } -} -btnRefresh.onclick = doRefresh; -btnAuto.onclick = () => { - if (REF_TIMER) { - clearInterval(REF_TIMER); REF_TIMER = null; - btnAuto.textContent = 'OFF'; - btnAuto.classList.remove('btn-success'); btnAuto.classList.add('btn-outline-success'); - selInterval.disabled = true; - } else { - const iv = parseInt(selInterval.value || '30000', 10); - REF_TIMER = setInterval(doRefresh, iv); - btnAuto.textContent = 'ON'; - btnAuto.classList.remove('btn-outline-success'); btnAuto.classList.add('btn-success'); - selInterval.disabled = false; - } -}; -selInterval.onchange = () => { - if (REF_TIMER) { - clearInterval(REF_TIMER); - REF_TIMER = setInterval(doRefresh, parseInt(selInterval.value || '30000', 10)); - } -}; - -// ------ VM detail API ------ -async function fetchVmDetail(sid) { - const r = await fetch('/api/vm?sid=' + encodeURIComponent(sid)); - return await r.json(); -} -// ------ Node detail API ------ -async function fetchNodeDetail(name) { - const r = await fetch('/api/node?name=' + encodeURIComponent(name)); - return await r.json(); -} - -// ------ VM detail card ------ -function renderVmDetailCard(d) { - const meta = d.meta || {}; - const cur = d.current || {}; - const cfg = d.config || {}; - const ag = d.agent || {}; - const agInfo = ag.info || null; - const agOS = ag.osinfo && ag.osinfo.result ? ag.osinfo.result : null; - const agIfs = ag.ifaces && ag.ifaces.result ? ag.ifaces.result : null; - - const statusBadge = /running|online|started/i.test(meta.status || cur.status || '') - ? badge(meta.status || cur.status || 'running', 'ok') - : badge(meta.status || cur.status || 'stopped', 'err'); - - const maxmem = cur.maxmem ?? (cfg.memory ? Number(cfg.memory) * 1024 * 1024 : null); - const used = cur.mem ?? null; - const free = (maxmem != null && used != null) ? Math.max(0, maxmem - used) : null; - const balloonEnabled = (cfg.balloon !== undefined) ? (Number(cfg.balloon) !== 0) : (cur.balloon !== undefined && Number(cur.balloon) !== 0); - const binfo = cur.ballooninfo || null; - - let guestName = agOS && (agOS.name || agOS.pretty_name) || (agInfo && agInfo.version) || ''; - let guestIPs = []; - if (Array.isArray(agIfs)) { - agIfs.forEach(i => { - (i['ip-addresses'] || []).forEach(ip => { - const a = ip['ip-address']; if (a && !a.startsWith('fe80')) guestIPs.push(a); - }); - }); - } - - const bstat = cur.blockstat || {}; - const bRows = Object.keys(bstat).sort().map(dev => { - const s = bstat[dev] || {}; - return rowHTML([ - dev, humanBytes(s.rd_bytes || 0), safe(s.rd_operations || 0), - humanBytes(s.wr_bytes || 0), safe(s.wr_operations || 0), - safe(s.flush_operations || 0), humanBytes(s.wr_highest_offset || 0) - ]); - }); - - const ha = cur.ha || {}; - const haBadge = ha.state ? (/started/i.test(ha.state) ? badge(ha.state, 'ok') : badge(ha.state, 'warn')) : badge('—', 'dark'); - - const sysCards = { - 'QMP status': cur.qmpstatus, - 'QEMU': cur['running-qemu'], - 'Machine': cur['running-machine'], - 'PID': cur.pid, - 'Pressure CPU (some/full)': `${safe(cur.pressurecpusome)}/${safe(cur.pressurecpufull)}`, - 'Pressure IO (some/full)': `${safe(cur.pressureiosome)}/${safe(cur.pressureiofull)}`, - 'Pressure MEM (some/full)': `${safe(cur.pressurememorysome)}/${safe(cur.pressurememoryfull)}` - }; - - const nets = parseVmNetworks(cfg); - const netRows = nets.map(n => { - const br = n.bridge || n.br || '—'; - const mdl = n.model || n.type || (n.raw?.split(',')[0]?.split('=')[0]) || 'virtio'; - const mac = n.hwaddr || n.mac || (n.raw?.match(/([0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}/)?.[0] || '—'); - const vlan = n.tag || n.vlan || '—'; - const fw = (n.firewall === '1') ? badge('on', 'warn') : badge('off', 'dark'); - return rowHTML([`net${n.idx}`, mdl, br, vlan, mac, fw]); - }); - const netTable = ` -
- - - ${netRows.length ? netRows.join('') : rowHTML(['—', '—', '—', '—', '—', '—'])} -
IFModelBridgeVLANMACFW
-
`; - - const agentSummary = (agInfo || agOS || guestIPs.length) - ? `
- ${agOS ? `
Guest OS: ${safe(guestName)}
` : ''} - ${guestIPs.length ? `
Guest IPs: ${guestIPs.map(ip => badge(ip, 'info')).join(' ')}
` : ''} - ${agInfo ? `
Agent: ${badge('present', 'ok')}
` : `
Agent: ${badge('not available', 'err')}
`} -
` - : '
No guest agent data
'; - - const cfgFacts = { - 'BIOS': cfg.bios, 'UEFI/EFI disk': cfg.efidisk0 ? 'yes' : 'no', - 'CPU type': cfg.cpu, 'Sockets': cfg.sockets, 'Cores': cfg.cores, 'NUMA': cfg.numa, - 'On boot': cfg.onboot ? 'yes' : 'no', 'OS type': cfg.ostype, 'SCSI hw': cfg.scsihw - }; - - // Collapsible raw JSON - const rawId = `raw-${d.type}-${d.vmid}`; - const rawBtn = ` - `; - const rawBox = ` -
-
    -
    • -
    • -
    • -
-
- 
${JSON.stringify(cur, null, 2)}
- 
${JSON.stringify(cfg, null, 2)}
- 
${JSON.stringify(ag, null, 2)}
-
-
`; - - return ` -
-
${safe(meta.name || cfg.name || d.sid)}
-
${(d.type || '').toUpperCase()} / VMID ${safe(d.vmid)} @ ${safe(d.node)}
-
-
${statusBadge}
- ${meta.hastate ? `
HA: ${badge(meta.hastate, /started/i.test(meta.hastate) ? 'ok' : 'warn')}
` : ''} - ${ha.state ? `
HA runtime: ${haBadge}
` : ''} -
- -
-
-
CPU
${cur.cpu !== undefined ? (cur.cpu * 100).toFixed(1) + '%' : '—'}
-
vCPUs: ${safe(cur.cpus ?? cfg.cores ?? cfg.sockets)}
-
-
-
Memory (used/free/total)
-
${(used != null && maxmem != null) - ? `${humanBytes(used)} / ${humanBytes(free)} / ${humanBytes(maxmem)}` - : '—'}
-
Ballooning: ${balloonEnabled ? badge('enabled', 'ok') : badge('disabled', 'err')}
- ${binfo ? `
Balloon actual: ${humanBytes(binfo.actual)} | guest free: ${humanBytes(binfo.free_mem)} | guest total: ${humanBytes(binfo.total_mem)}
` : ''} -
-
-
Disk (used/total)
-
${(cur.disk != null && cur.maxdisk != null) ? `${humanBytes(cur.disk)} / ${humanBytes(cur.maxdisk)}` : '—'}
-
R: ${humanBytes(cur.diskread || 0)} | W: ${humanBytes(cur.diskwrite || 0)}
-
-
-
Uptime
${fmtSeconds(cur.uptime)}
-
Tags: ${safe(cfg.tags || meta.tags || '—')}
-
-
- -
-
Network (config)
- ${netTable} -
- -
-
Disks (block statistics)
-
- - - ${Object.keys(bstat).length ? bRows.join('') : rowHTML(['—', '—', '—', '—', '—', '—', '—'])} -
DeviceRead bytesRead opsWrite bytesWrite opsFlush opsHighest offset
-
-
- -
-
System / QEMU
- ${kvGrid(sysCards, Object.keys(sysCards))} -
- -
Config facts
${kvGrid(cfgFacts, Object.keys(cfgFacts))}
- -
${agentSummary}
- - ${rawBtn} - ${rawBox} - `; -} - -// ------ Node detail card ------ -function renderNodeDetailCard(d) { - const st = d.status || {}; lastSt = st; - const ver = d.version || {}; - const tm = d.time || {}; - const netcfg = ensureArr(d.network_cfg); - const disks = ensureArr(d.disks); - const subscription = d.subscription || {}; // <-- JEDYNA deklaracja (zamiast podwójnego 'const sub') - - // robust online detection - const isOn = /online|running/i.test(st.status || '') || - /online/i.test(st.hastate || '') || - (st.uptime > 0) || - (st.cpu != null && st.maxcpu != null) || - (st.memory && st.memory.total > 0); - const statusTxt = isOn ? 'online' : (st.status || 'offline'); - const sB = isOn ? badge(statusTxt, 'ok') : badge(statusTxt, 'err'); - - const mem = st.memory || {}; - const root = st.rootfs || {}; - const load = Array.isArray(st.loadavg) ? st.loadavg.join(' ') : (st.loadavg || ''); - - // ---- SYSTEM DETAILS - const cpuinfo = st.cpuinfo || {}; - const boot = st['boot-info'] || st.boot_info || {}; - const curKernel = st['current-kernel'] || st.current_kernel || {}; - const ramStr = (mem.used != null && mem.available != null && mem.total != null) - ? `${humanBytes(mem.used)} used / ${humanBytes(mem.available)} free / ${humanBytes(mem.total)} total` - : (mem.total != null ? humanBytes(mem.total) : '—'); - - const tech = { - 'PVE version': pick(st.pveversion, ver.pvemanager, ver['pve-manager']), - 'Kernel': pick(st.kversion, curKernel.release, ver.kernel, ver.release), - 'CPU model': pick(cpuinfo.model, st['cpu-model'], ver['cpu-model'], ver.cpu), - 'Architecture': pick(curKernel.machine, ver.arch, st.architecture, st.arch), - 'RAM': ramStr, - 'Boot mode': pick(boot.mode) ? String(boot.mode).toUpperCase() : '—', - 'Secure Boot': (boot.secureboot === 1 || boot.secureboot === '1') ? 'enabled' : - (boot.secureboot === 0 || boot.secureboot === '0') ? 'disabled' : '—' - }; - - const top = ` -
-
${safe(d.node)}
-
-
${sB}
-
-
CPU: ${pct(st.cpu)}
-
Load: ${safe(load)}
-
Uptime: ${fmtSeconds(st.uptime)}
-
`; - - const memCard = ` -
-
-
Memory
-
${(mem.used != null && mem.total != null) ? `${humanBytes(mem.used)} / ${humanBytes(mem.total)} (${pct(mem.used / mem.total)})` : '—'}
-
-
-
RootFS
-
${(root.used != null && root.total != null) ? `${humanBytes(root.used)} / ${humanBytes(root.total)} (${pct(root.used / root.total)})` : '—'}
-
-
-
Kernel / QEMU
-
${safe(tech['Kernel'])} / ${safe(pick(ver.qemu, ver['running-qemu']))}
-
-
-
Time
-
${safe(tm.localtime)} ${tm.timezone ? `(${tm.timezone})` : ''}
-
-
`; - - const sysDetails = kvGrid(tech, Object.keys(tech), { - 'PVE version': 'PVE version', - 'Kernel': 'Kernel version', - 'CPU model': 'CPU model', - 'Architecture': 'Arch', - 'RAM': 'RAM (used/free/total)', - 'Boot mode': 'Boot mode', - 'Secure Boot': 'Secure Boot' - }); - - // Network config - const netRows = netcfg.map(n => { - return rowHTML([safe(n.iface || n.ifname), safe(n.type), safe(n.method || n.autostart), safe(n.bridge_ports || n.address || '—'), safe(n.cidr || n.netmask || '—'), safe(n.comments || '')]); - }); - const netCfgTable = ` -
- - - ${netRows.length ? netRows.join('') : rowHTML(['—', '—', '—', '—', '—', '—'])} -
IFTypeMethodPorts/AddressNetmask/CIDRComment
-
`; - - // Disks - const diskRows = disks.map(dv => rowHTML([safe(dv.devpath || dv.kname || dv.dev), safe(dv.model), safe(dv.size ? humanBytes(dv.size) : '—'), safe(dv.health || dv.wearout || '—'), safe(dv.serial || '—')])); - const diskTable = ` -
- - - ${diskRows.length ? diskRows.join('') : rowHTML(['—', '—', '—', '—', '—'])} -
DeviceModelSizeHealthSerial
-
`; - - // Subscription - const subBox = ` -
-
Status: ${badge(safe(subscription.status || 'unknown'), /active|valid/i.test(subscription.status || '') ? 'ok' : 'warn')}
- ${subscription.productname ? `
Product: ${safe(subscription.productname)}
` : ''} - ${subscription.message ? `
${safe(subscription.message)}
` : ''} -
`; - - // Collapsible raw JSON - const rawId = `raw-node-${safe(d.node)}`; - const rawBtn = ` - `; - const rawBox = ` -
- 
${JSON.stringify(d, null, 2)}
-
`; - - return ` - ${top} - ${memCard} - -
-
System details
- ${sysDetails} -
- -
-
Network (config)
- ${netCfgTable} -
- -
-
Disks
- ${diskTable} -
- -
-
Subscription
- ${subBox} -
- - ${rawBtn} - ${rawBox} - `; -} - -// ------ Sections ------ -function setHealth(ok, vq, unitsActive) { - healthDot.classList.toggle('ok', !!ok); - healthDot.classList.toggle('bad', !ok); - healthTitle.textContent = ok ? 'HA: OK' : 'HA: PROBLEM'; - healthSub.textContent = `Quorate=${String(vq.quorate)} | units=${unitsActive ? 'active' : 'inactive'} | members=${safe(vq.members)} | quorum=${safe(vq.quorum)}/${safe(vq.expected)}`; -} - -function renderClusterCards(arr) { - const a = ensureArr(arr); qCardsWrap.innerHTML = ''; - if (!a.length) { qCardsWrap.innerHTML = badge('No data', 'dark'); return; } - const cluster = a.find(x => x.type === 'cluster') || {}; - const qB = cluster.quorate ? badge('Quorate: yes', 'ok') : badge('Quorate: no', 'err'); - qCardsWrap.insertAdjacentHTML('beforeend', ` -
-
-
${safe(cluster.name)}
-
id: ${safe(cluster.id)}
-
${qB}
-
nodes: ${safe(cluster.nodes)}
-
version: ${safe(cluster.version)}
-
-
`); - const nodes = a.filter(x => x.type === 'node'); - const rows = nodes.map(n => { - const online = n.online ? badge('online', 'ok') : badge('offline', 'err'); - const local = n.local ? ' ' + badge('local', 'info') : ''; - return rowHTML([safe(n.name), online + local, safe(n.ip), safe(n.nodeid), safe(n.level)]); - }); - qCardsWrap.insertAdjacentHTML('beforeend', ` -
- - - ${rows.join('')} -
NodeStatusIPNodeIDLevel
-
`); -} - -function renderUnits(units) { - unitsBox.innerHTML = ''; - if (!units || !Object.keys(units).length) { unitsBox.innerHTML = badge('No data', 'dark'); return; } - const map = { active: 'ok', inactive: 'err', failed: 'err', activating: 'warn' }; - Object.entries(units).forEach(([k, v]) => unitsBox.insertAdjacentHTML('beforeend', `${badge(k, map[v] || 'dark')}`)); -} - -function parsePveSr(text) { - const lines = (text || '').split('\n').map(s => s.trim()).filter(Boolean), out = []; - for (const ln of lines) { - if (ln.startsWith('JobID')) continue; - const m = ln.match(/^(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\d+)\s+(\S+)$/); - if (m) out.push({ job: m[1], enabled: m[2], target: m[3], last: m[4], next: m[5], dur: m[6], fail: +m[7], state: m[8] }); - } return out; -} -function renderReplication(text) { - const arr = parsePveSr(text); - if (!arr.length) { replBox && (replBox.innerHTML = 'No replication jobs'); return; } - const rows = arr.map(x => { - const en = /^yes$/i.test(x.enabled) ? badge('Yes', 'ok') : badge('No', 'err'); - const st = /^ok$/i.test(x.state) ? badge(x.state, 'ok') : badge(x.state, 'err'); - const fc = x.fail > 0 ? badge(String(x.fail), 'err') : badge(String(x.fail), 'ok'); - return rowHTML([x.job, en, x.target, x.last, x.next, x.dur, fc, st]); - }); - replBox.innerHTML = `
- - ${rows.join('')}
JobIDEnabledTargetLastSyncNextSyncDurationFailCountState
`; -} - -// HA Resources table (expandable rows) -function renderHAResources(list) { - const arr = ensureArr(list); const rows = []; - arr.forEach(x => { - const st = x.state || '—'; - const stB = /start/i.test(st) ? badge(st, 'ok') : (/stop/i.test(st) ? badge(st, 'err') : badge(st, 'dark')); - const sid = safe(x.sid); - rows.push(rowHTML([sid, stB, safe(x.node), safe(x.group), safe(x.flags || x.comment)], `class="vm-row" data-sid="${sid}"`)); - rows.push(`
—
`); - }); - setRows(tblHaRes, rows.length ? rows : [rowHTML(['—', '—', '—', '—', '—'])]); - Array.from(document.querySelectorAll('#ha-res tr.vm-row')).forEach((tr, i) => { - tr.onclick = async () => { - const detailRow = tblHaRes.querySelectorAll('tr.vm-detail')[i]; - const content = detailRow.querySelector('.vm-json'); - const spin = detailRow.querySelector('.spinner-border'); - const open = detailRow.classList.contains('d-none'); - document.querySelectorAll('#ha-res tr.vm-detail').forEach(r => r.classList.add('d-none')); - if (open) { - detailRow.classList.remove('d-none'); spin.classList.remove('d-none'); - const sid = tr.getAttribute('data-sid'); - try { const d = await fetchVmDetail(sid); content.innerHTML = renderVmDetailCard(d); } - catch (e) { content.textContent = 'ERROR: ' + e; } - spin.classList.add('d-none'); - } - }; - }); -} - -function renderHAStatus(list) { - const st = ensureArr(list); - if (!st.length) { setRows(tblHaStatus, [rowHTML(['—', '—', '—', '—'])]); return; } - const rows = st.map(n => { - const sB = /active|online/i.test(n.state || '') ? badge(n.state, 'ok') : badge(safe(n.state || '—'), 'warn'); - const crmB = /active/i.test(n.crm_state || '') ? badge(n.crm_state, 'ok') : badge(safe(n.crm_state || '—'), 'err'); - const lrmB = /active/i.test(n.lrm_state || '') ? badge(n.lrm_state, 'ok') : badge(safe(n.lrm_state || '—'), 'err'); - return rowHTML([safe(n.node), sB, crmB, lrmB]); - }); - setRows(tblHaStatus, rows); -} - -// Non-HA VM/CT table -async function renderNonHA() { - const r = await fetch('/api/list-vmct'); - const d = await r.json(); - const arr = ensureArr(d.nonha); - if (!arr.length) { setRows(tblNonHA, [rowHTML(['No non-HA VMs/CTs'])]); return; } - const rows = []; - arr.forEach(x => { - const sid = safe(x.sid), type = safe(x.type), name = safe(x.name), node = safe(x.node); - const st = /running/i.test(x.status || '') ? badge(x.status, 'ok') : badge(x.status, 'dark'); - rows.push(rowHTML([sid, type, name, node, st], `class="vm-row" data-sid="${sid}` + "\"")); - rows.push(`
—
`); - }); - setRows(tblNonHA, rows); - Array.from(document.querySelectorAll('#nonha tr.vm-row')).forEach((tr, i) => { - tr.onclick = async () => { - const detailRow = tblNonHA.querySelectorAll('tr.vm-detail')[i]; - const content = detailRow.querySelector('.vm-json'); - const spin = detailRow.querySelector('.spinner-border'); - const open = detailRow.classList.contains('d-none'); - document.querySelectorAll('#nonha tr.vm-detail').forEach(r => r.classList.add('d-none')); - if (open) { - detailRow.classList.remove('d-none'); spin.classList.remove('d-none'); - const sid = tr.getAttribute('data-sid'); - try { const d = await fetchVmDetail(sid); content.innerHTML = renderVmDetailCard(d); } - catch (e) { content.textContent = 'ERROR: ' + e; } - spin.classList.add('d-none'); - } - }; - }); -} - -// Nodes table (expandable) + sticky first column + robust online detect -function renderNodesTable(nodes) { - const nrows = ensureArr(nodes).map(n => { - const isOn = /online|running/i.test(n.status || '') || - /online/i.test(n.hastate || '') || - (n.uptime > 0) || - (n.cpu != null && n.maxcpu != null) || - (n.mem != null && n.maxmem != null); - const statusTxt = isOn ? 'online' : (n.status || 'offline'); - const sB = isOn ? badge(statusTxt, 'ok') : badge(statusTxt, 'err'); - - const mem = (n.mem != null && n.maxmem) ? `${humanBytes(n.mem)} / ${humanBytes(n.maxmem)} (${pct(n.mem / n.maxmem)})` : '—'; - const rfs = (n.rootfs != null && n.maxrootfs) ? `${humanBytes(n.rootfs)} / ${humanBytes(n.maxrootfs)} (${pct(n.rootfs / n.maxrootfs)})` : '—'; - const load = (n.loadavg != null) ? String(n.loadavg) : '—'; - const cpu = (n.cpu != null) ? pct(n.cpu) : '—'; - - const main = ` - ${safe(n.node)} - ${sB}${cpu}${load}${mem}${rfs}${fmtSeconds(n.uptime)} - `; - - const detail = ` - - -
—
- - `; - - return main + detail; - }); - setRows(tblNodes, nrows); - - Array.from(document.querySelectorAll('#nodes tr.node-row')).forEach((tr, i) => { - tr.onclick = async () => { - const detailRow = tblNodes.querySelectorAll('tr.node-detail')[i]; - const content = detailRow.querySelector('.node-json'); - const spin = detailRow.querySelector('.spinner-border'); - const open = detailRow.classList.contains('d-none'); - document.querySelectorAll('#nodes tr.node-detail').forEach(r => r.classList.add('d-none')); - if (open) { - detailRow.classList.remove('d-none'); spin.classList.remove('d-none'); - const name = tr.getAttribute('data-node'); - try { const d = await fetchNodeDetail(name); content.innerHTML = renderNodeDetailCard(d); } - catch (e) { content.textContent = 'ERROR: ' + e; } - spin.classList.add('d-none'); - } - }; - }); -} - -// ------ main render ------ -function renderSnap(d) { - const vq = d.votequorum || {}; const units = d.units || {}; const allUnits = Object.values(units).every(v => v === 'active'); - const ok = (vq.quorate === 'yes') && allUnits; - setHealth(ok, vq, allUnits); - - const gl = document.getElementById('global-loading'); if (gl) gl.remove(); - - qSummary.textContent = `Quorate: ${safe(vq.quorate)} | members: ${safe(vq.members)} | expected: ${safe(vq.expected)} | total: ${safe(vq.total)} | quorum: ${safe(vq.quorum)}`; - renderClusterCards(d.api && d.api.cluster_status); - renderUnits(units); - renderReplication(d.replication); - renderHAResources(d.api && d.api.ha_resources); - renderHAStatus(d.api && d.api.ha_status); - renderNodesTable(d.api && d.api.nodes); - - pvecmPre.textContent = safe(d.pvecm); - cfgtoolPre.textContent = safe(d.cfgtool); - - footer.textContent = `node_arg=${safe(d.node_arg)} | host=${safe(d.hostname)} | ts=${new Date((d.ts || 0) * 1000).toLocaleString()}`; -} - -// initial one-shot load (auto refresh OFF by default) -doRefresh().catch(console.error); - - -// ------ VM Admin API/UI ------ -async function fetchAllVmct() { - const r = await fetch('/api/list-all-vmct'); - return await r.json(); -} -async function vmAction(sid, action, target) { - const body = { sid, action }; - if (target) body.target = target; - const r = await fetch('/api/vm-action', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(body) }); - const d = await r.json(); - if (!d.ok) throw new Error(d.error || 'action failed'); - return d; -} - -async function renderVMAdmin() { - const data = await fetchAllVmct(); - const arr = ensureArr(data.all); - const nodes = ensureArr(data.nodes); - const tbody = document.querySelector('#vm-admin tbody'); - if (!arr.length) { setRows(tbody, [rowHTML(['Brak VM/CT'])]); return; } - - const rows = arr.map(x => { - const sid = safe(x.sid), type = safe(x.type), name = safe(x.name), node = safe(x.node); - const st = /running/i.test(x.status || '') ? badge(x.status, 'ok') : badge(x.status || '—', 'dark'); - const actions = ` -
- - - - -
`; - const sel = ``; - const migrateBtn = `
`; - return rowHTML([sid, type.toUpperCase(), name, node, st, actions, sel, migrateBtn], `data-sid="${sid}"`); - }); - - setRows(tbody, rows); - - Array.from(tbody.querySelectorAll('tr[data-sid]')).forEach(tr => { - const sid = tr.getAttribute('data-sid'); - const getTarget = () => tr.querySelector('.target-node')?.value || ''; - const colSpan = tr.children.length; // for status row width - const bind = (sel, action, needsTarget = false) => { - const btn = tr.querySelector(sel); - if (!btn) return; - btn.onclick = async () => { - setRowBusy(tr, true); - btn.disabled = true; - try { - if (action === 'migrate') { - const target = getTarget(); - const resp = await vmAction(sid, action, target); - // show expandable status row (spinner already set via setRowBusy) - const row = ensureMigRow(tr, colSpan); - setMigRowVisible(row, true); - const log = row.querySelector('.mig-log'); - const srcNode = resp.source_node; - const upid = resp.upid; - const stopSig = { done: false }; - tailTaskLog(upid, srcNode, log, stopSig); - - log.textContent = `Starting offline migrate to ${target} (UPID: ${upid || '—'})...`; - // update badge immediately - const badgeCell = tr.children[4]; - if (badgeCell) badgeCell.innerHTML = badge('migrating', 'info'); - // start background polling; update log on each tick - await pollTask(upid, srcNode, (st) => { - const lines = []; - for (const k of ['type', 'status', 'pid', 'starttime', 'user', 'node', 'endtime', 'exitstatus']) { - if (st && st[k] !== undefined) lines.push(`${k}: ${st[k]}`); - } - log.textContent = lines.join('\n') || '—'; - }, async (finalSt) => { - stopSig.done = true; - const exit = (finalSt && finalSt.exitstatus) ? String(finalSt.exitstatus) : ''; - const ok = exit.toUpperCase() === 'OK'; - const badgeCell = tr.children[4]; - if (badgeCell) badgeCell.innerHTML = ok ? badge('running', 'ok') : badge('migrate error', 'err'); - log.textContent += (log.textContent ? '\n' : '') + (ok ? 'Migration finished successfully.' : ('Migration failed: ' + (exit || 'unknown error'))); - setRowBusy(tr, false); - await doRefresh(); - // auto-collapse on success after 2s - if (ok) { setTimeout(() => { const row = tr.nextElementSibling; if (row && row.classList.contains('mig-row')) setMigRowVisible(row, false); }, 2000); } - }); - } else { - await vmAction(sid, action, needsTarget ? getTarget() : undefined); - showToast('Success', `${action} executed for ${sid}`, 'success'); - await doRefresh(); - setRowBusy(tr, false); - } - } catch (e) { showToast('Error', 'ERROR: ' + e.message, 'danger'); } - btn.disabled = false; - }; - }; - bind('.act-unlock', 'unlock'); - bind('.act-start', 'start'); - bind('.act-stop', 'stop'); - bind('.act-shutdown', 'shutdown'); - bind('.act-migrate', 'migrate', true); - const statusBtn = tr.querySelector('.act-status'); - if (statusBtn) { - statusBtn.onclick = () => { - const row = ensureMigRow(tr, colSpan); - setMigRowVisible(row, row.classList.contains('d-none')); - }; - } - }); -} - - - -async function pollTask(upid, node, onUpdate, onDone) { - let lastSt = null; - if (!upid || !node) return; - const started = Date.now(); - const maxMs = 5 * 60 * 1000; - const delay = (ms) => new Promise(r => setTimeout(r, ms)); - while (Date.now() - started < maxMs) { - try { - const r = await fetch('/api/task-status?upid=' + encodeURIComponent(upid) + '&node=' + encodeURIComponent(node)); - const d = await r.json(); - if (d && d.ok) { - const st = d.status || {}; - lastSt = st; - if (onUpdate) { try { onUpdate(st); } catch { } } - const s = (st.status || '').toLowerCase(); - if (s === 'stopped' || st.exitstatus) break; - } - } catch (e) { } - await delay(2000); - } - try { if (onDone) onDone(lastSt); } catch { } -} - - -function ensureMigRow(mainTr, colSpan) { - let nxt = mainTr.nextElementSibling; - if (!nxt || !nxt.classList.contains('mig-row')) { - nxt = document.createElement('tr'); - nxt.className = 'mig-row d-none'; - const td = document.createElement('td'); - td.colSpan = colSpan; - td.innerHTML = '
Migration status
—
'; - nxt.appendChild(td); - mainTr.parentNode.insertBefore(nxt, mainTr.nextSibling); - } - return nxt; -} -function setMigRowVisible(row, vis) { - row.classList.toggle('d-none', !vis); -} - -function setRowBusy(tr, busy) { - const nameCell = tr.children[2]; - if (!nameCell) return; - let spin = nameCell.querySelector('.op-spin'); - if (busy) { - if (!spin) { - const span = document.createElement('span'); - span.className = 'op-spin spinner-border spinner-border-sm align-middle ms-2'; - span.setAttribute('role', 'status'); - span.setAttribute('aria-hidden', 'true'); - nameCell.appendChild(span); - } - } else { - if (spin) spin.remove(); - } -} - - -function showToast(title, body, variant) { - const cont = document.getElementById('toast-container'); - if (!cont) { console.warn('toast container missing'); return; } - const id = 't' + Math.random().toString(36).slice(2); - const vcls = { - success: 'text-bg-success', - info: 'text-bg-info', - warning: 'text-bg-warning', - danger: 'text-bg-danger', - secondary: 'text-bg-secondary' - }[variant || 'secondary']; - const el = document.createElement('div'); - el.className = 'toast align-items-center ' + vcls; - el.setAttribute('role', 'alert'); - el.setAttribute('aria-live', 'assertive'); - el.setAttribute('aria-atomic', 'true'); - el.innerHTML = ` -
-
- ${title || ''}${title ? ': ' : ''}${body || ''} -
- -
`; - cont.appendChild(el); - const t = new bootstrap.Toast(el, { delay: 5000 }); - t.show(); - el.addEventListener('hidden.bs.toast', () => el.remove()); -} - - -async function tailTaskLog(upid, node, preEl, stopSignal) { - let start = 0; - const delay = (ms) => new Promise(r => setTimeout(r, ms)); - const append = (txt) => { - if (!preEl) return; - preEl.textContent = (preEl.textContent ? preEl.textContent + '\n' : '') + txt; - trimLogEl(preEl); - preEl.scrollTop = preEl.scrollHeight; - }; - while (!stopSignal.done) { - try { - const r = await fetch('/api/task-log?upid=' + encodeURIComponent(upid) + '&node=' + encodeURIComponent(node) + '&start=' + start); - const d = await r.json(); - if (d && d.ok) { - const lines = Array.isArray(d.lines) ? d.lines : []; - for (const ln of lines) { - if (ln && typeof ln.t === 'string') append(ln.t); - } - start = d.next_start ?? start; - } - } catch (e) { - // transient errors ignored - } - await delay(1500); - } -} - - -const LOG_MAX_CHARS = 64 * 1024; // 64KB cap for log panel -function trimLogEl(preEl) { - if (!preEl) return; - const txt = preEl.textContent || ''; - if (txt.length > LOG_MAX_CHARS) { - preEl.textContent = txt.slice(-LOG_MAX_CHARS); - } -} \ No newline at end of file diff --git a/static/styles.css b/static/styles.css index 7db1caf..4f00865 100644 --- a/static/styles.css +++ b/static/styles.css @@ -97,4 +97,49 @@ footer.site-footer a:hover { .position-fixed.bottom-0.end-0.p-3 { right: max(env(safe-area-inset-right), 1rem); bottom: max(env(safe-area-inset-bottom), 1rem); +} + +/* Row chevron (expandable rows) */ +.table .chev { + width: 1.25rem; + text-align: center; + user-select: none; +} + +.table tr.expandable { + cursor: pointer; +} + +.table tr.expandable .chev::before { + content: "▸"; + display: inline-block; + transition: transform .15s ease; +} + +.table tr.expanded .chev::before { + transform: rotate(90deg); + content: "▾"; +} + +/* Small utility widths */ +.w-1 { + width: 1.25rem; +} + +/* Subtle skeleton */ +.skel { + position: relative; + background: linear-gradient(90deg, rgba(255, 255, 255, .05) 25%, rgba(255, 255, 255, .10) 37%, rgba(255, 255, 255, .05) 63%); + background-size: 400% 100%; + animation: skel 1.4s ease-in-out infinite; +} + +@keyframes skel { + 0% { + background-position: 100% 0; + } + + 100% { + background-position: 0 0; + } } \ No newline at end of file diff --git a/templates/index.html b/templates/index.html index c1a212c..b27eb29 100644 --- a/templates/index.html +++ b/templates/index.html @@ -15,8 +15,9 @@

PVE HA Panel

- - + +
@@ -43,14 +44,14 @@
- + Loading data…
-
+
Loading…
—
@@ -137,6 +138,7 @@ + @@ -146,36 +148,7 @@
SID State Node
-
Click a row to expand VM/CT details.
-
-
-
- - -
-

- -

-
-
- - - - - - - - - - - - - - -
NodeStatusCRMLRM
Loading…
+
Kliknij wiersz, aby rozwinąć szczegóły VM/CT.
@@ -212,6 +185,7 @@ + @@ -221,11 +195,11 @@ - +
SID Type Name
Loading…Loading…
-
Click a row to expand VM/CT details.
+
Kliknij wiersz, aby rozwinąć szczegóły VM/CT.
@@ -253,7 +227,8 @@ -
Akcje: Unlock (qm), Start/Stop/Shutdown, Offline migrate.
+
Akcje: Unlock (qm), Start/Stop/Shutdown, Offline migrate. Postęp widoczny na + żywo per wiersz.
@@ -265,6 +240,7 @@ + @@ -280,11 +256,10 @@
Node Status CPU
-
Click a row to expand node details.
+
Kliknij wiersz, aby rozwinąć szczegóły noda.
-
—
@@ -301,7 +276,6 @@ - @@ -310,7 +284,8 @@ - + + \ No newline at end of file