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
refactor(unify): §4 — one Observability namespace + tab group
Juan Denisb00fff775993
diff --git a/backend/app/__init__.py b/backend/app/__init__.pyindex 2189c632..9634ee9b 100644--- a/backend/app/__init__.py+++ b/backend/app/__init__.py@@ -419,6 +419,19 @@ def create_app(config_name=None):from app.api.telemetry import telemetry_bpapp.register_blueprint(telemetry_bp, url_prefix='/api/v1/telemetry')+ # §4 unification: one observability namespace. The monitoring / metrics /+ # telemetry / uptime / fleet / status-page read surfaces are re-mounted under+ # /api/v1/observability/<domain> as true aliases (same blueprints, distinct+ # names) so callers have a single front door. The original prefixes remain,+ # and the PUBLIC status page route (/api/v1/status/public/<slug>) is+ # unchanged — its canonical mount is untouched.+ app.register_blueprint(monitoring_bp, url_prefix='/api/v1/observability/monitoring', name='obs_monitoring')+ app.register_blueprint(metrics_bp, url_prefix='/api/v1/observability/metrics', name='obs_metrics')+ app.register_blueprint(telemetry_bp, url_prefix='/api/v1/observability/events', name='obs_events')+ app.register_blueprint(uptime_bp, url_prefix='/api/v1/observability/uptime', name='obs_uptime')+ app.register_blueprint(fleet_monitor_bp, url_prefix='/api/v1/observability/fleet', name='obs_fleet')+ app.register_blueprint(status_pages_bp, url_prefix='/api/v1/observability/status-pages', name='obs_status_pages')+# Register blueprints - Agent Pairing (RustDesk-style short-code flow)from app.api.pairing import pairing_bpapp.register_blueprint(pairing_bp, url_prefix='/api/v1/pairing')diff --git a/backend/tests/test_observability_namespace.py b/backend/tests/test_observability_namespace.pynew file mode 100644index 00000000..87012392--- /dev/null+++ b/backend/tests/test_observability_namespace.py@@ -0,0 +1,37 @@+"""§4 unification — one /api/v1/observability namespace.++The monitoring / metrics / telemetry(events) / uptime / fleet / status-page read+surfaces are re-mounted under /api/v1/observability/<domain> as true aliases.+The original prefixes and the public status page route stay intact.+"""+++def test_observability_aliases_registered():+ from app import create_app+ application = create_app('testing')+ rules = {r.rule for r in application.url_map.iter_rules()}+ assert any(r.startswith('/api/v1/observability/monitoring') for r in rules)+ assert any(r.startswith('/api/v1/observability/metrics') for r in rules)+ assert any(r.startswith('/api/v1/observability/events') for r in rules)+ assert any(r.startswith('/api/v1/observability/uptime') for r in rules)+ assert any(r.startswith('/api/v1/observability/fleet') for r in rules)+ assert any(r.startswith('/api/v1/observability/status-pages') for r in rules)+++def test_original_prefixes_still_present():+ from app import create_app+ application = create_app('testing')+ rules = {r.rule for r in application.url_map.iter_rules()}+ assert any(r.startswith('/api/v1/monitoring') for r in rules)+ assert any(r.startswith('/api/v1/telemetry') for r in rules)+ assert any(r.startswith('/api/v1/fleet-monitor') for r in rules)+ # Public status page route untouched.+ assert '/api/v1/status/public/<slug>' in rules+++def test_events_alias_matches_telemetry(app, client, auth_headers):+ canonical = client.get('/api/v1/telemetry/events', headers=auth_headers)+ alias = client.get('/api/v1/observability/events/events', headers=auth_headers)+ assert canonical.status_code == 200+ assert alias.status_code == 200+ assert alias.get_json() == canonical.get_json()diff --git a/frontend/src/App.jsx b/frontend/src/App.jsxindex 8d8e9c16..6aad9227 100644--- a/frontend/src/App.jsx+++ b/frontend/src/App.jsx@@ -108,6 +108,7 @@ const PAGE_TITLES = {'/downloads': 'Downloads','/files': 'File Manager','/ftp': 'FTP Server',+ '/observability': 'Observability','/monitoring': 'Monitoring','/backups': 'Backups','/cron': 'Cron Jobs',@@ -413,11 +414,15 @@ function AppRoutes() {<Route path="ftp" element={<FTPServer />} /><Route path="ftp/:tab" element={<FTPServer />} /></Route>+ {/* Observability tab group (§4): Monitoring / Events / Status+ Pages share one PageTopbar. /observability lands on Monitoring. */}<Route element={<TabGroupLayout tabs={MONITOR_TABS} />}><Route path="monitoring" element={<Monitoring />} /><Route path="monitoring/:tab" element={<Monitoring />} />+ <Route path="telemetry" element={<Telemetry />} /><Route path="status-pages" element={<StatusPages />} /></Route>+ <Route path="observability" element={<Navigate to="/monitoring" replace />} /><Route path="gpu" element={<GpuMonitor />} /><Route element={<TabGroupLayout tabs={BACKUP_TABS} />}><Route path="backups" element={<Backups />} />@@ -444,7 +449,6 @@ function AppRoutes() {<Route path="queue/:groupSlug/:queueSlug" element={<QueueDetail />} /><Route path="notifications" element={<Notifications />} /><Route path="admin/notifications" element={<DeliveryLog />} />- <Route path="telemetry" element={<Telemetry />} /><Route path="jobs" element={<Jobs />} /><Route path="settings" element={<Settings />} /><Route path="settings/:tab" element={<Settings />} />diff --git a/frontend/src/components/CommandPalette.jsx b/frontend/src/components/CommandPalette.jsxindex 892ba96c..56c4bf2e 100644--- a/frontend/src/components/CommandPalette.jsx+++ b/frontend/src/components/CommandPalette.jsx@@ -24,7 +24,7 @@ const STATIC_PAGES = [{ label: 'WordPress Pipelines', path: '/wordpress/pipelines', category: 'Pages', keywords: 'wp environments projects pipeline' },{ label: 'Files', path: '/files', category: 'Pages', keywords: 'file manager explorer' },{ label: 'FTP Server', path: '/ftp', category: 'Pages', keywords: 'sftp upload' },- { label: 'Monitoring', path: '/monitoring', category: 'Pages', keywords: 'metrics uptime' },+ { label: 'Observability', path: '/monitoring', category: 'Pages', keywords: 'metrics uptime monitoring alerts' },{ label: 'Backups', path: '/backups', category: 'Pages', keywords: 'snapshots restore' },{ label: 'Cron Jobs', path: '/cron', category: 'Pages', keywords: 'schedule tasks' },{ label: 'Security', path: '/security', category: 'Pages', keywords: 'firewall fail2ban' },@@ -42,7 +42,7 @@ const STATIC_PAGES = [{ label: 'GPU Monitor', path: '/gpu', category: 'Pages', keywords: 'nvidia cuda metrics' },{ label: 'Queue', path: '/queue', category: 'Pages', keywords: 'bus operations tasks' },{ label: 'Jobs', path: '/jobs', category: 'Pages', keywords: 'scheduler background work' },- { label: 'Telemetry', path: '/telemetry', category: 'Pages', keywords: 'metrics observability' },+ { label: 'Events', path: '/telemetry', category: 'Pages', keywords: 'telemetry metrics observability system events' },{ label: 'Vaults', path: '/vaults', category: 'Pages', keywords: 'secrets tokens credentials vault' },{ label: 'Webhooks', path: '/webhooks', category: 'Pages', keywords: 'webhook receive forward delivery' },{ label: 'Settings', path: '/settings', category: 'Settings', keywords: 'profile preferences' },diff --git a/frontend/src/components/monitoring/monitorTabs.jsx b/frontend/src/components/monitoring/monitorTabs.jsxindex 82f5a5ca..349f376b 100644--- a/frontend/src/components/monitoring/monitorTabs.jsx+++ b/frontend/src/components/monitoring/monitorTabs.jsx@@ -1,9 +1,12 @@-import { Activity, Globe } from 'lucide-react';+import { Activity, Globe, ScrollText } from 'lucide-react';-// Shared sub-nav for the Monitoring page group (Monitoring / Status Pages).-// Rendered in each page's <PageTopbar tabs={MONITOR_TABS}> — the demo's top-bar-// layout replaces the old sidebar sub-menu (see docs/REDESIGN_MAP.md §6 dec. 3).+// Shared sub-nav for the Observability page group — Monitoring (live metrics ++// alerts), Events (the unified SystemEvent stream, formerly "Telemetry"), and+// public Status Pages (§4 unification). Rendered in each page's+// <PageTopbar tabs={MONITOR_TABS}>. Fleet Monitor stays under the Servers group+// (it is server-scoped); GPU is its own hardware page.export const MONITOR_TABS = [{ to: '/monitoring', label: 'Monitoring', end: true, icon: <Activity size={15} /> },+ { to: '/telemetry', label: 'Events', icon: <ScrollText size={15} /> },{ to: '/status-pages', label: 'Status Pages', icon: <Globe size={15} /> },];diff --git a/frontend/src/components/sidebarItems.js b/frontend/src/components/sidebarItems.jsindex 47268d4c..6c2a0280 100644--- a/frontend/src/components/sidebarItems.js+++ b/frontend/src/components/sidebarItems.js@@ -137,10 +137,11 @@ export const SIDEBAR_ITEMS = [},{// Redesign: Monitoring uses the top-bar layout (REDESIGN_MAP §6 dec. 3).- // Status Pages now lives in the page's top bar (PageTopbar MONITOR_TABS),- // not as a sidebar sub-item. Route /status-pages is unchanged.+ // Observability group (§4): Monitoring / Events / Status Pages share the+ // top bar (PageTopbar MONITOR_TABS). The sidebar entry lights for any of+ // them via matchPrefixes. Events absorbed the old standalone Telemetry.id: 'monitoring',- label: 'Monitoring',+ label: 'Observability',route: '/monitoring',matchPrefixes: groupPrefixes(MONITOR_TABS),category: 'operations',@@ -188,13 +189,6 @@ export const SIDEBAR_ITEMS = [category: 'system',icon: '<path d="M4 17l6-6-6-6M12 19h8"/>'},- {- id: 'telemetry',- label: 'Telemetry',- route: '/telemetry',- category: 'system',- icon: '<path d="M22 12h-4l-3 9L9 3l-3 9H2"/>'- },{id: 'jobs',label: 'Jobs',@@ -240,7 +234,7 @@ export const SIDEBAR_ITEMS = [// inbound-Webhooks console. They're hidden by the default ("Recommended") view// and every curated preset, but stay one click away via the "Full" view or// Customize Sidebar — and remain fully routable (deep links, command palette).-export const ADVANCED_ITEM_IDS = ['marketplace', 'queue', 'webhooks', 'telemetry'];+export const ADVANCED_ITEM_IDS = ['marketplace', 'queue', 'webhooks'];// Preset profiles define which items are hidden (top-level only)export const SIDEBAR_PRESETS = {