Storage-mode awareness pass + doc update for System_Essentials through Partnership
All state/data file paths in scripts and PHP now resolve via STATE_DIR / DATA_DIR / PERSISTENT_CONF_CACHE instead of hardcoded /boot/config/ or /tmp/ paths, so the ecosystem works in both internal and appdata storage modes. PHP layer (watchdog.php, partnership.php, fallback.php, monitor.php, snapshot.php, config.php): all state reads switched to STATE_DIR constant; remote state reads use the new vv_remote_state_cmd() helper which resolves the remote's SCRIPTS_DIR via their varaverk.cfg before building the path. conf_sync.sh: fixed SCRIPTS_ROOT → SCRIPTS_DIR bug on MY_CONF path; added _remote_scripts_dir() to resolve partner's SCRIPTS_DIR before SCP pull. fallback.php page: added controls card (PARTNERSHIP_ENABLED, FALLBACK_ENABLED, FALLBACK_RSYNC_ENABLED toggles), status grid, and settings card. README and Manual updated for System_Essentials, Watchdogs, Fallback, Rsync, Media, Monitors, Orchestrators, Partnership: added new scripts (conf_sync, conf_cache_save/restore, conf_cache_watchdog, play_state_sync, start_webhook_listener, upgrade_webhook_handler), corrected all stale /boot/config/ state file paths to $STATE_DIR/$DATA_DIR, noted webgui/php_fpm/mover/user_scripts scripts moved to Plugin/unraid/System_Essentials, fixed start_webhook_listener.sh header (Node.js, not PHP -S).
This commit is contained in:
Gmer4Lfe
@@ -1,4 +1,5 @@
|
||||
<style>
|
||||
/* ── Existing status styles ── */
|
||||
.vv-fb-active { background:#1a1200;border:1px solid #5a3800;border-radius:6px;padding:12px 14px; }
|
||||
.vv-fb-active-h { display:flex;align-items:baseline;gap:10px;margin-bottom:8px; }
|
||||
.vv-fb-badge { font-size:11px;font-weight:bold;letter-spacing:.06em;padding:2px 7px;border-radius:3px;flex-shrink:0; }
|
||||
@@ -6,6 +7,7 @@
|
||||
.vv-fb-badge.norm { background:#1a2a1a;color:#4caf50; }
|
||||
.vv-fb-badge.dark { background:#2a1a2a;color:#9c27b0; }
|
||||
.vv-fb-badge.nonet{ background:#1a1a2a;color:#5c7cfa; }
|
||||
.vv-fb-badge.susp { background:#2a1a00;color:#888; }
|
||||
.vv-fb-meta { display:flex;gap:18px;flex-wrap:wrap;margin-bottom:10px; }
|
||||
.vv-fb-meta-item{ display:flex;flex-direction:column;gap:1px; }
|
||||
.vv-fb-meta-val { font-size:17px;font-weight:bold;color:#ffb74d; }
|
||||
@@ -31,17 +33,109 @@
|
||||
.vv-fb-state-dot { width:6px;height:6px;border-radius:50%;flex-shrink:0;margin-top:3px; }
|
||||
.vv-fb-sep { border:none;border-top:1px solid #222;margin:8px 0; }
|
||||
.vv-fb-disabled { grid-column:1/-1;color:#3a3a3a;font-size:12px;padding:20px 0;text-align:center; }
|
||||
|
||||
/* ── Controls + settings card ── */
|
||||
.vv-fb-card { background:#161616;border:1px solid #2a2a2a;border-radius:6px;padding:14px 16px;margin-bottom:14px; }
|
||||
.vv-fb-card-hdr { font-size:11px;font-weight:700;color:#666;text-transform:uppercase;letter-spacing:.07em;margin-bottom:12px; }
|
||||
.vv-fb-ctrl-row { display:flex;justify-content:space-between;align-items:center;gap:12px;padding:5px 0; }
|
||||
.vv-fb-ctrl-lbl { font-size:12px;color:#888; }
|
||||
.vv-fb-ctrl-sub { font-size:10px;color:#3a3a3a;margin-top:2px; }
|
||||
.vv-fb-tog { width:32px;height:18px;border-radius:9px;background:#222;border:1px solid #333;
|
||||
position:relative;transition:background .15s,border-color .15s;flex-shrink:0;cursor:pointer; }
|
||||
.vv-fb-tog.on { background:#1a3a1a;border-color:#2d5a2d; }
|
||||
.vv-fb-tog::after { content:'';position:absolute;top:2px;left:2px;width:12px;height:12px;
|
||||
border-radius:50%;background:#555;transition:left .15s,background .15s; }
|
||||
.vv-fb-tog.on::after { left:16px;background:#4caf50; }
|
||||
.vv-fb-set-row { display:flex;justify-content:space-between;align-items:center;padding:5px 0; }
|
||||
.vv-fb-set-lbl { font-size:11px;color:#555; }
|
||||
.vv-fb-set-inp { background:#0d0d0d;border:1px solid #2a2a2a;border-radius:3px;color:#888;
|
||||
font-size:12px;padding:4px 8px;outline:none;width:72px;font-family:monospace;
|
||||
text-align:right;box-sizing:border-box; }
|
||||
.vv-fb-set-inp:focus { border-color:#444; }
|
||||
.vv-fb-set-unit { font-size:10px;color:#3a3a3a;min-width:56px; }
|
||||
.vv-fb-save-btn { background:#1a1a1a;border:1px solid #333;color:#888;font-size:11px;
|
||||
padding:5px 14px;border-radius:3px;cursor:pointer; }
|
||||
.vv-fb-save-btn:hover { border-color:#555;color:#ccc; }
|
||||
.vv-fb-save-btn:disabled { opacity:.4;cursor:default; }
|
||||
</style>
|
||||
|
||||
<!-- Controls card -->
|
||||
<div class="vv-fb-card">
|
||||
<div class="vv-fb-card-hdr">Controls</div>
|
||||
|
||||
<div class="vv-fb-ctrl-row">
|
||||
<div>
|
||||
<div class="vv-fb-ctrl-lbl">Partnership</div>
|
||||
<div class="vv-fb-ctrl-sub">Master gate — disabling stops all cross-server operations</div>
|
||||
</div>
|
||||
<div class="vv-fb-tog" id="vv-fb-pt-tog" onclick="vvFbToggle(this,'PARTNERSHIP_ENABLED')"></div>
|
||||
</div>
|
||||
|
||||
<hr class="vv-fb-sep">
|
||||
|
||||
<div class="vv-fb-ctrl-row">
|
||||
<div>
|
||||
<div class="vv-fb-ctrl-lbl">Fallback</div>
|
||||
<div class="vv-fb-ctrl-sub">Mutual container failover between nodes</div>
|
||||
</div>
|
||||
<div class="vv-fb-tog" id="vv-fb-en-tog" onclick="vvFbToggle(this,'FALLBACK_ENABLED')"></div>
|
||||
</div>
|
||||
|
||||
<hr class="vv-fb-sep">
|
||||
|
||||
<div class="vv-fb-ctrl-row">
|
||||
<div>
|
||||
<div class="vv-fb-ctrl-lbl">Rsync on handback</div>
|
||||
<div class="vv-fb-ctrl-sub">Writeback rsync when the covered host recovers and containers return</div>
|
||||
</div>
|
||||
<div class="vv-fb-tog" id="vv-fb-rsync-tog" onclick="vvFbToggle(this,'FALLBACK_RSYNC_ENABLED')"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Status section -->
|
||||
<div style="display:flex;justify-content:space-between;align-items:center;margin-bottom:12px;padding:0 2px;">
|
||||
<span style="font-size:13px;font-weight:bold;color:#888;text-transform:uppercase;letter-spacing:.06em;">FallBack</span>
|
||||
<span style="font-size:13px;font-weight:bold;color:#888;text-transform:uppercase;letter-spacing:.06em;">Status</span>
|
||||
<span style="font-size:11px;color:#3a3a3a;" id="vv-fb-ts"></span>
|
||||
</div>
|
||||
|
||||
<div id="vv-fb-grid" style="display:grid;grid-template-columns:repeat(8,1fr);gap:12px;">
|
||||
<div id="vv-fb-grid" style="display:grid;grid-template-columns:repeat(8,1fr);gap:12px;margin-bottom:14px;">
|
||||
<div style="grid-column:1/-1;color:#444;font-size:12px;padding:16px 0;text-align:center;">Loading…</div>
|
||||
</div>
|
||||
|
||||
<!-- Settings card -->
|
||||
<div class="vv-fb-card">
|
||||
<div class="vv-fb-card-hdr">Settings</div>
|
||||
|
||||
<div class="vv-fb-set-row">
|
||||
<span class="vv-fb-set-lbl">Check interval</span>
|
||||
<div style="display:flex;align-items:center;gap:8px;">
|
||||
<input class="vv-fb-set-inp" id="vv-fb-interval" type="number" min="5" max="300">
|
||||
<span class="vv-fb-set-unit">seconds</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="vv-fb-set-row">
|
||||
<span class="vv-fb-set-lbl">Handback strikes</span>
|
||||
<div style="display:flex;align-items:center;gap:8px;">
|
||||
<input class="vv-fb-set-inp" id="vv-fb-strikes" type="number" min="1" max="20">
|
||||
<span class="vv-fb-set-unit">consecutive</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="vv-fb-set-row">
|
||||
<span class="vv-fb-set-lbl">Partnership suspend after</span>
|
||||
<div style="display:flex;align-items:center;gap:8px;">
|
||||
<input class="vv-fb-set-inp" id="vv-fb-suspend" type="number" min="0" max="1440">
|
||||
<span class="vv-fb-set-unit">minutes</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div style="display:flex;justify-content:flex-end;align-items:center;gap:10px;margin-top:10px;padding-top:8px;border-top:1px solid #1e1e1e;">
|
||||
<span id="vv-fb-set-fb" style="font-size:11px;"></span>
|
||||
<button class="vv-fb-save-btn" id="vv-fb-save-btn" onclick="vvFbSaveSettings()">Save</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
(function() {
|
||||
|
||||
@@ -78,6 +172,7 @@ function _stateBadge(st) {
|
||||
OFFLINE: ['dark', 'OFFLINE'],
|
||||
UNREACHABLE: ['dark', 'UNREACHABLE'],
|
||||
UNKNOWN: ['dark', 'UNKNOWN'],
|
||||
SUSPENDED: ['susp', 'SUSPENDED'],
|
||||
};
|
||||
const [cls, label] = map[st] || ['dark', st];
|
||||
return `<span class="vv-fb-badge ${cls}">${label}</span>`;
|
||||
@@ -87,7 +182,7 @@ function _stateDot(st) {
|
||||
const col = {
|
||||
NORMAL:'#4caf50', FALLBACK:'#ffb74d',
|
||||
NO_INTERNET:'#5c7cfa', DARK:'#9c27b0',
|
||||
OFFLINE:'#555', UNREACHABLE:'#555', UNKNOWN:'#333',
|
||||
OFFLINE:'#555', UNREACHABLE:'#555', UNKNOWN:'#333', SUSPENDED:'#444',
|
||||
}[st] || '#333';
|
||||
return `<span class="vv-fb-state-dot" style="background:${col}"></span>`;
|
||||
}
|
||||
@@ -102,7 +197,6 @@ function _activeCard(nodes, handbackReq) {
|
||||
const cov = covering.covers;
|
||||
const covered = cov ? cov.hostname : '?';
|
||||
|
||||
// All containers that should be running at current tier
|
||||
let expected = [...(cov?.tier1 || [])];
|
||||
if (tier >= 2) expected = expected.concat(cov?.tier2 || []);
|
||||
if (tier >= 3) expected = expected.concat(cov?.tier3 || []);
|
||||
@@ -169,9 +263,19 @@ function _tierSection(tiers, activeTier, delays) {
|
||||
}).join('');
|
||||
}
|
||||
|
||||
function _nodeCard(node) {
|
||||
function _ptStatus(st) {
|
||||
if (!st) return '';
|
||||
if (st.partnership_suspended) return _stateBadge('SUSPENDED');
|
||||
if (st.partner_lost_at && st.partner_lost_at > 0) {
|
||||
const minGone = Math.floor((Date.now() / 1000 - st.partner_lost_at) / 60);
|
||||
return `<span class="vv-fb-badge susp">GRACE ${minGone}m</span>`;
|
||||
}
|
||||
return '';
|
||||
}
|
||||
|
||||
function _nodeCard(node, suspendAfter) {
|
||||
const st = node.state || {};
|
||||
const state = st.state || 'UNKNOWN';
|
||||
const state = st.partnership_suspended ? 'SUSPENDED' : (st.state || 'UNKNOWN');
|
||||
const cov = node.covers;
|
||||
const active = _activeTier(state === 'FALLBACK' ? st : null);
|
||||
|
||||
@@ -183,6 +287,8 @@ function _nodeCard(node) {
|
||||
? _tierSection(cov, active, cov.delays)
|
||||
: '<div style="color:#3a3a3a;font-size:11px;">No coverage configured</div>';
|
||||
|
||||
const ptBadge = node.is_me ? _ptStatus(st) : '';
|
||||
|
||||
return `<div class="vv-card vv-fb-node">
|
||||
<div class="vv-fb-node-h">
|
||||
${_stateDot(state)}
|
||||
@@ -190,6 +296,7 @@ function _nodeCard(node) {
|
||||
<span class="vv-fb-node-nm">${node.hostname}</span>
|
||||
${covTarget}
|
||||
<span style="flex:1"></span>
|
||||
${ptBadge}
|
||||
${_stateBadge(state)}
|
||||
</div>
|
||||
<hr class="vv-fb-sep">
|
||||
@@ -197,30 +304,47 @@ function _nodeCard(node) {
|
||||
</div>`;
|
||||
}
|
||||
|
||||
function _setToggles(data) {
|
||||
const pairs = [
|
||||
['vv-fb-pt-tog', !!data.partnership_enabled],
|
||||
['vv-fb-en-tog', !!data.fb_enabled],
|
||||
['vv-fb-rsync-tog', !!data.fb_rsync_enabled],
|
||||
];
|
||||
pairs.forEach(([id, on]) => {
|
||||
const el = document.getElementById(id);
|
||||
if (el) el.classList.toggle('on', on);
|
||||
});
|
||||
}
|
||||
|
||||
function _setInputs(data) {
|
||||
const fields = [
|
||||
['vv-fb-interval', data.check_interval ?? 30],
|
||||
['vv-fb-strikes', data.handback_req ?? 3],
|
||||
['vv-fb-suspend', data.suspend_after ?? 120],
|
||||
];
|
||||
fields.forEach(([id, val]) => {
|
||||
const el = document.getElementById(id);
|
||||
if (el && el !== document.activeElement) el.value = val;
|
||||
});
|
||||
}
|
||||
|
||||
function _render(data) {
|
||||
if (!data.fb_enabled) {
|
||||
document.getElementById('vv-fb-grid').innerHTML =
|
||||
'<div class="vv-fb-disabled">FALLBACK_ENABLED=false — fallback monitoring is disabled</div>';
|
||||
return;
|
||||
_setToggles(data);
|
||||
_setInputs(data);
|
||||
|
||||
const grid = document.getElementById('vv-fb-grid');
|
||||
|
||||
if (!data.partnership_enabled) {
|
||||
grid.innerHTML = '<div class="vv-fb-disabled">PARTNERSHIP_ENABLED=false — all cross-server operations disabled</div>';
|
||||
} else if (!data.fb_enabled) {
|
||||
grid.innerHTML = '<div class="vv-fb-disabled">FALLBACK_ENABLED=false — fallback monitoring is disabled</div>';
|
||||
} else {
|
||||
const nodes = data.nodes || [];
|
||||
let html = _activeCard(nodes, data.handback_req || 3);
|
||||
for (const node of nodes) html += _nodeCard(node, data.suspend_after || 120);
|
||||
grid.innerHTML = html || '<div class="vv-fb-disabled">No nodes configured.</div>';
|
||||
}
|
||||
|
||||
const nodes = data.nodes || [];
|
||||
let html = '';
|
||||
|
||||
// Top: active fallback card (if any)
|
||||
html += _activeCard(nodes, data.handback_req || 3);
|
||||
|
||||
// Per-node cards
|
||||
for (const node of nodes) {
|
||||
html += _nodeCard(node);
|
||||
}
|
||||
|
||||
if (!html) {
|
||||
html = '<div class="vv-fb-disabled">No nodes configured.</div>';
|
||||
}
|
||||
|
||||
document.getElementById('vv-fb-grid').innerHTML = html;
|
||||
|
||||
const ts = data.ts
|
||||
? new Date(data.ts * 1000).toLocaleString([], {
|
||||
month:'numeric', day:'numeric', year:'numeric',
|
||||
@@ -239,6 +363,55 @@ function vvFbLoad() {
|
||||
});
|
||||
}
|
||||
|
||||
window.vvFbToggle = function(track, key) {
|
||||
const on = !track.classList.contains('on');
|
||||
track.classList.toggle('on', on);
|
||||
const fd = new FormData();
|
||||
fd.append('id', 'fallback');
|
||||
fd.append('changes', JSON.stringify([{ file: 'master.conf', key, value: on ? 'true' : 'false', type: 'scalar' }]));
|
||||
fetch('/plugins/varaverk/api/confform.php', { method: 'POST', body: fd })
|
||||
.then(r => r.json())
|
||||
.then(d => { if (!d.ok) track.classList.toggle('on', !on); })
|
||||
.catch(() => track.classList.toggle('on', !on));
|
||||
};
|
||||
|
||||
window.vvFbSaveSettings = function() {
|
||||
const ivEl = document.getElementById('vv-fb-interval');
|
||||
const stEl = document.getElementById('vv-fb-strikes');
|
||||
const suEl = document.getElementById('vv-fb-suspend');
|
||||
const fb = document.getElementById('vv-fb-set-fb');
|
||||
const btn = document.getElementById('vv-fb-save-btn');
|
||||
|
||||
const interval = parseInt(ivEl.value, 10);
|
||||
const strikes = parseInt(stEl.value, 10);
|
||||
const suspend = parseInt(suEl.value, 10);
|
||||
|
||||
if ([interval, strikes, suspend].some(n => isNaN(n) || n < 0)) {
|
||||
fb.style.color = '#ef5350'; fb.textContent = 'Invalid values'; return;
|
||||
}
|
||||
|
||||
btn.disabled = true; btn.textContent = 'Saving…'; fb.textContent = '';
|
||||
const fd = new FormData();
|
||||
fd.append('id', 'fallback');
|
||||
fd.append('changes', JSON.stringify([
|
||||
{ file: 'master.conf', key: 'FALLBACK_CHECK_INTERVAL', value: String(interval), type: 'scalar' },
|
||||
{ file: 'master.conf', key: 'FALLBACK_HANDBACK_STRIKES', value: String(strikes), type: 'scalar' },
|
||||
{ file: 'master.conf', key: 'FALLBACK_PARTNERSHIP_SUSPEND_AFTER', value: String(suspend), type: 'scalar' },
|
||||
]));
|
||||
fetch('/plugins/varaverk/api/confform.php', { method: 'POST', body: fd })
|
||||
.then(r => r.json())
|
||||
.then(d => {
|
||||
btn.disabled = false; btn.textContent = 'Save';
|
||||
fb.style.color = d.ok ? '#4caf50' : '#ef5350';
|
||||
fb.textContent = d.ok ? 'Saved ✓' : (d.error || 'Failed');
|
||||
if (d.ok) setTimeout(() => { fb.textContent = ''; }, 3000);
|
||||
})
|
||||
.catch(() => {
|
||||
btn.disabled = false; btn.textContent = 'Save';
|
||||
fb.style.color = '#ef5350'; fb.textContent = 'Request failed';
|
||||
});
|
||||
};
|
||||
|
||||
vvFbLoad();
|
||||
setInterval(vvFbLoad, 30000);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user