feat: follow Agent object plans and daily storage observations

DEPLOYMENT-v1.3.3-2026-10-15.md

@@ -0,0 +1,7 @@
+# v1.3.3 指标语义统一
+
+2026-10-15 已部署。运行状态与历史趋势统一处理器负载、内存占用、磁盘占用及英文名称；主网络英文统一 Primary network，无告警与状态未确认提示一致。缺失百分比显示 --，不显示孤立百分号或假零值进度条。温度、内存可用量/存储剩余量按数据来源保留，不改用户资源名称。
+
+全页、历史五范围和三尺寸中英文主题浏览器验证通过；真实设备公开快照在本地渲染两处卡片，三尺寸两语言名称检查和缺失读数检查通过。生产认证 API 核对 Console 2.4.1、Pi 插件 1.3.3、NAS 插件 1.6.2，两设备在线、原名称保持，4 秒声明不变，验证会话删除。生产实际 UI 和历史名称代码核对通过。
+
+停服一致性备份 /volume1/homes/way/pigway-console-backup-v2.4.1-20261015/{program,data}.tar.gz，目录 0700；旧插件在数据卷 adapter-backups/semantics-v2.4.1。实际镜像 sha256:127d80530abc728add1eb947e304387f7f941f8fa570386d951c6f9ae6eabc0e，仅保留 latest 标签，候选标签与旧镜像清理。没有主动刷新磁盘。Tea 三个 Release 附件下载校验一致。

README.md

@@ -36,3 +36,5 @@ v1.1.0 已与 Console v2.1.0 部署，真实树莓派在线并开始记录历史
 生产 v1.3.0 与按设备周期采集的核验见 [部署记录](DEPLOYMENT-v1.3.0-2026-10-15.md)。
 
 当前生产实时指标统一 4 秒读取，实测及版本 v1.3.2 见 [调优记录](DEPLOYMENT-v1.3.2-2026-10-15.md)。
+
+当前生产 v1.3.3 的指标用词、状态与缺失百分比统一见 [部署记录](DEPLOYMENT-v1.3.3-2026-10-15.md)。

plugin/manifest.json

@@ -1,7 +1,7 @@
 {
   "id": "pigway-agent",
   "name": "PIGWay Raspberry Pi Agent",
-  "version": "1.3.3",
+  "version": "1.4.0",
   "protocol_version": 1,
   "entrypoint": "worker.py",
   "runtime": "python3",
@@ -40,6 +40,6 @@
   },
   "legacy_connection_fields": true,
   "collection": {
-    "interval_seconds": 4
+    "interval_seconds": 1
   }
 }

plugin/ui/overview.js

