Jan Vetesnik
b1e0ad0585
UI
- F1 Dashboard now holds CPU/MEM/storage/network/services/disks in a
single dense view (was split across F1/F3/F4). F2 Logs stays separate.
- CPU and MEM rendered inline (label + bar + summary on one row) so the
dashboard fits more on screen.
- DataTables and Services list capped for compactness; services sorted
with interesting+running first.
Refresh
- Three tiers: fast (1s) for system+network, medium (5s) for storage+
services, slow (30s) for disks (smartctl is heavy). Each tier runs
in an exclusive worker group so overlaps are dropped, not queued.
Log filter
- Bindings (a / 1-4) moved from LogsTab container to the App, so they
fire regardless of focus. Pressing one auto-switches to the logs tab.
Synology DSM 7.3+ compatibility (verified against DS720+ / DSM 7.3.2)
- DSM version read from /etc/VERSION (synoinfo.conf no longer has
productversion on newer DSM).
- Disks discovered as /dev/sata{N} as well as /dev/sd{a..z} and NVMe;
smartctl runs with -d sat so SMART data is actually readable.
- SAS-style smartctl output (Vendor:/Product:) parsed as a fallback
when Device Model: is absent.
- Services collected via plain systemctl list-units, since
synoservicectl/synosystemctl are gone on recent DSM builds.
- Network primary() picks the interface with the most accumulated
traffic instead of hard-coded eth0.
Cleanup
- Removed ConfirmDialog and service start/stop/restart actions — the
app is now truly read-only, matching the stated philosophy and
eliminating a key conflict with `r`=refresh.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
75 lines
2.6 KiB
Python
75 lines
2.6 KiB
Python
from __future__ import annotations
|
|
|
|
from dataclasses import dataclass, field
|
|
from typing import List
|
|
|
|
from dsmview.collectors.base import Collector
|
|
|
|
|
|
@dataclass(slots=True)
|
|
class ServiceInfo:
|
|
name: str
|
|
running: bool = False
|
|
description: str = ""
|
|
|
|
|
|
@dataclass(slots=True)
|
|
class ServicesSnapshot:
|
|
services: List[ServiceInfo] = field(default_factory=list)
|
|
|
|
|
|
# Names worth surfacing in the compact dashboard view.
|
|
INTERESTING = {
|
|
"smbd", "smb", "nmbd", "nginx", "sshd", "nfsd", "ftpd",
|
|
"avahi-daemon", "crond", "chronyd", "synoindexd", "findhostd",
|
|
"synocachefs", "synonetd", "synopkg", "synowebapi",
|
|
"pgsql", "synologdbd",
|
|
}
|
|
|
|
|
|
class ServicesCollector(Collector[ServicesSnapshot]):
|
|
"""Lists systemd services with running status.
|
|
|
|
Synology DSM 7.x uses systemd. Older `synoservicectl` / `synosystemctl`
|
|
are absent on recent DSM builds, so we go straight to `systemctl`.
|
|
"""
|
|
|
|
name = "services"
|
|
|
|
async def collect(self) -> ServicesSnapshot:
|
|
# --no-legend keeps the table machine-parseable; --plain removes
|
|
# the unicode tree characters that some systemd versions emit.
|
|
result = await self.executor.run(
|
|
"systemctl list-units --type=service --all --no-legend --no-pager --plain 2>/dev/null || true",
|
|
timeout=10.0,
|
|
)
|
|
services = self._parse(result.stdout)
|
|
return ServicesSnapshot(services=services)
|
|
|
|
@staticmethod
|
|
def _parse(text: str) -> List[ServiceInfo]:
|
|
out: List[ServiceInfo] = []
|
|
for line in text.splitlines():
|
|
parts = line.split(None, 4)
|
|
if len(parts) < 4:
|
|
continue
|
|
unit = parts[0]
|
|
# systemctl marks failed/loaded/not-found in column 2; we want
|
|
# the SUB state in column 4 (running/dead/exited/etc).
|
|
sub_state = parts[3]
|
|
desc = parts[4] if len(parts) > 4 else ""
|
|
if not unit.endswith(".service"):
|
|
continue
|
|
name = unit[: -len(".service")]
|
|
# Strip pkg- prefix DSM uses for package-installed services so
|
|
# smbd shows as smbd, not pkg-smbd.
|
|
display = name[4:] if name.startswith("pkg-") else name
|
|
running = sub_state == "running"
|
|
out.append(ServiceInfo(name=display, running=running, description=desc.strip().strip('"')))
|
|
# Sort: interesting services first, then running ones, then the rest.
|
|
def sort_key(s: ServiceInfo) -> tuple:
|
|
interesting = 0 if s.name in INTERESTING else 1
|
|
running = 0 if s.running else 1
|
|
return (interesting, running, s.name)
|
|
out.sort(key=sort_key)
|
|
return out
|