';
@@ -647,12 +782,16 @@ function vvPollMonitor() {
}
const exitColor = par.exit_label === 'Completed' ? '#4caf50' : par.exit_label === 'Aborted' ? '#ff9800' : '#f44336';
- const errColor = (par.errors ?? 0) > 0 ? '#f44336' : '#555';
+ const errColor = (par.errors ?? 0) > 0 ? '#f44336' : '#444';
const speedStr = par.last_speed_mb ? ` · ${par.last_speed_mb} MB/s` : '';
const nextDate = vvFmtDate(par.next_ts);
const dueIn = vvDueIn(par.next_ts);
+ const parBannerCls = !valid ? 'vv-banner-err' : (par.errors ?? 0) > 0 ? 'vv-banner-warn' : 'vv-banner-ok';
- let html = `
`;
if (inProg) {
const pct = par.resync_pct ?? 0;
@@ -678,59 +817,170 @@ function vvPollMonitor() {
document.getElementById('vv-parity-body').innerHTML = html;
})();
- // ── Storage helpers ──────────────────────────────────────────────────────
- function vvTempColor(tempC, transport) {
- if (tempC === null) return '#444';
- const isSsd = transport === 'nvme' || transport === 'ssd';
- const warn = isSsd ? vvThresholds.ssd_warn : vvThresholds.hdd_warn;
- const crit = isSsd ? vvThresholds.ssd_crit : vvThresholds.hdd_crit;
- return tempC >= crit ? '#f44336' : tempC >= warn ? '#ff9800' : '#4caf50';
- }
- function vvFmt(v) { return v >= 1024 ? (v / 1024).toFixed(1) + ' TB' : v + ' GB'; }
+ // ── Watchdog ─────────────────────────────────────────────────────────────
+ (function() {
+ const wd = d.watchdog ?? {};
+ const el = document.getElementById('vv-watchdog-body');
+ if (!el) return;
- function vvDiskRow(disk) {
- const tempC = disk.temp;
- const tempColor = vvTempColor(tempC, disk.transport);
- const tempStr = tempC !== null ? `${tempC}°` : '—';
- const isParity = disk.role === 'parity';
- const nameColor = isParity ? '#6a8faf' : '#aaa';
- const pct = disk.pct ?? 0;
- const barColor = isParity ? '#1e3a5a'
- : pct >= vvThresholds.util_crit ? '#f44336'
- : pct >= vvThresholds.util_warn ? '#ff9800'
- : '#4caf50';
- const barWidth = isParity ? '100' : pct;
- const spinLabel = (!isParity && !disk.mounted) ? `
-
- ${disk.name}${spinLabel}
- ${right}
- ${tempStr}
-
-
+ const healthy = wd.healthy ?? true;
+ const ctrStrikes = wd.ctr_strikes ?? {};
+ const ctrNames = Object.keys(ctrStrikes);
+ const rwLevel = wd.rw_level ?? 0;
+ const rwPaused = wd.rw_paused ?? [];
+ const rwStopped = wd.rw_stopped ?? [];
+ const daemonHit = (wd.daemon_strikes ?? 0) > 0;
+ const oom = wd.oom_count ?? 0;
+ const reboots = wd.reboots_12h ?? 0;
+ const restartCount = wd.restart_count ?? 0;
+ const restarts = wd.restarts_24h ?? [];
+
+ const stab = wd.stability ?? {};
+ const stabStrikes = stab.strikes ?? {};
+ const stabNames = Object.keys(stabStrikes);
+
+ const storWd = wd.storage_wd ?? {};
+ const growthStr = storWd.growth_strikes ?? {};
+ const logStr = storWd.log_strikes ?? {};
+ const storIssues = Object.keys(growthStr).length + Object.keys(logStr).length;
+
+ const netWd = wd.network_wd ?? {};
+ const npmStrikes = netWd.npm_strikes ?? 0;
+
+ const issueCount = ctrNames.length + stabNames.length + storIssues
+ + (daemonHit ? 1 : 0) + (oom > 0 ? 1 : 0)
+ + (reboots > 0 ? 1 : 0) + (npmStrikes > 0 ? 1 : 0);
+ const bannerCls = healthy ? 'vv-banner-ok' : (reboots || oom || daemonHit ? 'vv-banner-err' : 'vv-banner-warn');
+ const bannerTxt = healthy ? '✓ All clear' : `⚠ ${issueCount} issue${issueCount !== 1 ? 's' : ''}`;
+
+ let html = `
${bannerTxt}`;
+ if (reboots > 0) html += `${reboots} reboot${reboots !== 1 ? 's' : ''}/12h`;
+ html += `
`;
+
+ // ── Alerts (critical items) ──────────────────────────────────────────
+ if (rwLevel > 0) {
+ const rwColor = rwLevel >= 3 ? '#f44336' : rwLevel >= 2 ? '#ff9800' : '#fdd835';
+ const rwLabel = ['', 'Soft', 'Medium', 'Hard'][rwLevel] ?? `L${rwLevel}`;
+ html += `
⚡ Resource mgr: ${rwLabel}`;
+ if (rwPaused.length) html += ` · ${rwPaused.length} paused`;
+ if (rwStopped.length) html += ` · ${rwStopped.length} stopped`;
+ html += `
`;
+ }
+ if (daemonHit) html += `
✗ Docker daemon strikes
`;
+ if (oom > 0) html += `
✗ OOM events: ${oom}
`;
+
+ // ── System stats grid ────────────────────────────────────────────────
+ function wdPct(v, warn, crit) {
+ return v >= crit ? '#f44336' : v >= warn ? '#ff9800' : '#4caf50';
+ }
+ const ramFree = stab.ram_free_gb ?? 0;
+ const ramColor = ramFree < 6 ? '#f44336' : ramFree < 12 ? '#ff9800' : '#4caf50';
+ const load = stab.load_1min ?? 0;
+ const loadColor = load > 6 ? '#f44336' : load > 3 ? '#ff9800' : '#4caf50';
+ const nicOk = (stab.nic_state ?? '') === 'up';
+ const sshdOk = stab.sshd_ok ?? true;
+ const zombies = stab.zombies ?? 0;
+
+ let statsHtml = `
+ rootfs${stab.rootfs_pct??0}%
+ /var/log${stab.log_pct??0}%
+ /tmp${stab.tmp_pct??0}%
+ RAM free${ramFree}GB
+ Load${load}
+ ${stab.cpu_temp != null ? `CPU${stab.cpu_temp}°C` : ''}
+ Zombies${zombies}
+ ${stab.nic??'nic'}● ${stab.nic_state??'?'}
+ sshd${sshdOk?'● ok':'✗ down'}
+ NPM${npmStrikes>0?npmStrikes+'× strikes':'● ok'}
`;
- }
+ html += statsHtml;
- function vvDiskCol(disks) {
- return `
${disks.map(vvDiskRow).join('')}
`;
- }
+ // ── Stability strikes (system watchdog) ──────────────────────────────
+ if (stabNames.length) {
+ html += `
Stability strikes
`;
+ stabNames.forEach(k => {
+ html += `
+ ${k}
+ ${stabStrikes[k]}×
+
`;
+ });
+ }
- // ── Pools — single column ─────────────────────────────────────────────────
- const storageDisks = d.storage ?? [];
- if (storageDisks.length) {
- document.getElementById('vv-storage-body').innerHTML = storageDisks.map(vvDiskRow).join('');
- } else {
- document.getElementById('vv-storage-body').innerHTML = '
No pools found
';
- }
+ // ── Storage watchdog strikes ─────────────────────────────────────────
+ if (storIssues > 0) {
+ html += `
Storage watchdog
`;
+ Object.entries(growthStr).forEach(([k, v]) => {
+ html += `
+ ↑ ${k}
+ ${v}×
+
`;
+ });
+ Object.entries(logStr).forEach(([k, v]) => {
+ const shortKey = k.length > 22 ? '…' + k.slice(-22) : k;
+ html += `
+ log ${shortKey}
+ ${v}×
+
`;
+ });
+ }
- // ── Array disks — min 3 columns, balanced left-to-right, grows as needed ───
+ // ── Container strikes ────────────────────────────────────────────────
+ if (ctrNames.length) {
+ html += `
Container strikes
`;
+ ctrNames.forEach(name => {
+ html += `
+ ${name}
+ ${ctrStrikes[name]}×
+
`;
+ });
+ }
+
+ // ── Recent restarts ──────────────────────────────────────────────────
+ if (restartCount > 0) {
+ const hasAbove = ctrNames.length || stabNames.length || storIssues;
+ html += `
Restarts 24h ${restartCount}
`;
+ const now = Math.floor(Date.now() / 1000);
+ restarts.forEach(r => {
+ const diff = now - r.ts;
+ const ago = diff < 3600 ? Math.floor(diff / 60) + 'm' : Math.floor(diff / 3600) + 'h';
+ html += `
+ ${r.name}
+ ${ago}
+
`;
+ });
+ }
+
+ el.innerHTML = html;
+ })();
+
+
+ // ── Pools ─────────────────────────────────────────────────────────────────
+ vvLastStorageDisks = d.storage ?? [];
+ document.getElementById('vv-storage-body').innerHTML = vvRenderPools(vvLastStorageDisks);
+
+ // ── Array disks — summary header + min 3 columns ─────────────────────────
const arrayDisks = d.array_disks ?? [];
if (arrayDisks.length) {
+ const dataDisks = arrayDisks.filter(d => d.role === 'data');
+ const okDisks = dataDisks.filter(d => d.status === 'DISK_OK').length;
+ const errDisks = dataDisks.length - okDisks;
+ const temps = arrayDisks.map(d => d.temp).filter(t => t != null);
+ const maxTemp = temps.length ? Math.max(...temps) : null;
+ const maxTempColor = maxTemp == null ? '#444' : maxTemp >= (vvThresholds.hdd_crit ?? 55) ? '#f44336' : maxTemp >= (vvThresholds.hdd_warn ?? 45) ? '#ff9800' : '#4caf50';
+ const totalUsedGb = dataDisks.reduce((s, d) => s + (d.used_gb ?? 0), 0);
+ const totalSizeGb = dataDisks.reduce((s, d) => s + (d.size_gb ?? 0), 0);
+ const arrPct = totalSizeGb > 0 ? Math.round(totalUsedGb / totalSizeGb * 100) : 0;
+ const arrPctColor = arrPct >= (vvThresholds.util_crit ?? 90) ? '#f44336' : arrPct >= (vvThresholds.util_warn ?? 70) ? '#ff9800' : '#4caf50';
+
+ const titleEl = document.getElementById('vv-array-title');
+ if (titleEl) titleEl.innerHTML = `Array
+
+ ${okDisks}/${dataDisks.length} ok
+ ${errDisks > 0 ? `· ${errDisks} err` : ''}
+ · ${arrPct}% used
+ ${maxTemp != null ? `· max ${maxTemp}°` : ''}
+ `;
+
const numCols = Math.max(3, Math.ceil(arrayDisks.length / 6));
const perCol = Math.ceil(arrayDisks.length / numCols);
const cols = [];
@@ -1013,6 +1263,126 @@ vvPollStreams();
setInterval(vvPollStreams, 12000);
setInterval(vvRenderStreams, 1000);
+// ── Pools card ────────────────────────────────────────────────────────────────
+
+function vvTogglePool(name) {
+ vvPoolsOpen[name] = !vvPoolsOpen[name];
+ document.getElementById('vv-storage-body').innerHTML = vvRenderPools(vvLastStorageDisks);
+}
+
+function vvTogglePoolGroup(groupName) {
+ vvPoolGroupOpen[groupName] = !vvPoolGroupOpen[groupName];
+ document.getElementById('vv-storage-body').innerHTML = vvRenderPools(vvLastStorageDisks);
+}
+
+function vvRenderPools(disks) {
+ if (!disks.length) return '
No pools found
';
+
+ // Group drives by pool name
+ const poolMap = {};
+ disks.forEach(d => {
+ const n = d.name;
+ if (!poolMap[n]) poolMap[n] = [];
+ poolMap[n].push(d);
+ });
+
+ // Build super-groups: pools whose names share a common prefix + trailing digits
+ const superGroupMap = {}; // groupName -> [poolName, ...]
+ Object.keys(poolMap).forEach(poolName => {
+ const match = poolName.match(/^(.+?)(\d+)$/);
+ const gName = match ? match[1] : poolName;
+ if (!superGroupMap[gName]) superGroupMap[gName] = [];
+ superGroupMap[gName].push(poolName);
+ });
+
+ // Render a single pool row (with optional drive-expand toggle)
+ function renderPoolRow(poolName, drives) {
+ const isOpen = !!vvPoolsOpen[poolName];
+ const multi = drives.length > 1;
+ const totalGb = drives.reduce((s, d) => s + (d.size_gb ?? 0), 0);
+ const usedGb = drives.reduce((s, d) => s + (d.used_gb ?? 0), 0);
+ const pct = totalGb > 0 ? Math.round(usedGb / totalGb * 100) : 0;
+ const pctColor = pct >= (vvThresholds.util_crit ?? 90) ? '#f44336' : pct >= (vvThresholds.util_warn ?? 70) ? '#ff9800' : '#4caf50';
+ const temps = drives.map(d => d.temp).filter(t => t != null);
+ const maxTemp = temps.length ? Math.max(...temps) : null;
+ const tempColor = maxTemp != null ? vvTempColor(maxTemp, drives[0].transport) : '#444';
+ const allOk = drives.every(d => d.status === 'DISK_OK' || !d.status);
+ const statusColor = allOk ? '#aaa' : '#f44336';
+ const sName = poolName.replace(/\\/g,'\\\\').replace(/'/g,"\\'");
+
+ let html = `
+
+
+ ${multi ? `${isOpen ? '▾' : '▸'}` : ''}
+ ${poolName}
+ ${multi ? `${drives.length} drives` : ''}
+
+
+ ${maxTemp != null ? `${maxTemp}°` : ''}
+ ${vvFmt(usedGb)} / ${vvFmt(totalGb)}
+
+
+
+
`;
+
+ if (multi && isOpen) {
+ html += `
`;
+ drives.forEach(d => { html += vvDiskRow({ ...d, name: d.device || d.name }); });
+ html += `
`;
+ }
+ return html;
+ }
+
+ let html = '';
+ Object.entries(superGroupMap).forEach(([groupName, poolNames]) => {
+ if (poolNames.length === 1) {
+ // Single pool — render directly, no super-group header
+ html += renderPoolRow(poolNames[0], poolMap[poolNames[0]]);
+ } else {
+ // Super-group: aggregate header + expandable list of individual pools
+ const isGroupOpen = !!vvPoolGroupOpen[groupName];
+ const sGroup = groupName.replace(/\\/g,'\\\\').replace(/'/g,"\\'");
+ const allDrives = poolNames.flatMap(n => poolMap[n]);
+ const totalGb = allDrives.reduce((s, d) => s + (d.size_gb ?? 0), 0);
+ const usedGb = allDrives.reduce((s, d) => s + (d.used_gb ?? 0), 0);
+ const pct = totalGb > 0 ? Math.round(usedGb / totalGb * 100) : 0;
+ const pctColor = pct >= (vvThresholds.util_crit ?? 90) ? '#f44336' : pct >= (vvThresholds.util_warn ?? 70) ? '#ff9800' : '#4caf50';
+ const temps = allDrives.map(d => d.temp).filter(t => t != null);
+ const maxTemp = temps.length ? Math.max(...temps) : null;
+ const tempColor = maxTemp != null ? vvTempColor(maxTemp, allDrives[0].transport) : '#444';
+
+ html += `
+
+
+ ${isGroupOpen ? '▾' : '▸'}
+ ${groupName}
+ ${poolNames.length} pools
+
+
+ ${maxTemp != null ? `${maxTemp}°` : ''}
+ ${vvFmt(usedGb)} / ${vvFmt(totalGb)}
+
+
+
+
`;
+
+ if (isGroupOpen) {
+ html += `
`;
+ poolNames.forEach(poolName => { html += renderPoolRow(poolName, poolMap[poolName]); });
+ html += `
`;
+ }
+ }
+ });
+
+ return html;
+}
+
// ── System clock tick (updates time every 30s without a full poll) ────────────
function vvTickClock() {
const el = document.getElementById('vv-system-body');
@@ -1061,6 +1431,13 @@ function vvRenderDockerFolders(data) {
const el = document.getElementById('vv-docker-folders-body');
if (!el || !data) return;
+ // Update container count badge in header
+ const allCtrs = [...(data.folders ?? []).flatMap(f => f.containers), ...(data.ungrouped ?? [])];
+ const totalCtrs = allCtrs.length;
+ const runCtrs = allCtrs.filter(c => c.running).length;
+ const countEl = document.getElementById('vv-docker-count');
+ if (countEl && totalCtrs > 0) countEl.textContent = `${runCtrs}/${totalCtrs}`;
+
const osIcon = os => ({ windows:'🪟', macos:'🍎', bsd:'🦬' })[os] ?? '🐧';
const stateColor = s => ({ running:'#4caf50', paused:'#ff9800' })[s] ?? '#444';
const stateLabel = s => ({ running:'Running', paused:'Paused', 'shut off':'Off', crashed:'Crashed' })[s] ?? s;
@@ -1167,17 +1544,18 @@ function vvRenderDockerFolders(data) {
return;
}
- // 2-column balanced split — single column on narrow screens
- if (window.innerWidth <= 640) {
- html += `
${allFolders.map(renderFolder).join('')}
`;
+ // Column count: 3 big / 2 intermediate / 1 small
+ const _w = window.innerWidth;
+ const _cols = _w > 1400 ? 3 : _w > 640 ? 2 : 1;
+
+ if (_cols === 1) {
+ html += `
${allFolders.map(renderFolder).join('')}
`;
} else {
- const half = Math.ceil(allFolders.length / 2);
- const left = allFolders.slice(0, half);
- const right = allFolders.slice(half);
- html += `
-
${left.map(renderFolder).join('')}
-
${right.map(renderFolder).join('')}
-
`;
+ const perCol = Math.ceil(allFolders.length / _cols);
+ const colDivs = Array.from({length: _cols}, (_, i) =>
+ `
${allFolders.slice(i * perCol, (i + 1) * perCol).map(renderFolder).join('')}
`
+ ).join('');
+ html += `
${colDivs}
`;
}
el.innerHTML = html;
diff --git a/Plugin/unraid/pages/scheduler.php b/Plugin/unraid/pages/scheduler.php
index 8bb807f..139b26c 100644
--- a/Plugin/unraid/pages/scheduler.php
+++ b/Plugin/unraid/pages/scheduler.php
@@ -2,6 +2,7 @@
require_once dirname(__DIR__) . '/include/scheduler.php';
$tree = vv_job_tree();
$customs = vv_custom_scripts();
+$tools = vv_tools_scripts();
$_library = vv_script_library();
$_folders = vv_folders_load();
@@ -195,6 +196,54 @@ $runningScripts = array_unique($runningScripts);
+
{
+ // Tools and custom scripts with their own cron
+ document.querySelectorAll('.vv-tools-card .vv-script, .vv-custom-card .vv-script').forEach(script => {
const enabled = script.querySelector('.vv-enabled')?.checked;
if (!enabled) return;
const cronEl = script.querySelector('input.vv-cron');
diff --git a/Plugin/unraid/pages/watchdog.php b/Plugin/unraid/pages/watchdog.php
index b5970bb..3f6d882 100644
--- a/Plugin/unraid/pages/watchdog.php
+++ b/Plugin/unraid/pages/watchdog.php
@@ -28,6 +28,17 @@
.vv-wd-ctr-name{ font-size:11px;color:#888; }
.vv-wd-ctr-lim { font-size:11px;color:#555; }
.vv-wd-pressure{ grid-column:1/-1;border-color:#3a2000;background:#1a1000; }
+
+/* One host per row — inner grid sizes all cards equally */
+.vv-wd-host-row {
+ grid-column: 1 / -1;
+ display: grid;
+ grid-template-columns: repeat(5, 1fr);
+ gap: 12px;
+}
+@media (max-width: 900px) {
+ .vv-wd-host-row { grid-template-columns: 1fr; }
+}