@@ -22,5 +22,5 @@ export function agentHostCard(entry) {
     diskTotal = y.disk_total_bytes;
   const percent = n => Number.isFinite(n) ? `${n.toFixed(1)}%` : "--";
   const progress = n => Number.isFinite(n) ? meter(n) : "";
-  return `<article class="panel host-panel"><div class="host-head"><div><div class="host-title"><h2>${esc(m.name || h.name || m.id)}</h2><span class="uptime-badge">${esc(formatUptime(s.uptime_seconds))}</span></div><div class="device-details"><span>ID ${esc(m.id || h.id)}</span><span>${appState.LANG === "zh" ? "主机名" : "Hostname"} ${esc(m.hostname || v.hostname || "--")}</span><span>${esc(v.manufacturer || "")} ${esc(v.model || "--")}</span><span>${appState.LANG === "zh" ? "序列号" : "Serial"} ${esc(v.serial || "--")}</span><span>${appState.LANG === "zh" ? "硬件版本" : "Revision"} ${esc(v.revision || "--")}</span><span>${esc(v.os || "--")}</span><span>${appState.LANG === "zh" ? "内核" : "Kernel"} ${esc(v.kernel || "--")}</span><span>${esc(v.architecture || "--")} · CPU ${esc(v.cpu_count || "--")}</span><span>${appState.LANG === "zh" ? "程序版本" : "Agent"} ${esc(s.version || "--")}</span></div></div><span class="badge good">${tr("在线")}</span></div><div class="host-grid"><div class="metric"><div class="muted">${tr("处理器负载")}</div><div class="value">${percent(y.cpu_percent)}</div>${progress(y.cpu_percent)}<div class="muted">${appState.LANG === "zh" ? "频率" : "Frequency"} ${esc(y.cpu_freq_mhz)} MHz · ${esc(y.temperature_c)}°C${fanMetric(s.plugins || {})}</div></div><div class="metric"><div class="muted">${tr("内存占用")}</div><div class="value">${percent(y.memory_percent)}</div>${progress(y.memory_percent)}<div class="muted">${bytes(memUsed)} / ${bytes(memTotal)} · ${appState.LANG === "zh" ? "可用" : "Available"} ${bytes(y.memory_available_bytes)}</div></div><div class="metric"><div class="muted">${tr("磁盘占用")}</div><div class="value">${percent(y.disk_percent)}</div>${progress(y.disk_percent)}<div class="muted">${bytes(diskUsed)} / ${bytes(diskTotal)} · ${appState.LANG === "zh" ? "剩余" : "Free"} ${bytes(y.disk_free_bytes)}</div></div><div class="metric"><div class="muted">${tr("主网络")}</div><div class="value">↓ ${bytes(n.rx_bytes_per_second)}/s · ↑ ${bytes(n.tx_bytes_per_second)}/s</div><div class="muted">${esc(n.interface || "--")} · ${n.kind === "WIF" ? `${esc(n.metric)} dBm · ` : n.link_speed_mbps ? `${esc(n.link_speed_mbps)} Mbps · ` : ""}${esc(n.ip_label)} ${esc(n.ip)} · ${n.link === true ? (appState.LANG === "zh" ? "已连接" : "Connected") : n.link === false ? (appState.LANG === "zh" ? "已断开" : "Disconnected") : (appState.LANG === "zh" ? "状态未确认" : "Unconfirmed")}</div></div><div class="metric"><div class="muted">${tr("显示状态")}</div><div class="value">${esc(ownerName(d.owner))}</div><div class="muted">${appState.LANG === "zh" ? "告警状态独立于硬件插件" : "Alert state is independent of hardware plugins"}</div></div><div class="metric"><div class="muted">${tr("当前告警")}</div><div class="value">${(d.alerts || []).length}</div><div class="muted">${(d.alerts || []).map((a) => esc(ownerName(a.id))).join(" · ") || tr("无告警")}</div></div></div>${pluginSummary(s.plugins || {}, h.id)}<div class="group"><h3>${tr("服务与进程监控")}</h3><div class="rows">${(s.watches || []).map((w) => `<div class="row"><span>${esc(w.name)} · ${esc(w.target)}</span><span class="badge ${w.up ? "good" : "bad"}">${tr(w.up ? "正常" : "停止")}</span></div>`).join("") || `<div class="muted">${tr("暂无数据")}</div>`}</div></div></article>`;
+  return `<article class="panel host-panel"><div class="host-head"><div><div class="host-title"><h2>${esc(m.name || h.name || m.id)}</h2><span class="uptime-badge">${esc(formatUptime(s.uptime_seconds))}</span></div><div class="device-details"><span>ID ${esc(m.id || h.id)}</span><span>${appState.LANG === "zh" ? "主机名" : "Hostname"} ${esc(m.hostname || v.hostname || "--")}</span><span>${esc(v.manufacturer || "")} ${esc(v.model || "--")}</span><span>${appState.LANG === "zh" ? "序列号" : "Serial"} ${esc(v.serial || "--")}</span><span>${appState.LANG === "zh" ? "硬件版本" : "Revision"} ${esc(v.revision || "--")}</span><span>${esc(v.os || "--")}</span><span>${appState.LANG === "zh" ? "内核" : "Kernel"} ${esc(v.kernel || "--")}</span><span>${esc(v.architecture || "--")} · CPU ${esc(v.cpu_count || "--")}</span><span>${appState.LANG === "zh" ? "程序版本" : "Agent"} ${esc(s.version || "--")}</span></div></div><span class="badge good">${tr("在线")}</span></div><div class="host-grid"><div class="metric" data-refresh-group="system"><div class="muted">${tr("处理器负载")}</div><div class="value">${percent(y.cpu_percent)}</div>${progress(y.cpu_percent)}<div class="muted">${appState.LANG === "zh" ? "频率" : "Frequency"} ${esc(y.cpu_freq_mhz)} MHz · ${esc(y.temperature_c)}°C${fanMetric(s.plugins || {})}</div></div><div class="metric" data-refresh-group="system"><div class="muted">${tr("内存占用")}</div><div class="value">${percent(y.memory_percent)}</div>${progress(y.memory_percent)}<div class="muted">${bytes(memUsed)} / ${bytes(memTotal)} · ${appState.LANG === "zh" ? "可用" : "Available"} ${bytes(y.memory_available_bytes)}</div></div><div class="metric" data-refresh-group="storage"><div class="muted">${tr("磁盘占用")}</div><div class="value">${percent(y.disk_percent)}</div>${progress(y.disk_percent)}<div class="muted">${bytes(diskUsed)} / ${bytes(diskTotal)} · ${appState.LANG === "zh" ? "剩余" : "Free"} ${bytes(y.disk_free_bytes)}</div></div><div class="metric" data-refresh-group="network"><div class="muted">${tr("主网络")}</div><div class="value">↓ ${bytes(n.rx_bytes_per_second)}/s · ↑ ${bytes(n.tx_bytes_per_second)}/s</div><div class="muted">${esc(n.interface || "--")} · ${n.kind === "WIF" ? `${esc(n.metric)} dBm · ` : n.link_speed_mbps ? `${esc(n.link_speed_mbps)} Mbps · ` : ""}${esc(n.ip_label)} ${esc(n.ip)} · ${n.link === true ? (appState.LANG === "zh" ? "已连接" : "Connected") : n.link === false ? (appState.LANG === "zh" ? "已断开" : "Disconnected") : (appState.LANG === "zh" ? "状态未确认" : "Unconfirmed")}</div></div><div class="metric" data-refresh-group="display"><div class="muted">${tr("显示状态")}</div><div class="value">${esc(ownerName(d.owner))}</div><div class="muted">${appState.LANG === "zh" ? "告警状态独立于硬件插件" : "Alert state is independent of hardware plugins"}</div></div><div class="metric" data-refresh-group="alerts"><div class="muted">${tr("当前告警")}</div><div class="value">${(d.alerts || []).length}</div><div class="muted">${(d.alerts || []).map((a) => esc(ownerName(a.id))).join(" · ") || tr("无告警")}</div></div></div>${pluginSummary(s.plugins || {}, h.id)}<div class="group"><h3>${tr("服务与进程监控")}</h3><div class="rows">${(s.watches || []).map((w) => `<div class="row"><span>${esc(w.name)} · ${esc(w.target)}</span><span class="badge ${w.up ? "good" : "bad"}">${tr(w.up ? "正常" : "停止")}</span></div>`).join("") || `<div class="muted">${tr("暂无数据")}</div>`}</div></div></article>`;
 }

