' + s[1] + '' + (samples.length ? percent.toFixed(1) + '% up' : 'no samples') + '
' +
+ return '
' + s[1] + '' + (counted.length ? percent.toFixed(1) + '% up' : 'no samples') + '
' +
'
' + bars + '
';
});
document.getElementById('uptime').innerHTML = rows.join('') + '
Red means the server was not connected when the sample was taken.
';
@@ -109,7 +119,8 @@
var c = d.current;
document.getElementById('healthNow').innerHTML = [
['Players online', nf.format(c.players)], ['Worlds running', nf.format(c.worlds)],
- ['Auth / chat', (c.auth ? 'up' : 'DOWN') + ' / ' + (c.chat ? 'up' : 'DOWN')], ['Memory', c.memory_kb ? size(c.memory_kb) : 'n/a']
+ [c.ugc_enabled ? 'Auth / chat / UGC' : 'Auth / chat', [c.auth, c.chat].concat(c.ugc_enabled ? [c.ugc] : []).map(function (up) { return up ? 'up' : 'DOWN'; }).join(' / ')],
+ ['Memory', c.memory_kb ? size(c.memory_kb) : 'n/a']
].map(function (s) {
return '
' + s[0] + '
' + esc(s[1]) + '
';
}).join('');
@@ -120,6 +131,38 @@
});
}
+ // Every server with its process and what its last traffic report said (UGC: workers, storage and the database queue)
+ function loadServers() {
+ api.get('/api/servers').then(function (d) {
+ var box = document.getElementById('servers');
+ if (!d.success) { box.innerHTML = '
' + esc(d.error) + '
'; return; }
+ var now = Date.now() / 1000;
+ var details = function (s) {
+ var g = (s.traffic && s.traffic.gauges) || {}, parts = [];
+ if (s.players !== undefined) parts.push(nf.format(s.players) + ' player' + (s.players === 1 ? '' : 's'));
+ if (s.traffic && s.traffic.connections) parts.push(nf.format(s.traffic.connections) + ' connection' + (s.traffic.connections === 1 ? '' : 's') + (s.traffic.ping_ms ? ', ' + s.traffic.ping_ms + ' ms' : ''));
+ if (g.workers_threads !== undefined) parts.push('workers ' + g.workers_busy + '/' + g.workers_threads + (g.workers_queued ? ', ' + g.workers_queued + ' queued' : ''));
+ if (s.key === 'ugc') {
+ var c = d.ugc.counts || { model: {}, modular: {} };
+ var sum = function (state) { return (c.model[state] || 0) + (c.modular[state] || 0); };
+ parts.push(nf.format(sum('pending')) + ' waiting, ' + nf.format(sum('done')) + ' made, ' + nf.format(sum('failed')) + ' failed');
+ if (g.ugc_stored_bytes !== undefined) parts.push(fmt.bytes(g.ugc_stored_bytes) + (g.ugc_max_storage_bytes ? ' of ' + fmt.bytes(g.ugc_max_storage_bytes) : '') + ' stored');
+ }
+ return esc(parts.join(' ยท '));
+ };
+ box.innerHTML = '
| Server | Status | Up for | PID | Memory | CPU | Details |
|---|
' +
+ d.servers.map(function (s) {
+ var p = s.process;
+ var started = (p && p.started_at) || s.since;
+ var label = s.key === 'ugc' && DASH.can('properties_view') ? fmt.link('/ugc', s.label) : esc(s.label);
+ return '| ' + label + ' | ' + (s.kind === 'OTHER' ? fmt.badge('Not listed', 'secondary') : fmt.badge(s.online ? 'Online' : 'Offline', s.online ? 'success' : 'danger')) + ' | ' +
+ '' + ((s.online || s.kind === 'OTHER') && started ? esc(fmt.duration(now - started)) : '-') + ' | ' +
+ '' + (p ? esc(p.pid) : '-') + ' | ' + (p ? esc(size(p.memory_kb)) : '-') + ' | ' +
+ '' + (p ? esc(p.cpu_percent.toFixed(1) + '%') : '-') + ' | ' + details(s) + ' |
';
+ }).join('') + '
';
+ }).catch(function () {});
+ }
+
function loadDumps() {
var box = document.getElementById('dumps');
if (!box) return;
@@ -153,7 +196,9 @@
});
window.addEventListener('resize', Live.throttle(load, 500));
setInterval(load, 60000);
+ setInterval(loadServers, 10000);
load();
+ loadServers();
loadDumps();
})();
diff --git a/dDashboardServer/templates/index.jinja2 b/dDashboardServer/templates/index.jinja2
index 6093b3f59..6f5d3ef2d 100644
--- a/dDashboardServer/templates/index.jinja2
+++ b/dDashboardServer/templates/index.jinja2
@@ -33,6 +33,17 @@
{% include "server_status.jinja2" %}
{% include "statistics.jinja2" %}
+ {% if can.health_view %}
+
+ {% endif %}
{% include "world_instances.jinja2" %}
@@ -160,9 +171,43 @@ $(function () {
if (el && value !== undefined) el.textContent = value;
}
+ // The UGC server's card (staff with health_view): its state, the database queue and what its last report said
+ var ugcLoadedAt = 0;
+ function loadUgc(force) {
+ var card = document.getElementById('ugcCard');
+ if (!card || (!force && Date.now() - ugcLoadedAt < 15000)) return;
+ ugcLoadedAt = Date.now();
+ api.get('/api/servers/ugc').then(function (d) {
+ if (!d.success) return;
+ card.classList.toggle('d-none', !d.enabled && !d.online);
+ var g = d.gauges || {}, c = d.counts || { model: {}, modular: {} };
+ var sum = function (state) { return (c.model[state] || 0) + (c.modular[state] || 0); };
+ var line = function (label, value, id) {
+ return '
' + label + '' + value + '
';
+ };
+ var status = fmt.badge(d.online ? 'Online' : 'Offline', d.online ? 'success' : 'danger') +
+ (d.online && d.since ? '
up ' + esc(fmt.duration(Date.now() / 1000 - d.since)) + '' : '');
+ var storage = g.ugc_stored_bytes !== undefined ? esc(fmt.bytes(g.ugc_stored_bytes)) + (g.ugc_max_storage_bytes ? '
of ' + esc(fmt.bytes(g.ugc_max_storage_bytes)) + '' : '') : '
-';
+ var workers = g.workers_threads !== undefined ? esc(g.workers_busy + ' / ' + g.workers_threads) + (g.workers_queued ? '
(' + esc(g.workers_queued) + ' queued)' : '') : '
-';
+ document.getElementById('ugcCardBody').innerHTML =
+ line('Status', status) +
+ line('Waiting', fmt.badge(sum('pending'), sum('pending') ? 'warning' : 'secondary')) +
+ line('Made', fmt.badge(sum('done'), 'primary')) +
+ line('Failed', fmt.badge(sum('failed'), sum('failed') ? 'danger' : 'secondary')) +
+ line('Workers busy', workers) +
+ line('Storage used', storage).replace('mb-2"', 'mb-0"');
+ }).catch(function () {});
+ }
+
function update(data) {
if (data.auth) setStatus('auth-status', data.auth.online);
if (data.chat) setStatus('chat-status', data.chat.online);
+ if (data.ugc) {
+ setStatus('ugc-status', data.ugc.online);
+ var ugcRow = document.getElementById('ugc-status-row');
+ if (ugcRow) ugcRow.classList.toggle('d-none', !data.ugc.enabled);
+ loadUgc();
+ }
if (data.worlds) {
setText('world-count', data.stats && data.stats.worlds !== undefined ? data.stats.worlds : data.worlds.length);
if (detailedWorlds) loadDetailedWorlds();
@@ -181,6 +226,7 @@ $(function () {
});
api.get('/api/status').then(update).catch(function () {});
+ loadUgc(true);
Live.onStatus(update);
});
diff --git a/dDashboardServer/templates/server_status.jinja2 b/dDashboardServer/templates/server_status.jinja2
index 805db5a08..27e488c05 100644
--- a/dDashboardServer/templates/server_status.jinja2
+++ b/dDashboardServer/templates/server_status.jinja2
@@ -18,6 +18,15 @@
Offline
{% endif %}