ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.
Python astracloudflarecontrol-panelcyberpaneldnsfablehosting-control-panelhosting-panelkimi-k3server-managementserverkitubuntu-web-panelwebserver
Stop status pages claiming 100% with no data
Juan Denisb9456d1a9a79
diff --git a/backend/app/models/status_page.py b/backend/app/models/status_page.pyindex 113ab2b1..fd11fee0 100644--- a/backend/app/models/status_page.py+++ b/backend/app/models/status_page.py@@ -110,11 +110,12 @@ class StatusComponent(db.Model):last_check_at = db.Column(db.DateTime)last_response_time = db.Column(db.Integer) # ms- # Uptime data- uptime_24h = db.Column(db.Float, default=100.0)- uptime_7d = db.Column(db.Float, default=100.0)- uptime_30d = db.Column(db.Float, default=100.0)- uptime_90d = db.Column(db.Float, default=100.0)+ # Uptime per window, filled from recorded checks. None until a window+ # has a sample: a new monitor has no record, not a perfect one.+ uptime_24h = db.Column(db.Float)+ uptime_7d = db.Column(db.Float)+ uptime_30d = db.Column(db.Float)+ uptime_90d = db.Column(db.Float)created_at = db.Column(db.DateTime, default=datetime.utcnow)diff --git a/backend/tests/test_monitor_service.py b/backend/tests/test_monitor_service.pyindex 82558851..dc457a68 100644--- a/backend/tests/test_monitor_service.py+++ b/backend/tests/test_monitor_service.py@@ -341,6 +341,15 @@ def test_recompute_uptime_counts_only_up_samples(app):assert monitor.uptime_24h == 75.0+def test_a_monitor_without_checks_reports_no_uptime_not_100(app):+ """The columns defaulted to 100.0, so a brand-new monitor (and the+ public status page built from it) claimed a perfect month."""+ monitor = _monitor()+ MonitorService.recompute_uptime(monitor)+ assert (monitor.uptime_24h, monitor.uptime_7d,+ monitor.uptime_30d, monitor.uptime_90d) == (None, None, None, None)++def test_uptime_days_marks_unwatched_days_as_none(app):monitor = _monitor()db.session.add(HealthCheck(component_id=monitor.id, status='up',diff --git a/frontend/src/pages/PublicStatusPage.jsx b/frontend/src/pages/PublicStatusPage.jsxindex 50d10168..22083c24 100644--- a/frontend/src/pages/PublicStatusPage.jsx+++ b/frontend/src/pages/PublicStatusPage.jsx@@ -5,6 +5,7 @@ import EmptyState from '../components/EmptyState';import { Badge } from '@/components/ui/badge';import { Activity, AlertTriangle, CheckCircle2, Clock, XCircle } from 'lucide-react';import { useTranslation } from 'react-i18next';+import { averageUptime, formatUptimePercent } from '@/utils/uptime';const STATUS_META = {operational: { labelKey: 'app.publicStatusPage.operational', label: 'Operational', badge: 'success', icon: CheckCircle2 },@@ -26,11 +27,6 @@ function formatDate(value) {return new Date(value).toLocaleString();}-function formatUptime(value) {- if (typeof value !== 'number') return '100.00%';- return `${value.toFixed(2)}%`;-}-function PublicStatusPage() {const { t } = useTranslation();const { slug } = useParams();@@ -108,11 +104,7 @@ function PublicStatusPage() {</div><div><span>{t('app.publicStatusPage.30DayUptime', '30 day uptime')}</span>- <strong>{formatUptime(- components.length- ? components.reduce((total, component) => total + (component.uptime_30d || 100), 0) / components.length- : 100- )}</strong>+ <strong>{formatUptimePercent(averageUptime(components))}</strong></div></section>@@ -155,7 +147,7 @@ function PublicStatusPage() {<span>{component.name}</span></div><div className="public-component-row__meta">- <span>{formatUptime(component.uptime_30d)}</span>+ <span>{formatUptimePercent(component.uptime_30d)}</span>{component.last_response_time && <span>{component.last_response_time}ms</span>}<Badge variant={statusMeta.badge}>{statusMeta.label}</Badge></div>diff --git a/frontend/src/pages/StatusPages.jsx b/frontend/src/pages/StatusPages.jsxindex 50d7646e..f914068f 100644--- a/frontend/src/pages/StatusPages.jsx+++ b/frontend/src/pages/StatusPages.jsx@@ -30,6 +30,7 @@ import {Unlink,} from 'lucide-react';import { toastError } from '@/utils/errorMessage';+import { averageUptime, formatUptimePercent } from '@/utils/uptime';// pill → ds Pill kind · tone → .status-dot modifier · dot → .comp-dots squareconst STATUS_META = {@@ -87,11 +88,6 @@ function formatDate(value) {return new Date(value).toLocaleString();}-function formatUptime(value) {- if (typeof value !== 'number') return '100.00%';- return `${value.toFixed(2)}%`;-}-function getPublicStatusUrl(page) {if (!page) return '';return `${window.location.origin}/status/${page.slug}`;@@ -421,11 +417,7 @@ const StatusPages = () => {</div><div className="sk-spec-card"><div className="sk-spec-card__label">{t('app.statusPages.30DayUptime', '30 day uptime')}</div>- <div className="sk-spec-card__value">{formatUptime(- components.length- ? components.reduce((total, component) => total + (component.uptime_30d || 100), 0) / components.length- : 100- )}</div>+ <div className="sk-spec-card__value">{formatUptimePercent(averageUptime(components))}</div></div></div>@@ -477,7 +469,7 @@ const StatusPages = () => {</div><div className="component-row__stats"><Pill kind={meta.pill}>{meta.label}</Pill>- <span>{formatUptime(component.uptime_30d)} uptime</span>+ <span>{formatUptimePercent(component.uptime_30d)} uptime</span><span>{component.last_response_time ? `${component.last_response_time}ms` : t('app.statusPages.noResponse', 'No response')}</span><span>{formatDate(component.last_check_at)}</span></div>diff --git a/frontend/src/utils/__tests__/uptime.test.mjs b/frontend/src/utils/__tests__/uptime.test.mjsnew file mode 100644index 00000000..51ad8869--- /dev/null+++ b/frontend/src/utils/__tests__/uptime.test.mjs@@ -0,0 +1,20 @@+import assert from 'node:assert/strict';+import test from 'node:test';+import { averageUptime, formatUptimePercent } from '../uptime.js';++test('no data is shown as no data, not a perfect record', () => {+ assert.equal(formatUptimePercent(undefined), '—');+ assert.equal(formatUptimePercent(null), '—');+ assert.equal(averageUptime([]), null);+ assert.equal(averageUptime([{}, { uptime_30d: null }]), null);+});++test('a fully down component counts as 0%, not 100%', () => {+ assert.equal(formatUptimePercent(0), '0.00%');+ assert.equal(averageUptime([{ uptime_30d: 0 }, { uptime_30d: 100 }]), 50);+});++test('components without a figure do not pull the average', () => {+ assert.equal(averageUptime([{ uptime_30d: 99.5 }, {}]), 99.5);+ assert.equal(formatUptimePercent(averageUptime([{ uptime_30d: 99.5 }, {}])), '99.50%');+});diff --git a/frontend/src/utils/uptime.js b/frontend/src/utils/uptime.jsnew file mode 100644index 00000000..1c9a4963--- /dev/null+++ b/frontend/src/utils/uptime.js@@ -0,0 +1,16 @@+// Uptime percentages for the status pages. A missing value means "no data+// yet", never a perfect record, and a real 0 is a fully down component.++export function formatUptimePercent(value) {+ if (typeof value !== 'number' || Number.isNaN(value)) return '—';+ return `${value.toFixed(2)}%`;+}++// Mean over the components that have a figure; null when none do.+export function averageUptime(components, key = 'uptime_30d') {+ const values = (components || [])+ .map((component) => component?.[key])+ .filter((value) => typeof value === 'number' && !Number.isNaN(value));+ if (!values.length) return null;+ return values.reduce((total, value) => total + value, 0) / values.length;+}