plugin/worker.py

@@ -68,6 +68,9 @@ def collect(device):
     value = request(device, '/status')
     if not isinstance(value.get('system'), dict) or not isinstance(value.get('machine'), dict):
         raise AdapterError('INVALID_RESPONSE')
+    declaration = value.get('collection') if isinstance(value.get('collection'),dict) else {}
+    plans = declaration.get('refresh') if isinstance(declaration.get('refresh'),dict) else {}
+    storage_plan = plans.get('storage') if isinstance(plans.get('storage'),dict) else {}
     metrics = []
     units = {'cpu_percent': 'percent', 'memory_percent': 'percent', 'disk_percent': 'percent',
              'temperature_c': 'celsius', 'cpu_freq_mhz': 'megahertz',
@@ -90,17 +93,17 @@ def collect(device):
             metrics.append({'resource_id': 'host', 'key': key, 'value': rate, 'unit': 'bytes_per_second'})
     for metric in metrics:
         source = value.get('network', {}) if metric['key'].startswith('network_') else value.get('system', {})
-        at = source.get('observed_at') if metric['key'] != 'uptime_seconds' else value.get('timestamp')
+        at = source.get('storage_observed_at') if metric['key'].startswith('disk_') else source.get('observed_at') if metric['key'] != 'uptime_seconds' else value.get('timestamp')
         if isinstance(at, (int, float)) and not isinstance(at, bool) and math.isfinite(at) and at > 0:
             metric['observed_at'] = at
     return {'schema_version': 1, 'observed_at': value.get('timestamp'),
             'identity': {'reported_name': value['machine'].get('name'), 'category': 'host',
                          'details': value.get('device', {})},
-            'collection': {'interval_seconds': collection_interval(value)},
+            'collection': {**declaration, 'interval_seconds': collection_interval(value)},
             'capabilities': MANIFEST['capabilities'], 'metrics': metrics,
             'resources': [{'id': 'host', 'type': 'host'}],
             'alerts': value.get('display', {}).get('alerts', []),
-            'alerts_complete': isinstance(value.get('display', {}).get('alerts'), list),
+            'alerts_complete': isinstance(value.get('display', {}).get('alerts'), list) and not storage_plan.get('error',False),
             'view': value}
 
 

tests/test_metrics.py

@@ -21,13 +21,13 @@ class MetricsTests(unittest.TestCase):
         self.assertEqual(values['network_rx_bytes_per_second'],0)
         self.assertEqual(values['network_tx_bytes_per_second'],1234)
         self.assertEqual(next(m['observed_at'] for m in result['metrics'] if m['key']=='network_tx_bytes_per_second'),120)
-        self.assertEqual(result['collection']['interval_seconds'],4)
+        self.assertEqual(result['collection']['interval_seconds'],1)
         self.assertTrue(result['alerts_complete'])
 
     def test_collection_minimum_and_slower_device(self):
-        self.assertEqual(worker.collection_interval({'collection':{'interval_seconds':1}}),4)
+        self.assertEqual(worker.collection_interval({'collection':{'interval_seconds':1}}),1)
         self.assertEqual(worker.collection_interval({'collection':{'interval_seconds':5}}),5)
-        self.assertEqual(worker.collection_interval({'collection':{'interval_seconds':True}}),4)
+        self.assertEqual(worker.collection_interval({'collection':{'interval_seconds':True}}),1)
 
     def test_absent_or_boolean_fields_not_invented(self):
         value={'system': {'cpu_percent': True}, 'machine':{}, 'network': {'link_speed_mbps': None, 'rx_bytes_per_second':float('nan'), 'tx_bytes_per_second':True}}