SILVER/NODEDC_MISSION_CORE
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat(system): configure telemetry polling per contour

Browse Source
This commit is contained in:
DCCONSTRUCTIONS
2026-07-28 01:24:05 +03:00
parent 4a65b52f6d
commit 2ffbb51a7e
8 changed files with 68 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/control-station/src/components/system/ComputeContourSettingsWindow.tsx
+28 -8
View File
@@ -2,6 +2,7 @@ import { useEffect, useMemo, useState } from "react";
import {
Button,
FeatureSettingsWindow,
FieldFrame,
Icon,
Select,
SettingsCard,
@@ -50,6 +51,7 @@ function emptyDraft(): ComputeContourDraft {
ssh_port: 22,
mqtt_host: "127.0.0.1",
mqtt_port: 1883,
telemetry_poll_interval_seconds: 3,
};
}
@@ -64,6 +66,7 @@ function draftFromContour(contour: ComputeContour | null): ComputeContourDraft {
ssh_port: contour.ssh_port,
mqtt_host: contour.mqtt_host,
mqtt_port: contour.mqtt_port,
telemetry_poll_interval_seconds: contour.telemetry_poll_interval_seconds,
};
}
@@ -111,6 +114,9 @@ export function ComputeContourSettingsWindow({
&& draft.ssh_port > 0
&& Number.isInteger(draft.mqtt_port)
&& draft.mqtt_port > 0
&& Number.isInteger(draft.telemetry_poll_interval_seconds)
&& draft.telemetry_poll_interval_seconds >= 1
&& draft.telemetry_poll_interval_seconds <= 60
), [draft]);
const save = async () => {
@@ -194,14 +200,16 @@ export function ComputeContourSettingsWindow({
expected_node_id: event.currentTarget.value,
}))}
/>
<Select
label="Платформа"
value={draft.platform}
options={platformOptions}
variant="split"
menuWidth="anchor"
onChange={(platform) => setDraft((current) => ({ ...current, platform }))}
/>
<FieldFrame label="Операционная система">
<Select
label="Операционная система"
value={draft.platform}
options={platformOptions}
variant="split"
menuWidth="anchor"
onChange={(platform) => setDraft((current) => ({ ...current, platform }))}
/>
</FieldFrame>
<TextField
label="Адрес узла"
hint="IP или hostname в текущей LAN"
@@ -230,6 +238,18 @@ export function ComputeContourSettingsWindow({
mqtt_port: Number(event.currentTarget.value),
}))}
/>
<TextField
label="Интервал MQTT"
hint="1–60 с"
type="number"
min={1}
max={60}
value={String(draft.telemetry_poll_interval_seconds)}
onChange={(event) => setDraft((current) => ({
...current,
telemetry_poll_interval_seconds: Number(event.currentTarget.value),
}))}
/>
{draft.telemetry_mode === "legacy-ssh" ? (
<TextField
label="SSH port"
apps/control-station/src/core/system/computeContours.ts
+3
View File
@@ -13,6 +13,7 @@ export interface ComputeContour {
ssh_port: number;
mqtt_host: string;
mqtt_port: number;
telemetry_poll_interval_seconds: number;
revision: number;
updated_at_utc: string | null;
}
@@ -31,6 +32,7 @@ export interface ComputeContourDraft {
ssh_port: number;
mqtt_host: string;
mqtt_port: number;
telemetry_poll_interval_seconds: number;
}
export interface ComputeContourAgentInstall {
@@ -96,6 +98,7 @@ export async function createComputeContour(
ssh_port: draft.ssh_port,
mqtt_host: draft.mqtt_host,
mqtt_port: draft.mqtt_port,
telemetry_poll_interval_seconds: draft.telemetry_poll_interval_seconds,
}),
signal,
});
apps/control-station/src/core/system/useWorkerTelemetry.ts
+2 -2
View File
@@ -5,7 +5,7 @@ import {
type WorkerTelemetry,
} from "./workerTelemetry";
export const WORKER_TELEMETRY_POLL_MILLISECONDS = 3_000;
export const DEFAULT_WORKER_TELEMETRY_POLL_MILLISECONDS = 3_000;
export interface WorkerTelemetryState {
telemetry: WorkerTelemetry | null;
@@ -15,7 +15,7 @@ export interface WorkerTelemetryState {
}
export function useWorkerTelemetry(
pollMilliseconds = WORKER_TELEMETRY_POLL_MILLISECONDS,
pollMilliseconds = DEFAULT_WORKER_TELEMETRY_POLL_MILLISECONDS,
enabled = true,
): WorkerTelemetryState {
const [telemetry, setTelemetry] = useState<WorkerTelemetry | null>(null);
apps/control-station/src/workspaces/system/ComputeModulesWorkspace.tsx
+4 -5
View File
@@ -16,7 +16,6 @@ import {
import { useComputeContours } from "../../core/system/ComputeContourContext";
import {
useWorkerTelemetry,
WORKER_TELEMETRY_POLL_MILLISECONDS,
} from "../../core/system/useWorkerTelemetry";
function pipelineStateLabel(state: string): string {
@@ -30,8 +29,8 @@ export function ComputeModulesWorkspace() {
const legacyDiagnostic = selectedContour?.contour_id === "worker-006"
&& selectedContour.telemetry_mode === "legacy-ssh";
const supportsLiveTelemetry = selectedContour?.contour_id === "worker-006";
const { telemetry, loading, error, refresh } = useWorkerTelemetry(
WORKER_TELEMETRY_POLL_MILLISECONDS,
const { telemetry, error, refresh } = useWorkerTelemetry(
(selectedContour?.telemetry_poll_interval_seconds ?? 3) * 1_000,
supportsLiveTelemetry,
);
const node = telemetry?.node ?? null;
@@ -67,11 +66,11 @@ export function ComputeModulesWorkspace() {
<Button
size="compact"
variant="secondary"
disabled={loading}
disabled={!supportsLiveTelemetry}
onClick={refresh}
icon={<Icon name="refresh" size={14} />}
>
{loading ? "Читаем" : "Обновить"}
Обновить
</Button>
</div>
</section>
apps/control-station/src/workspaces/system/NetworkWorkspace.tsx
+4 -5
View File
@@ -15,7 +15,6 @@ import {
import { useComputeContours } from "../../core/system/ComputeContourContext";
import {
useWorkerTelemetry,
WORKER_TELEMETRY_POLL_MILLISECONDS,
} from "../../core/system/useWorkerTelemetry";
export function NetworkWorkspace() {
@@ -23,8 +22,8 @@ export function NetworkWorkspace() {
const legacyDiagnostic = selectedContour?.contour_id === "worker-006"
&& selectedContour.telemetry_mode === "legacy-ssh";
const supportsLiveTelemetry = selectedContour?.contour_id === "worker-006";
const { telemetry, loading, error, refresh } = useWorkerTelemetry(
WORKER_TELEMETRY_POLL_MILLISECONDS,
const { telemetry, error, refresh } = useWorkerTelemetry(
(selectedContour?.telemetry_poll_interval_seconds ?? 3) * 1_000,
supportsLiveTelemetry,
);
const aggregate = telemetry?.network.aggregate ?? null;
@@ -54,11 +53,11 @@ export function NetworkWorkspace() {
<Button
size="compact"
variant="secondary"
disabled={loading || !supportsLiveTelemetry}
disabled={!supportsLiveTelemetry}
onClick={refresh}
icon={<Icon name="refresh" size={14} />}
>
{loading ? "Читаем" : "Обновить"}
Обновить
</Button>
</div>
</section>
apps/control-station/test/systemTelemetry.test.mjs
+14 -3
View File
@@ -17,6 +17,8 @@ test("Worker 006 telemetry remains a bounded system feature slice", async () =>
pipelineStages,
networkWorkspace,
telemetryPolling,
contourSettings,
contourContract,
telemetryStyles,
styles,
] = await Promise.all([
@@ -27,6 +29,8 @@ test("Worker 006 telemetry remains a bounded system feature slice", async () =>
read("components/system/WorkerPipelineStages.tsx"),
read("workspaces/system/NetworkWorkspace.tsx"),
read("core/system/useWorkerTelemetry.ts"),
read("components/system/ComputeContourSettingsWindow.tsx"),
read("core/system/computeContours.ts"),
read("styles/system-telemetry.css"),
read("styles.css"),
]);
@@ -41,20 +45,27 @@ test("Worker 006 telemetry remains a bounded system feature slice", async () =>
assert.match(core, /share_percent/);
assert.doesNotMatch(core, /@nodedc\/ui-react/);
assert.match(computeWorkspace, /useWorkerTelemetry/);
assert.match(computeWorkspace, /WORKER_TELEMETRY_POLL_MILLISECONDS/);
assert.match(computeWorkspace, /telemetry_poll_interval_seconds/);
assert.match(computeWorkspace, />\s*Обновить\s*</);
assert.doesNotMatch(computeWorkspace, /loading\s*\?\s*"Читаем"/);
assert.match(computeWorkspace, /WorkerPipelineStages/);
assert.match(pipelineStages, /измеренного времени/);
assert.doesNotMatch(pipelineStages, /CPU|GPU|hardware/);
assert.match(
telemetryPolling,
/WORKER_TELEMETRY_POLL_MILLISECONDS\s*=\s*3_000/,
/DEFAULT_WORKER_TELEMETRY_POLL_MILLISECONDS\s*=\s*3_000/,
);
assert.match(
telemetryStyles,
/\.worker-stage-list\s*\{[^}]*grid-template-columns:\s*repeat\(3,/s,
);
assert.match(networkWorkspace, /127\.0\.0\.1:8000/);
assert.match(networkWorkspace, /WORKER_TELEMETRY_POLL_MILLISECONDS/);
assert.match(networkWorkspace, /telemetry_poll_interval_seconds/);
assert.match(networkWorkspace, />\s*Обновить\s*</);
assert.doesNotMatch(networkWorkspace, /loading\s*\?\s*"Читаем"/);
assert.doesNotMatch(networkWorkspace, /8765/);
assert.match(contourSettings, /FieldFrame label="Операционная система"/);
assert.match(contourSettings, /label="Интервал MQTT"/);
assert.match(contourContract, /telemetry_poll_interval_seconds: number/);
assert.match(styles, /system-telemetry\.css/);
});
src/k1link/web/compute_contour_api.py
+9
View File
@@ -46,6 +46,7 @@ class ComputeContour(StrictModel):
ssh_port: int = Field(default=22, ge=1, le=65535)
mqtt_host: str = Field(default="127.0.0.1", min_length=1, max_length=253)
mqtt_port: int = Field(default=1883, ge=1, le=65535)
telemetry_poll_interval_seconds: int = Field(default=3, ge=1, le=60)
revision: int = Field(default=0, ge=0)
updated_at_utc: str | None = None
@@ -90,6 +91,7 @@ class ComputeContourCreate(StrictModel):
ssh_port: int = Field(default=22, ge=1, le=65535)
mqtt_host: str = Field(default="127.0.0.1", min_length=1, max_length=253)
mqtt_port: int = Field(default=1883, ge=1, le=65535)
telemetry_poll_interval_seconds: int = Field(default=3, ge=1, le=60)
@field_validator("display_name")
@classmethod
@@ -124,6 +126,7 @@ def default_compute_contour() -> ComputeContour:
ssh_port=22,
mqtt_host="127.0.0.1",
mqtt_port=1883,
telemetry_poll_interval_seconds=3,
)
@@ -152,6 +155,9 @@ class ComputeContourStore:
ssh_port=request.ssh_port,
mqtt_host=request.mqtt_host,
mqtt_port=request.mqtt_port,
telemetry_poll_interval_seconds=(
request.telemetry_poll_interval_seconds
),
revision=0,
updated_at_utc=_utc_now(),
)
@@ -177,6 +183,9 @@ class ComputeContourStore:
"ssh_port": request.ssh_port,
"mqtt_host": request.mqtt_host,
"mqtt_port": request.mqtt_port,
"telemetry_poll_interval_seconds": (
request.telemetry_poll_interval_seconds
),
"revision": current.revision + 1,
"updated_at_utc": _utc_now(),
}
tests/test_compute_contour_api.py
+4
View File
@@ -39,6 +39,7 @@ def test_contour_store_migrates_worker_006_as_first_configuration(
assert len(contours) == 1
assert contours[0].contour_id == "worker-006"
assert contours[0].telemetry_mode == "agent-mqtt"
assert contours[0].telemetry_poll_interval_seconds == 3
assert not store.path.exists()
@@ -65,10 +66,12 @@ def test_contour_store_creates_and_updates_private_catalog(tmp_path: Path) -> No
ssh_port=22,
mqtt_host="192.0.2.5",
mqtt_port=1883,
telemetry_poll_interval_seconds=1,
),
)
assert updated.display_name == "Field Worker 01"
assert updated.telemetry_poll_interval_seconds == 1
assert updated.revision == 1
assert stat.S_IMODE(store.path.stat().st_mode) == 0o600
assert len(store.list_contours()) == 2
@@ -85,6 +88,7 @@ def test_contour_store_creates_and_updates_private_catalog(tmp_path: Path) -> No
ssh_port=22,
mqtt_host="127.0.0.1",
mqtt_port=1883,
telemetry_poll_interval_seconds=3,
),
)