Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
26249e1a4d | ||
|
|
136474ba95 | ||
|
|
f0e08f9731 | ||
|
|
87461daa42 |
No files matched your search
@@ -617,7 +617,7 @@ function NetflowRateBadge({
|
|||||||
onClick={(e) => { e.stopPropagation(); onOpen?.(e) }}
|
onClick={(e) => { e.stopPropagation(); onOpen?.(e) }}
|
||||||
>
|
>
|
||||||
<title>
|
<title>
|
||||||
Поток NetFlow между узлами (как в «Трафик»: 5 мин, без overlay/mesh). Скорость канала — отдельно.
|
Поток NetFlow между узлами за интервал карты, без overlay/mesh.
|
||||||
</title>
|
</title>
|
||||||
<rect className="network-map-focus-ring" x={-bw / 2 - 4} y={-bh / 2 - 4} width={bw + 8} height={bh + 8} rx="9" fill="none" stroke="var(--ring)" strokeWidth="2" />
|
<rect className="network-map-focus-ring" x={-bw / 2 - 4} y={-bh / 2 - 4} width={bw + 8} height={bh + 8} rx="9" fill="none" stroke="var(--ring)" strokeWidth="2" />
|
||||||
<rect
|
<rect
|
||||||
@@ -1442,7 +1442,7 @@ function NetworkMapContent() {
|
|||||||
if (cancelled||request!==epoch) return
|
if (cancelled||request!==epoch) return
|
||||||
const name = err instanceof Error ? err.name : ""
|
const name = err instanceof Error ? err.name : ""
|
||||||
if (name === "AbortError") return
|
if (name === "AbortError") return
|
||||||
setFlowError(err instanceof Error?(err.name==="ZodError"?"Некорректный ответ: требуется полный снимок за 5 минут":err.message):"Ошибка NetFlow")
|
setFlowError(err instanceof Error?(err.name==="ZodError"?"Ответ содержит неполные или противоречивые данные снимка":err.message):"Ошибка NetFlow")
|
||||||
}).finally(()=>{inFlight=false;if(!cancelled&&request===epoch)setFlowLoading(false)})
|
}).finally(()=>{inFlight=false;if(!cancelled&&request===epoch)setFlowLoading(false)})
|
||||||
}
|
}
|
||||||
queueMicrotask(()=>{if(!cancelled)tick()})
|
queueMicrotask(()=>{if(!cancelled)tick()})
|
||||||
@@ -2224,7 +2224,7 @@ function NetworkMapContent() {
|
|||||||
<span className="text-[10px] border border-border rounded px-1.5 py-0.5">
|
<span className="text-[10px] border border-border rounded px-1.5 py-0.5">
|
||||||
{useLiveData ? (readAt ? "Снимок API · ответ "+new Date(readAt).toLocaleTimeString("ru-RU")+" (время браузера)" : "Данные карты неизвестны") : "Демо · mock"}
|
{useLiveData ? (readAt ? "Снимок API · ответ "+new Date(readAt).toLocaleTimeString("ru-RU")+" (время браузера)" : "Данные карты неизвестны") : "Демо · mock"}
|
||||||
</span>
|
</span>
|
||||||
{useLiveData&&<span>{showNetflow||showServices?(flowReadAt?"NetFlow · 5 мин · ответ "+new Date(flowReadAt).toLocaleTimeString("ru-RU")+" (время браузера) · "+(flowListener?"приёмник включён":"приёмник выключен"):"Данные NetFlow неизвестны"):"NetFlow: отображение и обновление выключены"}</span>}
|
{useLiveData&&<span>{showNetflow||showServices?(flowReadAt?`NetFlow · ${mapWindowSec / 60} мин${mapWindowSec < 300 ? " из 5 запрошенных" : ""} · ответ `+new Date(flowReadAt).toLocaleTimeString("ru-RU")+" (время браузера) · "+(flowListener?"приёмник включён":"приёмник выключен"):"Данные NetFlow неизвестны"):"NetFlow: отображение и обновление выключены"}</span>}
|
||||||
{useLiveData&&flowLoading&&(showNetflow||showServices)&&<span role="status">Обновление NetFlow…</span>}
|
{useLiveData&&flowLoading&&(showNetflow||showServices)&&<span role="status">Обновление NetFlow…</span>}
|
||||||
{useLiveData&&flowError&&(showNetflow||showServices)&&<span role="alert" className="text-destructive [overflow-wrap:anywhere]">NetFlow: {flowError}. {flowReadAt?"Сохранён предыдущий снимок NetFlow; актуальность не подтверждена.":"Первоначальная загрузка NetFlow не подтверждена."}</span>}
|
{useLiveData&&flowError&&(showNetflow||showServices)&&<span role="alert" className="text-destructive [overflow-wrap:anywhere]">NetFlow: {flowError}. {flowReadAt?"Сохранён предыдущий снимок NetFlow; актуальность не подтверждена.":"Первоначальная загрузка NetFlow не подтверждена."}</span>}
|
||||||
{useLiveData&&dnsError&&<span role="alert" className="text-destructive [overflow-wrap:anywhere]">DNS: {dnsError}. Связи по неизвестному адресу не подтверждены.</span>}
|
{useLiveData&&dnsError&&<span role="alert" className="text-destructive [overflow-wrap:anywhere]">DNS: {dnsError}. Связи по неизвестному адресу не подтверждены.</span>}
|
||||||
@@ -2934,7 +2934,7 @@ function NetworkMapContent() {
|
|||||||
? "Ping и/или TX/RX — с последнего прогона speed-пробы; проба сопоставляется с этим GRE по WAN и интерфейсам. "
|
? "Ping и/или TX/RX — с последнего прогона speed-пробы; проба сопоставляется с этим GRE по WAN и интерфейсам. "
|
||||||
: useLiveData?"Измерения GRE неизвестны: нет подходящей пробы. ":"Измерения демонстрационные. "}
|
: useLiveData?"Измерения GRE неизвестны: нет подходящей пробы. ":"Измерения демонстрационные. "}
|
||||||
{spGr?"Проба "+spGr.id+" · время Ping: "+(spGr.lastPingAt?new Date(spGr.lastPingAt).toLocaleString("ru-RU"):"неизвестно")+" · время TX/RX неизвестно. ":""}
|
{spGr?"Проба "+spGr.id+" · время Ping: "+(spGr.lastPingAt?new Date(spGr.lastPingAt).toLocaleString("ru-RU"):"неизвестно")+" · время TX/RX неизвестно. ":""}
|
||||||
Поток — снимок NetFlow за 5 мин (как в «Трафик»: без overlay/mesh), не ёмкость канала.
|
Поток по данным NetFlow за {mapWindowSec / 60} мин, без overlay/mesh.
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ import { createMcpConnection, authenticateMcpToken, updateMcpSettings, rotateCon
|
|||||||
import { invokeMcpTool, approvePlan, applyPlan, recoverMcpOperations } from "./runtime.js"
|
import { invokeMcpTool, approvePlan, applyPlan, recoverMcpOperations } from "./runtime.js"
|
||||||
import { decryptSecret, encryptSecret, invalidateMcpAccess, tokenDigest } from "./security.js"
|
import { decryptSecret, encryptSecret, invalidateMcpAccess, tokenDigest } from "./security.js"
|
||||||
import { addRoutingDependencies } from "./routing-dependencies.js"
|
import { addRoutingDependencies } from "./routing-dependencies.js"
|
||||||
|
import { FlowSourceWindowTooLarge } from "../../services/traffic-flow-read-window.js"
|
||||||
import { acceptOspfRouteProofMcp } from "./ospf-route-proof-acceptance.js"
|
import { acceptOspfRouteProofMcp } from "./ospf-route-proof-acceptance.js"
|
||||||
import { acceptNetworkNeighborsMcp } from "./network-neighbors-acceptance.js"
|
import { acceptNetworkNeighborsMcp } from "./network-neighbors-acceptance.js"
|
||||||
import { acceptIpv6NdWriteMcp } from "./ipv6-nd-write-acceptance.js"
|
import { acceptIpv6NdWriteMcp } from "./ipv6-nd-write-acceptance.js"
|
||||||
@@ -1629,13 +1630,33 @@ try {
|
|||||||
await assert.rejects(invokeMcpTool(ospfPrincipal, "mm_ospf_instance_create_plan", { serverId: 1, fields: { name: "blocked-ospf", "router-id": "192.0.2.1", version: "3", vrf: "main" } }))
|
await assert.rejects(invokeMcpTool(ospfPrincipal, "mm_ospf_instance_create_plan", { serverId: 1, fields: { name: "blocked-ospf", "router-id": "192.0.2.1", version: "3", vrf: "main" } }))
|
||||||
await pool.query("DELETE FROM mcp_protections WHERE id=$1", [vrfProtection])
|
await pool.query("DELETE FROM mcp_protections WHERE id=$1", [vrfProtection])
|
||||||
bgpFixtures = true
|
bgpFixtures = true
|
||||||
const bgpAccess = await createMcpConnection(mcpConnectionCreateSchema.parse({ name: "BGP dependency test", mode: "approval", expiresAt: new Date(Date.now() + 1800000).toISOString(), permissions: ["mm:bgp:read", "mm:bgp:write", "mm:network:read"], scope: { serverIds: [1], operationIds: ["ros.bgp_instance.delete", "ros.bgp_instance.update", "ros.bgp_connection.create", "ros.vrf.delete"], allowGlobal: false } }), actor)
|
const bgpAccess = await createMcpConnection(mcpConnectionCreateSchema.parse({ name: "BGP dependency test", mode: "approval", expiresAt: new Date(Date.now() + 1800000).toISOString(), permissions: ["mm:bgp:read", "mm:bgp:write", "mm:network:read"], scope: { serverIds: [1], operationIds: ["ros.bgp_instance.delete", "ros.bgp_instance.update", "ros.bgp_connection.create", "ros.bgp_connection.update", "ros.vrf.delete"], allowGlobal: false } }), actor)
|
||||||
const bgpPrincipal = await authenticateMcpToken(bgpAccess.token)
|
const bgpPrincipal = await authenticateMcpToken(bgpAccess.token)
|
||||||
await assert.rejects(invokeMcpTool(bgpPrincipal, "mm_bgp_instance_delete_plan", { serverId: 1, id: "*bgp" }), /используется подключением/)
|
await assert.rejects(invokeMcpTool(bgpPrincipal, "mm_bgp_instance_delete_plan", { serverId: 1, id: "*bgp" }), /используется подключением/)
|
||||||
const peerFields = { name: "new-peer", instance: "missing", "remote.address": "192.0.2.2", "local.address": "192.0.2.1", "remote.as": 64513, "local.role": "ebgp" }
|
const peerFields = { name: "new-peer", instance: "missing", "remote.address": "192.0.2.2", "local.address": "192.0.2.1", "remote.as": 64513, "local.role": "ebgp" }
|
||||||
await assert.rejects(invokeMcpTool(bgpPrincipal, "mm_bgp_connection_create_plan", { serverId: 1, fields: peerFields }), /Не подтверждена зависимость/)
|
await assert.rejects(invokeMcpTool(bgpPrincipal, "mm_bgp_connection_create_plan", { serverId: 1, fields: peerFields }), /Не подтверждена зависимость/)
|
||||||
await assert.rejects(invokeMcpTool(bgpPrincipal, "mm_bgp_connection_create_plan", { serverId: 1, fields: { ...peerFields, instance: "fixture-bgp", "local.address": "fd00::1" } }), /одного семейства/)
|
await assert.rejects(invokeMcpTool(bgpPrincipal, "mm_bgp_connection_create_plan", { serverId: 1, fields: { ...peerFields, instance: "fixture-bgp", "local.address": "fd00::1" } }), /одного семейства/)
|
||||||
await assert.rejects(invokeMcpTool(bgpPrincipal, "mm_bgp_connection_create_plan", { serverId: 1, fields: { ...peerFields, instance: "fixture-bgp", "remote.address": "0.0.0.0/0" } }))
|
await assert.rejects(invokeMcpTool(bgpPrincipal, "mm_bgp_connection_create_plan", { serverId: 1, fields: { ...peerFields, instance: "fixture-bgp", "remote.address": "0.0.0.0/0" } }))
|
||||||
|
const savedPeer = fixtureBgp.connection[0]
|
||||||
|
const preparePassivePeer = () => invokeMcpTool(bgpPrincipal, "mm_bgp_connection_update_plan", {
|
||||||
|
serverId: 1, id: savedPeer[".id"], fields: { connect: false, listen: true },
|
||||||
|
}) as Promise<{ state: string; changes: { steps: { step: { fields: unknown } }[] } }>
|
||||||
|
try {
|
||||||
|
for (const [local, remote] of [["10.255.255.100", "10.255.255.11/32"], ["2001:db8::1", "2001:db8::2/128"]]) {
|
||||||
|
fixtureBgp.connection[0] = { ...savedPeer, "local.address": local, "remote.address": remote }
|
||||||
|
const plan = await preparePassivePeer()
|
||||||
|
assert.equal(plan.state, "awaiting-approval")
|
||||||
|
assert.equal(plan.changes.steps.length, 1)
|
||||||
|
assert.deepEqual(plan.changes.steps[0].step.fields, { connect: "false", listen: "true" })
|
||||||
|
}
|
||||||
|
fixtureBgp.connection[0] = { ...savedPeer, "remote.address": "2001:db8::2/128" }
|
||||||
|
await assert.rejects(preparePassivePeer(), /одного семейства/)
|
||||||
|
fixtureBgp.connection[0] = { ...savedPeer, "remote.address": "192.0.2.2/33" }
|
||||||
|
await assert.rejects(preparePassivePeer(), /Некорректный адрес или префикс/)
|
||||||
|
} finally {
|
||||||
|
fixtureBgp.connection[0] = savedPeer
|
||||||
|
}
|
||||||
|
console.log("✓ MCP BGP dependency validation accepts stored IPv4/IPv6 CIDR for a passive-mode update and rejects mixed families and invalid prefix lengths")
|
||||||
const peerProtection = randomUUID()
|
const peerProtection = randomUUID()
|
||||||
await pool.query("INSERT INTO mcp_protections(id,object_ref,created_by) VALUES($1,$2::jsonb,'integration')", [peerProtection, JSON.stringify({ kind: "bgp_connection", id: "*peer", serverId: 1, protection: "deny" })])
|
await pool.query("INSERT INTO mcp_protections(id,object_ref,created_by) VALUES($1,$2::jsonb,'integration')", [peerProtection, JSON.stringify({ kind: "bgp_connection", id: "*peer", serverId: 1, protection: "deny" })])
|
||||||
await assert.rejects(invokeMcpTool(bgpPrincipal, "mm_bgp_instance_update_plan", { serverId: 1, id: "*bgp", fields: { as: 64514 } }))
|
await assert.rejects(invokeMcpTool(bgpPrincipal, "mm_bgp_instance_update_plan", { serverId: 1, id: "*bgp", fields: { as: 64514 } }))
|
||||||
@@ -2033,7 +2054,7 @@ try {
|
|||||||
assert.equal(badPeer.configurationMembershipVerified,false); assert.equal(badPeer.incomplete,true); assert.equal(badPeer.failures.length,1); assert.equal(badPeer.exporters[0].storedPeerRecord,null)
|
assert.equal(badPeer.configurationMembershipVerified,false); assert.equal(badPeer.incomplete,true); assert.equal(badPeer.failures.length,1); assert.equal(badPeer.exporters[0].storedPeerRecord,null)
|
||||||
await pool.query("UPDATE traffic_flow_settings SET peers_json=jsonb_set(peers_json,'{0,publicKey}',$1::jsonb) WHERE id=1",[JSON.stringify("public-one")]); invalidateFlowSettings()
|
await pool.query("UPDATE traffic_flow_settings SET peers_json=jsonb_set(peers_json,'{0,publicKey}',$1::jsonb) WHERE id=1",[JSON.stringify("public-one")]); invalidateFlowSettings()
|
||||||
const rawWindow = await flowWindow(5,[1]); assert.equal(rawWindow.rows.length,4); assert.ok(rawWindow.rows.every(row=>row.serverId===1&&row.bucketAt<=rawWindow.until))
|
const rawWindow = await flowWindow(5,[1]); assert.equal(rawWindow.rows.length,4); assert.ok(rawWindow.rows.every(row=>row.serverId===1&&row.bucketAt<=rawWindow.until))
|
||||||
await assert.rejects(flowRows(rawWindow.since,1,{maxRows:1,untilIso:rawWindow.until}),/предел/)
|
await assert.rejects(flowRows(rawWindow.since,1,{maxRows:1,untilIso:rawWindow.until}),FlowSourceWindowTooLarge)
|
||||||
type TalkerPage = { items: {serverId:string;src:string;bytes:number;bps:number}[]; total:number; totalConversations:number; retainedRowsBytes:number; nextOffset:number|null; incomplete:boolean; serverIds:number[] }
|
type TalkerPage = { items: {serverId:string;src:string;bytes:number;bps:number}[]; total:number; totalConversations:number; retainedRowsBytes:number; nextOffset:number|null; incomplete:boolean; serverIds:number[] }
|
||||||
const talkers = await invokeMcpTool(flowPrincipal,"mm_netflow_talkers_get",{minutes:5,limit:1}) as TalkerPage
|
const talkers = await invokeMcpTool(flowPrincipal,"mm_netflow_talkers_get",{minutes:5,limit:1}) as TalkerPage
|
||||||
assert.equal(talkers.retainedRowsBytes,3100); assert.equal(talkers.totalConversations,4); assert.equal(talkers.total,4); assert.equal(talkers.nextOffset,1); assert.equal(talkers.incomplete,true)
|
assert.equal(talkers.retainedRowsBytes,3100); assert.equal(talkers.totalConversations,4); assert.equal(talkers.total,4); assert.equal(talkers.nextOffset,1); assert.equal(talkers.incomplete,true)
|
||||||
@@ -2099,8 +2120,14 @@ try {
|
|||||||
assert.ok(restVisible.every((row:{src:string})=>row.src!=="198.18.242.6"),"Future rows must not enter REST talkers")
|
assert.ok(restVisible.every((row:{src:string})=>row.src!=="198.18.242.6"),"Future rows must not enter REST talkers")
|
||||||
assert.equal((await flowHttp.inject({method:"GET",url:"/api/traffic/flows?range=5m"})).statusCode,200)
|
assert.equal((await flowHttp.inject({method:"GET",url:"/api/traffic/flows?range=5m"})).statusCode,200)
|
||||||
for(const path of ["/api/traffic/flow/exporters?range=5m","/api/traffic/flow/clients?range=5m","/api/traffic/flow/monthly?month="+flowMonth+"&serverId=1"]) { const response = await flowHttp.inject({method:"GET",url:path}); assert.equal(response.statusCode,200,response.body); assert.equal(typeof response.json(),"object") } } finally { await flowHttp.close() }
|
for(const path of ["/api/traffic/flow/exporters?range=5m","/api/traffic/flow/clients?range=5m","/api/traffic/flow/monthly?month="+flowMonth+"&serverId=1"]) { const response = await flowHttp.inject({method:"GET",url:path}); assert.equal(response.statusCode,200,response.body); assert.equal(typeof response.json(),"object") } } finally { await flowHttp.close() }
|
||||||
await pool.query("INSERT INTO flow_buckets(server_id,bucket_at,src,dst,bytes,packets,in_iface) SELECT 1,now()-interval '90 seconds'+n*interval '1 millisecond','198.18.242.11','8.8.8.8',1,1,'cap' FROM generate_series(1,50001) n")
|
await pool.query("INSERT INTO flow_buckets(server_id,bucket_at,src,dst,bytes,packets,in_iface) SELECT 1,now()-interval '90 seconds'+n*interval '1 microsecond','198.18.242.11','8.8.8.8',1,1,'cap' FROM generate_series(1,50001) n")
|
||||||
await assert.rejects(invokeMcpTool(flowPrincipal,"mm_netflow_talkers_get",{minutes:5}), (error:{code?:string})=>error.code==="STATE_UNAVAILABLE")
|
const denseReport = await invokeMcpTool(flowPrincipal, "mm_netflow_talkers_get", { minutes: 5 }) as TalkerPage & {
|
||||||
|
sourceWindow: { requestedMinutes: number; effectiveMinutes: number }; from: string; to: string
|
||||||
|
}
|
||||||
|
assert.equal(denseReport.sourceWindow.requestedMinutes, 5)
|
||||||
|
assert.equal(denseReport.sourceWindow.effectiveMinutes, 1)
|
||||||
|
assert.equal(Date.parse(denseReport.to) - Date.parse(denseReport.from), denseReport.sourceWindow.effectiveMinutes * 60_000)
|
||||||
|
assert(denseReport.items.every(row => row.src !== "198.18.242.11"), "The skipped dense window must not publish a partial page")
|
||||||
await pool.query("DELETE FROM flow_buckets WHERE server_id=1 AND src='198.18.242.11'")
|
await pool.query("DELETE FROM flow_buckets WHERE server_id=1 AND src='198.18.242.11'")
|
||||||
const talkerRace = async (change:()=>Promise<unknown>, principal=flowPrincipal, signal?:AbortSignal) => {
|
const talkerRace = async (change:()=>Promise<unknown>, principal=flowPrincipal, signal?:AbortSignal) => {
|
||||||
const blocker = await pool.connect()
|
const blocker = await pool.connect()
|
||||||
@@ -2134,7 +2161,7 @@ try {
|
|||||||
assert.equal(catalogCalls,0,"Talker history and races must never poll RouterOS")
|
assert.equal(catalogCalls,0,"Talker history and races must never poll RouterOS")
|
||||||
assert.equal((await pool.query("SELECT count(*)::int AS n FROM mcp_plans WHERE connection_id=$1",[flowAccess.connection.id])).rows[0].n,0)
|
assert.equal((await pool.query("SELECT count(*)::int AS n FROM mcp_plans WHERE connection_id=$1",[flowAccess.connection.id])).rows[0].n,0)
|
||||||
assert.ok(!JSON.stringify((await pool.query("SELECT result FROM mcp_requests WHERE connection_id=$1",[flowAccess.connection.id])).rows).includes("NEVER_FLOW"))
|
assert.ok(!JSON.stringify((await pool.query("SELECT result FROM mcp_requests WHERE connection_id=$1",[flowAccess.connection.id])).rows).includes("NEVER_FLOW"))
|
||||||
console.log("✓ NetFlow talkers: shared REST parity, scoped SQL/pending, topN/pages, 50001-row refusal, real blocked-read source/topN/grant/owner/cancel/pause races, no global fields or network")
|
console.log("✓ NetFlow talkers: shared REST parity, scoped SQL/pending, topN/pages, bounded dense-window fallback, real blocked-read source/topN/grant/owner/cancel/pause races, no global fields or network")
|
||||||
} finally {
|
} finally {
|
||||||
countCatalogCalls = false; clearPendingFlows(); resetFlowRipe()
|
countCatalogCalls = false; clearPendingFlows(); resetFlowRipe()
|
||||||
await pool.query("DELETE FROM app_users WHERE id=ANY($1::text[])",[flowUsers])
|
await pool.query("DELETE FROM app_users WHERE id=ANY($1::text[])",[flowUsers])
|
||||||
|
|||||||
@@ -134,6 +134,15 @@ export async function resolveOspfInterfaceSelectors(serverId: number, selectors:
|
|||||||
return names
|
return names
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function bgpAddressFamily(value: string): number {
|
||||||
|
if (!value.includes("/")) return isIP(value)
|
||||||
|
try {
|
||||||
|
return isIP(canonicalBgpPolicyPrefix(value).split("/")[0])
|
||||||
|
} catch {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export async function addRoutingDependencies(serverId: number, resource: string, action: RosStep["action"], current: ConfigurationRow | undefined, fields: Record<string, string>, snapshots: RosSnapshot[], objects: ChangeEvidence["objects"]) {
|
export async function addRoutingDependencies(serverId: number, resource: string, action: RosStep["action"], current: ConfigurationRow | undefined, fields: Record<string, string>, snapshots: RosSnapshot[], objects: ChangeEvidence["objects"]) {
|
||||||
const read = async (id: string) => {
|
const read = async (id: string) => {
|
||||||
const existing = snapshots.find(snapshot => snapshot.resource === id)
|
const existing = snapshots.find(snapshot => snapshot.resource === id)
|
||||||
@@ -227,7 +236,11 @@ export async function addRoutingDependencies(serverId: number, resource: string,
|
|||||||
}
|
}
|
||||||
if (resource === "bgp_connection") {
|
if (resource === "bgp_connection") {
|
||||||
const local = fields["local.address"] ?? current?.["local.address"], remote = fields["remote.address"] ?? current?.["remote.address"]
|
const local = fields["local.address"] ?? current?.["local.address"], remote = fields["remote.address"] ?? current?.["remote.address"]
|
||||||
if (typeof local === "string" && typeof remote === "string" && isIP(local) !== isIP(remote)) throw new McpError("INVALID_INPUT", "Адреса BGP-соединения должны быть одного семейства", 400)
|
if (typeof local === "string" && typeof remote === "string") {
|
||||||
|
const localFamily = bgpAddressFamily(local), remoteFamily = bgpAddressFamily(remote)
|
||||||
|
if (!localFamily || !remoteFamily) throw new McpError("INVALID_INPUT", "Некорректный адрес или префикс BGP-соединения", 400)
|
||||||
|
if (localFamily !== remoteFamily) throw new McpError("INVALID_INPUT", "Адреса BGP-соединения должны быть одного семейства", 400)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (resource === "bgp_instance" && current && ["as", "router-id", "disabled"].some(key => fields[key] !== undefined && fields[key] !== current[key])) {
|
if (resource === "bgp_instance" && current && ["as", "router-id", "disabled"].some(key => fields[key] !== undefined && fields[key] !== current[key])) {
|
||||||
for (const row of (await read("bgp_connection")).rows.filter(row => [current.name, current[".id"]].includes(row.instance))) objects.push({ kind: "bgp_connection", id: String(row[".id"]), serverId })
|
for (const row of (await read("bgp_connection")).rows.filter(row => [current.name, current[".id"]].includes(row.instance))) objects.push({ kind: "bgp_connection", id: String(row[".id"]), serverId })
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import assert from "node:assert/strict"
|
|||||||
import { rememberServerIfaces, resetIfaceCacheForTests } from "./traffic-flow-ifindex.js"
|
import { rememberServerIfaces, resetIfaceCacheForTests } from "./traffic-flow-ifindex.js"
|
||||||
import {
|
import {
|
||||||
ingestParsedFlowsForServerForTests,
|
ingestParsedFlowsForServerForTests,
|
||||||
|
getRingMbps,
|
||||||
resetFlowRingsForTests,
|
resetFlowRingsForTests,
|
||||||
} from "./traffic-flow-ingest.js"
|
} from "./traffic-flow-ingest.js"
|
||||||
import { buildFlowAnalytics, formatLiveSseFromBuilder, getFlowMonthly, listFlowClients, listFlowExporters, resetFlowAnalyticsCacheForTests } from "./traffic-flow-analytics.js"
|
import { buildFlowAnalytics, formatLiveSseFromBuilder, getFlowMonthly, listFlowClients, listFlowExporters, resetFlowAnalyticsCacheForTests } from "./traffic-flow-analytics.js"
|
||||||
@@ -98,6 +99,9 @@ ingestParsedFlowsForServerForTests(serverId, [
|
|||||||
])
|
])
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
const ring = getRingMbps(serverId)
|
||||||
|
assert.equal(ring.rxNow,0)
|
||||||
|
assert.equal(ring.txNow,12800 * 8 / 2 / 1e6)
|
||||||
const all = await buildFlowAnalytics({ minutes: 5, serverId })
|
const all = await buildFlowAnalytics({ minutes: 5, serverId })
|
||||||
assert.equal(all.applications[0]?.label, "HTTPS")
|
assert.equal(all.applications[0]?.label, "HTTPS")
|
||||||
assert.ok(all.protocols.some((p) => p.label === "TCP"))
|
assert.ok(all.protocols.some((p) => p.label === "TCP"))
|
||||||
@@ -119,6 +123,14 @@ try {
|
|||||||
|
|
||||||
const other = await buildFlowAnalytics({ minutes: 5, serverId: 99 })
|
const other = await buildFlowAnalytics({ minutes: 5, serverId: 99 })
|
||||||
assert.equal(other.conversations, 0)
|
assert.equal(other.conversations, 0)
|
||||||
|
|
||||||
|
ingestParsedFlowsForServerForTests(serverId, [
|
||||||
|
{ src:"10.1.1.9", dst:"9.9.9.9", proto:6, srcPort:50001, dstPort:443, inIface:"2", bytes:1200, packets:2 },
|
||||||
|
{ src:"8.8.4.4", dst:"9.9.9.9", proto:6, srcPort:50002, dstPort:443, inIface:"2", bytes:3400, packets:4 },
|
||||||
|
])
|
||||||
|
const mixed = await buildFlowAnalytics({ minutes:5, serverId })
|
||||||
|
assert.equal(mixed.bytes, 12800 + 1200 + 3400)
|
||||||
|
assert.equal(mixed.bpsNow, mixed.bytes * 8 / 300, "Unattributed transit remains in the total rate")
|
||||||
} finally {
|
} finally {
|
||||||
resetFlowRingsForTests()
|
resetFlowRingsForTests()
|
||||||
resetIfaceCacheForTests()
|
resetIfaceCacheForTests()
|
||||||
@@ -561,16 +573,21 @@ resetFlowRingsForTests()
|
|||||||
await dbQuery("DELETE FROM flow_buckets WHERE server_id=$1", [serverId])
|
await dbQuery("DELETE FROM flow_buckets WHERE server_id=$1", [serverId])
|
||||||
for (const minutesAgo of [2, 3, 4, 10]) {
|
for (const minutesAgo of [2, 3, 4, 10]) {
|
||||||
await dbQuery(`INSERT INTO flow_buckets (server_id,bucket_at,src,dst,in_iface,bytes,packets)
|
await dbQuery(`INSERT INTO flow_buckets (server_id,bucket_at,src,dst,in_iface,bytes,packets)
|
||||||
VALUES ($1,date_trunc('minute',now())-($2::int*interval '1 minute'),'10.1.1.8','8.8.8.8','2',60000,10)`, [serverId, minutesAgo])
|
VALUES ($1,date_trunc('minute',now())-($2::int*interval '1 minute'),'10.1.1.8','8.8.8.8','2',60000,10),
|
||||||
|
($1,date_trunc('minute',now())-($2::int*interval '1 minute'),'8.8.8.8','10.1.1.8','11',240000,40)`, [serverId, minutesAgo])
|
||||||
}
|
}
|
||||||
for (const minutes of [5, 15]) for (const dedup of [true, false]) {
|
for (const minutes of [5, 15]) for (const dedup of [true, false]) {
|
||||||
resetFlowAnalyticsCacheForTests()
|
resetFlowAnalyticsCacheForTests()
|
||||||
const history = await buildFlowAnalytics({ minutes, serverId, dedup, excludeMesh:false, excludeOverlay:false })
|
const history = await buildFlowAnalytics({ minutes, serverId, dedup, excludeMesh:false, excludeOverlay:false })
|
||||||
assert.equal(history.rxSeries.length, minutes)
|
assert.equal(history.rxSeries.length, minutes)
|
||||||
assert.equal(history.rxSeries.filter(v => v > 0).length, minutes === 5 ? 3 : 4)
|
assert.equal(history.rxSeries.filter(v => v > 0).length, minutes === 5 ? 3 : 4)
|
||||||
|
assert.deepEqual(history.rxSeries,history.txSeries.map(v => v * 4))
|
||||||
const missing = await buildFlowAnalytics({ minutes, serverId, iface:"not-an-interface" })
|
const missing = await buildFlowAnalytics({ minutes, serverId, iface:"not-an-interface" })
|
||||||
assert(missing.rxSeries.every(v => v === 0), "Historical chart respects interface filter")
|
assert(missing.rxSeries.every(v => v === 0), "Historical chart respects interface filter")
|
||||||
}
|
}
|
||||||
|
const historicalCard = (await listFlowExporters(5)).exporters.find(s => s.id === String(serverId))!
|
||||||
|
assert(historicalCard.txNow > 0)
|
||||||
|
assert.equal(historicalCard.rxNow,historicalCard.txNow * 4)
|
||||||
|
|
||||||
} finally {
|
} finally {
|
||||||
for (const table of ["flow_daily_dims", "flow_hour_facts", "flow_daily_facts", "flow_buckets", "traffic_samples", "user_interface_bindings", "server_snapshots"]) {
|
for (const table of ["flow_daily_dims", "flow_hour_facts", "flow_daily_facts", "flow_buckets", "traffic_samples", "user_interface_bindings", "server_snapshots"]) {
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ import { applicationName, flowRowMatchesFilter } from "./traffic-flow-apps.js"
|
|||||||
import { dedupFlowRowsMaxBytes, flowTupleKey } from "./traffic-flow-dedup.js"
|
import { dedupFlowRowsMaxBytes, flowTupleKey } from "./traffic-flow-dedup.js"
|
||||||
import { enqueueRipeMisses } from "./traffic-flow-ripe.js"
|
import { enqueueRipeMisses } from "./traffic-flow-ripe.js"
|
||||||
import { classifyFlowPlane, flowBps, shouldKeepPlane } from "./traffic-flow-planes.js"
|
import { classifyFlowPlane, flowBps, shouldKeepPlane } from "./traffic-flow-planes.js"
|
||||||
import { resolveInternetDest } from "./traffic-flow-dest.js"
|
import { flowRateDirection, resolveInternetDest } from "./traffic-flow-dest.js"
|
||||||
import { refreshFlowCatalogInBackground } from "./traffic-flow-classify.js"
|
import { refreshFlowCatalogInBackground } from "./traffic-flow-classify.js"
|
||||||
import {
|
import {
|
||||||
enGreIfaceNames,
|
enGreIfaceNames,
|
||||||
@@ -106,22 +106,29 @@ async function userIfaceAllow(userId: string): Promise<Map<number, Set<string>>
|
|||||||
return allow
|
return allow
|
||||||
}
|
}
|
||||||
|
|
||||||
function seriesFromRows(rows: PendingFlowRow[], minutes: number): { rx: number[]; tx: number[] } {
|
function seriesFromRows(rows: PendingFlowRow[], minutes: number, direction: (row: PendingFlowRow) => "rx" | "tx" | "both" | null) {
|
||||||
const slots = Math.min(60, Math.max(5, minutes))
|
const slots = Math.min(60, Math.max(5, minutes))
|
||||||
const slotMs = (minutes * 60_000) / slots
|
const slotMs = (minutes * 60_000) / slots
|
||||||
const start = Date.now() - minutes * 60_000
|
const start = Date.now() - minutes * 60_000
|
||||||
const rx = Array(slots).fill(0) as number[]
|
const rx = Array(slots).fill(0) as number[]
|
||||||
const tx = Array(slots).fill(0) as number[]
|
const tx = Array(slots).fill(0) as number[]
|
||||||
|
let undirectedBytes = 0
|
||||||
for (const r of rows) {
|
for (const r of rows) {
|
||||||
const t = Date.parse(r.bucketAt)
|
const t = Date.parse(r.bucketAt)
|
||||||
if (!Number.isFinite(t)) continue
|
if (!Number.isFinite(t)) continue
|
||||||
const idx = Math.min(slots - 1, Math.max(0, Math.floor((t - start) / slotMs)))
|
const idx = Math.min(slots - 1, Math.max(0, Math.floor((t - start) / slotMs)))
|
||||||
rx[idx] += r.bytes
|
const side = direction(r)
|
||||||
|
if (side === null) undirectedBytes += r.bytes
|
||||||
|
if (side === "rx" || side === "both") rx[idx] += r.bytes
|
||||||
|
if (side === "tx" || side === "both") tx[idx] += r.bytes
|
||||||
}
|
}
|
||||||
const slotSec = Math.max(1, slotMs / 1000)
|
const slotSec = Math.max(1, slotMs / 1000)
|
||||||
return {
|
return {
|
||||||
rx: rx.map((b) => bpsToMbps((b * 8) / slotSec)),
|
rx: rx.map((b) => bpsToMbps((b * 8) / slotSec)),
|
||||||
tx,
|
tx: tx.map((b) => bpsToMbps((b * 8) / slotSec)),
|
||||||
|
rxNow: bpsToMbps(rx.reduce((a, b) => a + b, 0) * 8 / (minutes * 60)),
|
||||||
|
txNow: bpsToMbps(tx.reduce((a, b) => a + b, 0) * 8 / (minutes * 60)),
|
||||||
|
undirectedBytes,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -233,7 +240,8 @@ async function buildFlowAnalyticsUncached(q: FlowAnalyticsQuery, scope?: ScopedF
|
|||||||
for (const r of raw) {
|
for (const r of raw) {
|
||||||
const resolved = resolveIfaceName(r.serverId, r.inIface)
|
const resolved = resolveIfaceName(r.serverId, r.inIface)
|
||||||
const outResolved = resolveIfaceName(r.serverId, r.outIface)
|
const outResolved = resolveIfaceName(r.serverId, r.outIface)
|
||||||
if (!flowRowMatchesFilter(r, resolved.name, q, allow)) continue
|
if (!flowRowMatchesFilter(r, resolved.name, q, allow)
|
||||||
|
&& !flowRowMatchesFilter({ serverId: r.serverId, inIface: r.outIface }, outResolved.name, q, allow)) continue
|
||||||
ifacesForWire.add(resolved.name)
|
ifacesForWire.add(resolved.name)
|
||||||
if (outResolved.name && outResolved.name !== "—") ifacesForWire.add(outResolved.name)
|
if (outResolved.name && outResolved.name !== "—") ifacesForWire.add(outResolved.name)
|
||||||
const plane = classifyFlowPlane({
|
const plane = classifyFlowPlane({
|
||||||
@@ -441,7 +449,19 @@ async function buildFlowAnalyticsUncached(q: FlowAnalyticsQuery, scope?: ScopedF
|
|||||||
: { rx: Array(60).fill(0) as number[], tx: Array(60).fill(0) as number[], rxNow: 0, txNow: 0 }
|
: { rx: Array(60).fill(0) as number[], tx: Array(60).fill(0) as number[], rxNow: 0, txNow: 0 }
|
||||||
|
|
||||||
// The live ring covers about one minute; historical charts must use the requested window.
|
// The live ring covers about one minute; historical charts must use the requested window.
|
||||||
const fromBuckets = seriesFromRows(matched, q.minutes)
|
// Keep the winning interface's individual minute buckets when deduplicating.
|
||||||
|
const chosenIfaces = wantDedup ? new Map(working.map(row => [flowTupleKey(row), row.inIface])) : null
|
||||||
|
const chartRows = chosenIfaces ? matched.filter(r => chosenIfaces.get(flowTupleKey(r)) === r.inIface) : matched
|
||||||
|
const fromBuckets = seriesFromRows(chartRows, q.minutes, row => {
|
||||||
|
if (ifaceFilter || allow) {
|
||||||
|
const ingress = flowRowMatchesFilter(row, resolveIfaceName(row.serverId, row.inIface).name, q, allow)
|
||||||
|
const egress = flowRowMatchesFilter({ serverId: row.serverId, inIface: row.outIface }, resolveIfaceName(row.serverId, row.outIface).name, q, allow)
|
||||||
|
if (ingress && egress) return "both"
|
||||||
|
// At a client binding, ingress is the client's upload.
|
||||||
|
return allow && !ifaceFilter ? (ingress ? "tx" : "rx") : (ingress ? "rx" : "tx")
|
||||||
|
}
|
||||||
|
return flowRateDirection(row.serverId, row, topo, catalog.byId.get(row.serverId)?.host)
|
||||||
|
})
|
||||||
const rxSeries = fromBuckets.rx
|
const rxSeries = fromBuckets.rx
|
||||||
const txSeries = fromBuckets.tx
|
const txSeries = fromBuckets.tx
|
||||||
|
|
||||||
@@ -491,7 +511,7 @@ async function buildFlowAnalyticsUncached(q: FlowAnalyticsQuery, scope?: ScopedF
|
|||||||
if (scope && (!isDeepStrictEqual(topo, await loadFlowTopology(scope.serverIds, authorize)) || (await readFlowSourceLimits()).topN !== settings.topN)) throw new Error("Топология или предел источника NetFlow изменились во время чтения")
|
if (scope && (!isDeepStrictEqual(topo, await loadFlowTopology(scope.serverIds, authorize)) || (await readFlowSourceLimits()).topN !== settings.topN)) throw new Error("Топология или предел источника NetFlow изменились во время чтения")
|
||||||
await authorize()
|
await authorize()
|
||||||
return {
|
return {
|
||||||
bpsNow: (ring.rxNow + ring.txNow) * 1_000_000 || (totalBytes * 8) / windowSec,
|
bpsNow: (!fromBuckets.undirectedBytes && (ring.rxNow + ring.txNow) * 1_000_000) || (totalBytes * 8) / windowSec,
|
||||||
bytes: totalBytes,
|
bytes: totalBytes,
|
||||||
packets: totalPackets,
|
packets: totalPackets,
|
||||||
conversations: conv.size,
|
conversations: conv.size,
|
||||||
@@ -536,30 +556,32 @@ async function buildFlowAnalyticsUncached(q: FlowAnalyticsQuery, scope?: ScopedF
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function summarizeByServer(rows: PendingFlowRow[]) {
|
function groupRowsByServer(rows: PendingFlowRow[]) {
|
||||||
const bytes = new Map<number, number>()
|
const byServer = new Map<number, PendingFlowRow[]>()
|
||||||
const sessions = new Map<number, number>()
|
|
||||||
for (const r of rows) {
|
for (const r of rows) {
|
||||||
bytes.set(r.serverId, (bytes.get(r.serverId) ?? 0) + r.bytes)
|
const group = byServer.get(r.serverId)
|
||||||
sessions.set(r.serverId, (sessions.get(r.serverId) ?? 0) + 1)
|
if (group) group.push(r)
|
||||||
|
else byServer.set(r.serverId, [r])
|
||||||
}
|
}
|
||||||
return { bytes, sessions }
|
return byServer
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function listFlowExporters(minutes: number): Promise<FlowExportersDto> {
|
export async function listFlowExporters(minutes: number): Promise<FlowExportersDto> {
|
||||||
const runtime = await getFlowRuntimeCounters()
|
const runtime = await getFlowRuntimeCounters()
|
||||||
const inputs = await readFlowExporterInputs(minutes)
|
const inputs = await readFlowExporterInputs(minutes)
|
||||||
const rows = inputs.window.rows
|
const rows = inputs.window.rows
|
||||||
const { bytes, sessions } = summarizeByServer(rows)
|
const byServer = groupRowsByServer(rows)
|
||||||
const ids = new Set<number>([...bytes.keys()])
|
const ids = new Set<number>(byServer.keys())
|
||||||
for (const id of inputs.configuredIds) ids.add(id)
|
for (const id of inputs.configuredIds) ids.add(id)
|
||||||
const catalog = inputs.catalog
|
const catalog = inputs.catalog
|
||||||
const emptySeries = Array(60).fill(0) as number[]
|
const topo = await loadFlowTopology()
|
||||||
const exporters = catalog.list
|
const exporters = catalog.list
|
||||||
.filter((s) => ids.has(s.id))
|
.filter((s) => ids.has(s.id))
|
||||||
.map((s) => {
|
.map((s) => {
|
||||||
const ring = getRingMbps(s.id, "__all__")
|
const ring = getRingMbps(s.id, "__all__")
|
||||||
const total = bytes.get(s.id) ?? 0
|
const records = byServer.get(s.id) ?? []
|
||||||
|
const rates = ring.rx.some(Boolean) || ring.tx.some(Boolean) ? ring
|
||||||
|
: seriesFromRows(records, minutes, row => flowRateDirection(s.id, row, topo, s.host))
|
||||||
return {
|
return {
|
||||||
id: String(s.id),
|
id: String(s.id),
|
||||||
name: s.name,
|
name: s.name,
|
||||||
@@ -567,12 +589,12 @@ export async function listFlowExporters(minutes: number): Promise<FlowExportersD
|
|||||||
site: s.site,
|
site: s.site,
|
||||||
country: s.country,
|
country: s.country,
|
||||||
status: snapshotStatus(s.id),
|
status: snapshotStatus(s.id),
|
||||||
rxNow: ring.rxNow || (total * 8) / Math.max(60, minutes * 60) / 1_000_000,
|
rxNow: rates.rxNow,
|
||||||
txNow: ring.txNow,
|
txNow: rates.txNow,
|
||||||
sessions: sessions.get(s.id) ?? 0,
|
sessions: records.length,
|
||||||
rxSeries: ring.rx.some((v) => v > 0) ? ring.rx : emptySeries,
|
rxSeries: rates.rx,
|
||||||
txSeries: ring.tx,
|
txSeries: rates.tx,
|
||||||
bytes: total,
|
bytes: records.reduce((sum, row) => sum + row.bytes, 0),
|
||||||
} satisfies FlowEntityCard
|
} satisfies FlowEntityCard
|
||||||
})
|
})
|
||||||
.sort((a, b) => b.rxNow - a.rxNow)
|
.sort((a, b) => b.rxNow - a.rxNow)
|
||||||
@@ -599,8 +621,6 @@ export async function listFlowClients(minutes: number): Promise<{ clients: { id:
|
|||||||
byUser.set(b.userId, list)
|
byUser.set(b.userId, list)
|
||||||
}
|
}
|
||||||
const rows = inputs.window.rows
|
const rows = inputs.window.rows
|
||||||
const emptySeries = Array(60).fill(0) as number[]
|
|
||||||
const windowSec = Math.max(60, minutes * 60)
|
|
||||||
const clients: FlowEntityCard[] = []
|
const clients: FlowEntityCard[] = []
|
||||||
for (const u of users) {
|
for (const u of users) {
|
||||||
const userBinds = byUser.get(u.id) ?? []
|
const userBinds = byUser.get(u.id) ?? []
|
||||||
@@ -611,18 +631,15 @@ export async function listFlowClients(minutes: number): Promise<{ clients: { id:
|
|||||||
set.add(b.interfaceName)
|
set.add(b.interfaceName)
|
||||||
allow.set(b.serverId, set)
|
allow.set(b.serverId, set)
|
||||||
}
|
}
|
||||||
let total = 0
|
const bound = (id: number, iface: string) => {
|
||||||
let sessions = 0
|
const names = allow.get(id)
|
||||||
for (const r of rows) {
|
return names?.has(iface) || names?.has(resolveIfaceName(id, iface).name)
|
||||||
const resolved = resolveIfaceName(r.serverId, r.inIface)
|
|
||||||
const names = allow.get(r.serverId)
|
|
||||||
if (!names) continue
|
|
||||||
if (!names.has(resolved.name) && !names.has(r.inIface)) continue
|
|
||||||
total += r.bytes
|
|
||||||
sessions += 1
|
|
||||||
}
|
}
|
||||||
const firstServer = userBinds[0]?.serverId
|
const matched = rows.filter(r => bound(r.serverId, r.inIface) || bound(r.serverId, r.outIface))
|
||||||
const ring = firstServer ? getRingMbps(firstServer, "__all__") : { rx: emptySeries, tx: emptySeries, rxNow: 0, txNow: 0 }
|
const rates = seriesFromRows(matched, minutes, r => {
|
||||||
|
if (!bound(r.serverId, r.inIface)) return "rx"
|
||||||
|
return bound(r.serverId, r.outIface) ? "both" : "tx"
|
||||||
|
})
|
||||||
clients.push({
|
clients.push({
|
||||||
id: u.id,
|
id: u.id,
|
||||||
name: u.login,
|
name: u.login,
|
||||||
@@ -630,12 +647,12 @@ export async function listFlowClients(minutes: number): Promise<{ clients: { id:
|
|||||||
site: `${userBinds.length} ifaces`,
|
site: `${userBinds.length} ifaces`,
|
||||||
country: "UN",
|
country: "UN",
|
||||||
status: u.active ? "online" : "offline",
|
status: u.active ? "online" : "offline",
|
||||||
rxNow: (total * 8) / windowSec / 1_000_000 || ring.rxNow,
|
rxNow: rates.rxNow,
|
||||||
txNow: ring.txNow,
|
txNow: rates.txNow,
|
||||||
sessions,
|
sessions: matched.length,
|
||||||
rxSeries: ring.rx.some((v) => v > 0) ? ring.rx : emptySeries,
|
rxSeries: rates.rx,
|
||||||
txSeries: ring.tx,
|
txSeries: rates.tx,
|
||||||
bytes: total,
|
bytes: matched.reduce((sum, row) => sum + row.bytes, 0),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
clients.sort((a, b) => b.rxNow - a.rxNow)
|
clients.sort((a, b) => b.rxNow - a.rxNow)
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import {
|
|||||||
resetEngineForTests,
|
resetEngineForTests,
|
||||||
} from "./traffic-flow-engine.js"
|
} from "./traffic-flow-engine.js"
|
||||||
import { factsSnapshotForTests } from "./traffic-flow-facts.js"
|
import { factsSnapshotForTests } from "./traffic-flow-facts.js"
|
||||||
import { classifyInternetBrand, mapInternetBrand, resolveInternetDest } from "./traffic-flow-dest.js"
|
import { classifyInternetBrand, flowRateDirection, mapInternetBrand, resolveInternetDest } from "./traffic-flow-dest.js"
|
||||||
import { disableCatalogFetchForTests, resetFlowCatalogForTests } from "./traffic-flow-classify.js"
|
import { disableCatalogFetchForTests, resetFlowCatalogForTests } from "./traffic-flow-classify.js"
|
||||||
import {
|
import {
|
||||||
disableRipeEnqueueForTests,
|
disableRipeEnqueueForTests,
|
||||||
@@ -66,6 +66,11 @@ const topo: FlowTopology = {
|
|||||||
seedFlowTopologyForTests(topo)
|
seedFlowTopologyForTests(topo)
|
||||||
rememberServerIfaces(1, [{ name: "gre-client", ifindex: "2" }])
|
rememberServerIfaces(1, [{ name: "gre-client", ifindex: "2" }])
|
||||||
|
|
||||||
|
const publicFlow = { src: "95.167.1.10", dst: "8.8.8.8", inIface: "2", outIface: "ether1" }
|
||||||
|
assert.equal(flowRateDirection(1, publicFlow, topo), "tx")
|
||||||
|
assert.equal(flowRateDirection(1, { ...publicFlow, inIface: "ether1", outIface: "2" }, topo), "rx")
|
||||||
|
assert.equal(flowRateDirection(1, publicFlow, null), null, "Public transit has no inferred download or upload")
|
||||||
|
|
||||||
ingestParsedFlowsForServerForTests(1, [
|
ingestParsedFlowsForServerForTests(1, [
|
||||||
{
|
{
|
||||||
src: "95.167.1.10",
|
src: "95.167.1.10",
|
||||||
|
|||||||
@@ -4,6 +4,9 @@ import { classifyFlowDst, type FlowClassification } from "./traffic-flow-classif
|
|||||||
import { resolveFlowIp } from "./traffic-flow-geoip.js"
|
import { resolveFlowIp } from "./traffic-flow-geoip.js"
|
||||||
import { canonicalFactIface } from "./traffic-flow-ifindex.js"
|
import { canonicalFactIface } from "./traffic-flow-ifindex.js"
|
||||||
import {
|
import {
|
||||||
|
canonicalIp,
|
||||||
|
isNonPublicIp,
|
||||||
|
isUnspecifiedIp,
|
||||||
resolveFlowEndpoints,
|
resolveFlowEndpoints,
|
||||||
type FlowEndpoints,
|
type FlowEndpoints,
|
||||||
type InternetDestCtx,
|
type InternetDestCtx,
|
||||||
@@ -15,6 +18,28 @@ import {
|
|||||||
type FlowTopology,
|
type FlowTopology,
|
||||||
} from "./traffic-flow-topology.js"
|
} from "./traffic-flow-topology.js"
|
||||||
|
|
||||||
|
/** Aggregate DL/UL is relative to the exporter's WAN or its bound clients. */
|
||||||
|
export function flowRateDirection(
|
||||||
|
serverId: number,
|
||||||
|
row: { src: string; dst: string; inIface: string; outIface: string },
|
||||||
|
topo: FlowTopology | null,
|
||||||
|
exporterHost?: string,
|
||||||
|
): "rx" | "tx" | null {
|
||||||
|
const ingress = canonicalFactIface(serverId, row.inIface)
|
||||||
|
const egress = canonicalFactIface(serverId, row.outIface)
|
||||||
|
const wan = topo?.wanIfaces.get(serverId)
|
||||||
|
const clients = topo?.clientIfaces.get(serverId)
|
||||||
|
const download = Boolean(wan?.has(ingress) || clients?.has(egress))
|
||||||
|
const upload = Boolean(wan?.has(egress) || clients?.has(ingress))
|
||||||
|
if (download !== upload) return download ? "rx" : "tx"
|
||||||
|
if (isUnspecifiedIp(row.src) || isUnspecifiedIp(row.dst)) return null
|
||||||
|
const host = canonicalIp(exporterHost)
|
||||||
|
if (host && canonicalIp(row.src) === host && canonicalIp(row.dst) !== host) return "tx"
|
||||||
|
if (host && canonicalIp(row.dst) === host && canonicalIp(row.src) !== host) return "rx"
|
||||||
|
const srcLocal = isNonPublicIp(row.src), dstLocal = isNonPublicIp(row.dst)
|
||||||
|
return srcLocal === dstLocal ? null : srcLocal ? "tx" : "rx"
|
||||||
|
}
|
||||||
|
|
||||||
export interface InternetDestMeta {
|
export interface InternetDestMeta {
|
||||||
dest: string
|
dest: string
|
||||||
ripe: FlowIpMeta | null
|
ripe: FlowIpMeta | null
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ const dependencies:Record<string,unknown>={
|
|||||||
"./traffic-flow-ifaces.js":{maybeRefreshIfaces:async()=>{}},
|
"./traffic-flow-ifaces.js":{maybeRefreshIfaces:async()=>{}},
|
||||||
"./traffic-flow-ifindex.js":{canonicalFactIface:(_server:number,iface:string)=>iface},
|
"./traffic-flow-ifindex.js":{canonicalFactIface:(_server:number,iface:string)=>iface},
|
||||||
"./traffic-flow-facts-filter.js":{shouldWriteFlowFact:()=>true},
|
"./traffic-flow-facts-filter.js":{shouldWriteFlowFact:()=>true},
|
||||||
"./traffic-flow-dest.js":{resolveInternetDest:()=>({dest:"",ripe:null,classified:{category:"web",service:"https"},country:"XX",asn:0})},
|
"./traffic-flow-dest.js":{flowRateDirection:()=>"tx",resolveInternetDest:()=>({dest:"",ripe:null,classified:{category:"web",service:"https"},country:"XX",asn:0})},
|
||||||
"./traffic-flow-topology.js":{peekFlowTopology:()=>({}),peekServerCatalog:()=>({byId:new Map([[1,{type:"router"}]])}),getServerCatalog:()=>{throw Error("unexpected catalog SQL")},loadFlowTopology:()=>{throw Error("unexpected topology SQL")}},
|
"./traffic-flow-topology.js":{peekFlowTopology:()=>({}),peekServerCatalog:()=>({byId:new Map([[1,{type:"router"}]])}),getServerCatalog:()=>{throw Error("unexpected catalog SQL")},loadFlowTopology:()=>{throw Error("unexpected topology SQL")}},
|
||||||
"./traffic-flow-facts.js":{
|
"./traffic-flow-facts.js":{
|
||||||
bumpFlowFact:live.bump,hasPendingFlowFact:live.has,factsPendingSize:()=>live.size,
|
bumpFlowFact:live.bump,hasPendingFlowFact:live.has,factsPendingSize:()=>live.size,
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ import { maybeRefreshIfaces } from "./traffic-flow-ifaces.js"
|
|||||||
import { canonicalFactIface } from "./traffic-flow-ifindex.js"
|
import { canonicalFactIface } from "./traffic-flow-ifindex.js"
|
||||||
import { shouldWriteFlowFact } from "./traffic-flow-facts-filter.js"
|
import { shouldWriteFlowFact } from "./traffic-flow-facts-filter.js"
|
||||||
import { canonicalIp } from "./traffic-flow-ip.js"
|
import { canonicalIp } from "./traffic-flow-ip.js"
|
||||||
import { resolveInternetDest } from "./traffic-flow-dest.js"
|
import { flowRateDirection, resolveInternetDest } from "./traffic-flow-dest.js"
|
||||||
import {
|
import {
|
||||||
getServerCatalog,
|
getServerCatalog,
|
||||||
loadFlowTopology,
|
loadFlowTopology,
|
||||||
@@ -315,12 +315,12 @@ function bumpTick(key: string, inBytes: number, outBytes: number): void {
|
|||||||
tickAccum.set(key, prev)
|
tickAccum.set(key, prev)
|
||||||
}
|
}
|
||||||
|
|
||||||
function prepareFlowTicks(serverId:number,flow:ParsedFlow):Array<{key:string;inBytes:number;outBytes:number}> {
|
function prepareFlowTicks(serverId:number,flow:ParsedFlow,direction:"rx"|"tx"|null):Array<{key:string;inBytes:number;outBytes:number}> {
|
||||||
const plane=classifyFlowPlaneLite(flow)
|
const plane=classifyFlowPlaneLite(flow)
|
||||||
if(plane==="mgmt")return []
|
if(plane==="mgmt")return []
|
||||||
return [{key:ringKey(serverId,plane==="overlay"?RING_OVERLAY:plane==="client_mesh"?RING_MESH:RING_PAYLOAD),inBytes:flow.bytes,outBytes:0},
|
return [{key:ringKey(serverId,plane==="overlay"?RING_OVERLAY:plane==="client_mesh"?RING_MESH:RING_PAYLOAD),inBytes:direction==="rx"?flow.bytes:0,outBytes:direction==="tx"?flow.bytes:0},
|
||||||
...(flow.inIface?[{key:ringKey(serverId,flow.inIface),inBytes:flow.bytes,outBytes:0}]:[]),
|
...(flow.inIface?[{key:ringKey(serverId,flow.inIface),inBytes:flow.bytes,outBytes:0}]:[]),
|
||||||
...(flow.outIface&&flow.outIface!==flow.inIface?[{key:ringKey(serverId,flow.outIface),inBytes:0,outBytes:flow.bytes}]:[])]
|
...(flow.outIface?[{key:ringKey(serverId,flow.outIface),inBytes:0,outBytes:flow.bytes}]:[])]
|
||||||
}
|
}
|
||||||
|
|
||||||
function emptyRing(): { inBps: number[]; outBps: number[] } {
|
function emptyRing(): { inBps: number[]; outBps: number[] } {
|
||||||
@@ -426,7 +426,8 @@ export function queueParsedFlows(serverId: number, flows: ParsedFlowInput[]): vo
|
|||||||
const topo = peekFlowTopology(), catalog = peekServerCatalog()
|
const topo = peekFlowTopology(), catalog = peekServerCatalog()
|
||||||
if (!topo) refreshColdTopology()
|
if (!topo) refreshColdTopology()
|
||||||
if (!catalog) refreshColdCatalog()
|
if (!catalog) refreshColdCatalog()
|
||||||
const serverType = catalog?.byId.get(serverId)?.type
|
const server = catalog?.byId.get(serverId)
|
||||||
|
const serverType = server?.type
|
||||||
for (const raw of flows) {
|
for (const raw of flows) {
|
||||||
const flow = normalizeParsedFlow(raw)
|
const flow = normalizeParsedFlow(raw)
|
||||||
const destMeta = resolveInternetDest({src:flow.src,dst:flow.dst,proto:flow.proto,srcPort:flow.srcPort,dstPort:flow.dstPort,
|
const destMeta = resolveInternetDest({src:flow.src,dst:flow.dst,proto:flow.proto,srcPort:flow.srcPort,dstPort:flow.dstPort,
|
||||||
@@ -440,7 +441,7 @@ export function queueParsedFlows(serverId: number, flows: ParsedFlowInput[]): vo
|
|||||||
natSrc:flow.natSrc,natDst:flow.natDst,natSrcPort:flow.natSrcPort,natDstPort:flow.natDstPort})?
|
natSrc:flow.natSrc,natDst:flow.natDst,natSrcPort:flow.natSrcPort,natDstPort:flow.natDstPort})?
|
||||||
{serverId,bucketAt:hourAt,iface:canonicalFactIface(serverId,flow.inIface),country:country||"XX",service:classified.service,
|
{serverId,bucketAt:hourAt,iface:canonicalFactIface(serverId,flow.inIface),country:country||"XX",service:classified.service,
|
||||||
asn:destMeta.asn,bytes:flow.bytes,packets:flow.packets}:null
|
asn:destMeta.asn,bytes:flow.bytes,packets:flow.packets}:null
|
||||||
const ticks=prepareFlowTicks(serverId,flow),rollupCacheKey=rollupKey(serverId,bucketAt)
|
const ticks=prepareFlowTicks(serverId,flow,flowRateDirection(serverId,flow,topo,server?.host)),rollupCacheKey=rollupKey(serverId,bucketAt)
|
||||||
if(!admitAggregateRecord(rollupCacheKey,flow,dims,fact,ticks,observedAt))continue
|
if(!admitAggregateRecord(rollupCacheKey,flow,dims,fact,ticks,observedAt))continue
|
||||||
for(const tick of ticks)bumpTick(tick.key,tick.inBytes,tick.outBytes)
|
for(const tick of ticks)bumpTick(tick.key,tick.inBytes,tick.outBytes)
|
||||||
bumpRollup(serverId,bucketAt,flow,flow.bytes,flow.packets,rollupCacheKey)
|
bumpRollup(serverId,bucketAt,flow,flow.bytes,flow.packets,rollupCacheKey)
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ try{
|
|||||||
await pool.query("INSERT INTO servers(id,name,host) VALUES(1,'visible','192.0.2.1'),(2,'FORBIDDEN_HIDDEN_SERVER','192.0.2.2')")
|
await pool.query("INSERT INTO servers(id,name,host) VALUES(1,'visible','192.0.2.1'),(2,'FORBIDDEN_HIDDEN_SERVER','192.0.2.2')")
|
||||||
const bucket=new Date(Date.now()-60000);await ensurePartitionFor(pool,'flow_buckets','day',bucket)
|
const bucket=new Date(Date.now()-60000);await ensurePartitionFor(pool,'flow_buckets','day',bucket)
|
||||||
await pool.query("INSERT INTO flow_buckets(server_id,bucket_at,src,dst,proto,src_port,dst_port,bytes,packets,in_iface) VALUES(1,$1,'198.18.1.1','8.8.8.8',6,1,443,100,1,'ether1'),(2,$1,'198.18.2.1','8.8.8.8',6,1,443,999,1,'FORBIDDEN_HIDDEN_IFACE')",[bucket])
|
await pool.query("INSERT INTO flow_buckets(server_id,bucket_at,src,dst,proto,src_port,dst_port,bytes,packets,in_iface) VALUES(1,$1,'198.18.1.1','8.8.8.8',6,1,443,100,1,'ether1'),(2,$1,'198.18.2.1','8.8.8.8',6,1,443,999,1,'FORBIDDEN_HIDDEN_IFACE')",[bucket])
|
||||||
const access=await createMcpConnection(mcpConnectionCreateSchema.parse({name:'owned HTTP',mode:'observer',permissions:['mm:traffic:read'],expiresAt:new Date(Date.now()+600000).toISOString(),scope:{serverIds:[1],operationIds:['traffic.flow.talkers.read','traffic.flow.monthly.read','traffic.flow.live.read'],allowGlobal:false},limits:{callsPerMinute:240}}),actor)
|
const access=await createMcpConnection(mcpConnectionCreateSchema.parse({name:'owned HTTP',mode:'observer',permissions:['mm:traffic:read'],expiresAt:new Date(Date.now()+600000).toISOString(),scope:{serverIds:[1],operationIds:['traffic.flow.talkers.read','traffic.flow.monthly.read','traffic.flow.live.read','traffic.flow.analytics.read'],allowGlobal:false},limits:{callsPerMinute:240}}),actor)
|
||||||
resetFlowRingsForTests();disableRipeEnqueueForTests()
|
resetFlowRingsForTests();disableRipeEnqueueForTests()
|
||||||
const collectorQuality=createFlowIngestQuality();collectorQuality.reject(987654,987,'aggregate-capacity')
|
const collectorQuality=createFlowIngestQuality();collectorQuality.reject(987654,987,'aggregate-capacity')
|
||||||
// Synthetic quality goes through the actual validated heartbeat receiver;
|
// Synthetic quality goes through the actual validated heartbeat receiver;
|
||||||
@@ -146,15 +146,22 @@ try{
|
|||||||
await pool.query(`INSERT INTO traffic_samples(server_id,interface_name,sampled_at,rx_bps,tx_bps,rx_bytes,tx_bytes)
|
await pool.query(`INSERT INTO traffic_samples(server_id,interface_name,sampled_at,rx_bps,tx_bps,rx_bytes,tx_bytes)
|
||||||
SELECT 1,'gre-test',$1::timestamptz + n * interval '1 millisecond',n,2*n,3*n,4*n FROM generate_series(1,50010) n`,[counterStart])
|
SELECT 1,'gre-test',$1::timestamptz + n * interval '1 millisecond',n,2*n,3*n,4*n FROM generate_series(1,50010) n`,[counterStart])
|
||||||
await pool.query(`INSERT INTO flow_buckets(server_id,bucket_at,src,dst,proto,src_port,dst_port,bytes,packets,in_iface)
|
await pool.query(`INSERT INTO flow_buckets(server_id,bucket_at,src,dst,proto,src_port,dst_port,bytes,packets,in_iface)
|
||||||
VALUES(1,$1,'198.18.1.3','8.8.8.8',6,3,443,50,1,'gre-test')`,[bucket])
|
VALUES(1,$1,'8.8.8.8','198.18.1.1',6,443,1,50,1,'gre-test')`,[bucket])
|
||||||
applyHeartbeatForTests({...heartbeat,dataQuality:createFlowIngestQuality().snapshot()})
|
applyHeartbeatForTests({...heartbeat,dataQuality:createFlowIngestQuality().snapshot()})
|
||||||
try {
|
try {
|
||||||
const analytics = await fetch(endpoint+'/api/traffic/flow/analytics?range=5m&serverId=1')
|
const analytics = await fetch(endpoint+'/api/traffic/flow/analytics?range=5m&serverId=1')
|
||||||
assert.equal(analytics.status,200,await analytics.clone().text())
|
assert.equal(analytics.status,200,await analytics.clone().text())
|
||||||
const shortReport = await analytics.json() as {bpsWire:number;bytesWire:number;sourceWindow?:unknown}
|
const shortReport = await analytics.json() as {bpsWire:number;bytesWire:number;sourceWindow?:unknown;rxSeries:number[];txSeries:number[]}
|
||||||
assert.equal(shortReport.bpsWire,150030)
|
assert.equal(shortReport.bpsWire,150030)
|
||||||
assert.equal(shortReport.bytesWire,350070)
|
assert.equal(shortReport.bytesWire,350070)
|
||||||
assert.equal(shortReport.sourceWindow,undefined)
|
assert.equal(shortReport.sourceWindow,undefined)
|
||||||
|
const report = await client.callTool({name:'mm_netflow_analytics_report_get',arguments:{serverId:1,minutes:5}})
|
||||||
|
assert.ok(!report.isError,JSON.stringify(report))
|
||||||
|
const mcp = (report.structuredContent as {result:{analytics:{rxSeries:number[];txSeries:number[]}}}).result.analytics
|
||||||
|
for (const series of [shortReport,mcp]) {
|
||||||
|
assert.equal(series.rxSeries.reduce((sum,value)=>sum+value,0),50*8/60/1e6)
|
||||||
|
assert.equal(series.txSeries.reduce((sum,value)=>sum+value,0),100*8/60/1e6)
|
||||||
|
}
|
||||||
} finally {
|
} finally {
|
||||||
applyHeartbeatForTests(heartbeat)
|
applyHeartbeatForTests(heartbeat)
|
||||||
invalidateFlowAnalyticsCache()
|
invalidateFlowAnalyticsCache()
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import { ensurePartitionFor } from "../db/partitions.js"
|
|||||||
import { createMcpConnection, authenticateMcpToken, setConnectionStatus } from "../modules/mcp/store.js"
|
import { createMcpConnection, authenticateMcpToken, setConnectionStatus } from "../modules/mcp/store.js"
|
||||||
import { invokeMcpTool } from "../modules/mcp/runtime.js"
|
import { invokeMcpTool } from "../modules/mcp/runtime.js"
|
||||||
import { buildFlowAnalytics, invalidateFlowAnalyticsCache } from "../services/traffic-flow-analytics.js"
|
import { buildFlowAnalytics, invalidateFlowAnalyticsCache } from "../services/traffic-flow-analytics.js"
|
||||||
|
import { FlowSourceWindowTooLarge } from "../services/traffic-flow-read-window.js"
|
||||||
import { loadFlowTopology, invalidateFlowCatalogCache } from "../services/traffic-flow-topology.js"
|
import { loadFlowTopology, invalidateFlowCatalogCache } from "../services/traffic-flow-topology.js"
|
||||||
import { resetFlowRingsForTests as clearPendingFlows } from "../services/traffic-flow-ingest.js"
|
import { resetFlowRingsForTests as clearPendingFlows } from "../services/traffic-flow-ingest.js"
|
||||||
import { disableRipeEnqueueForTests, resetRipeCacheForTests } from "../services/traffic-flow-ripe.js"
|
import { disableRipeEnqueueForTests, resetRipeCacheForTests } from "../services/traffic-flow-ripe.js"
|
||||||
@@ -53,7 +54,7 @@ export async function verifyMcpFlowAnalytics(actor: AuthUser) {
|
|||||||
await pool.query("DELETE FROM flow_buckets WHERE server_id=110 AND in_iface='analytics-duplicate-in'")
|
await pool.query("DELETE FROM flow_buckets WHERE server_id=110 AND in_iface='analytics-duplicate-in'")
|
||||||
await assert.rejects(read({userId:users[1]})); await assert.rejects(read({userId:users[2]}))
|
await assert.rejects(read({userId:users[1]})); await assert.rejects(read({userId:users[2]}))
|
||||||
await assert.rejects(read({serverId:111})); await assert.rejects(read({minutes:1441})); await assert.rejects(read({interface:"__all__"})); await assert.rejects(read({skipHeavy:true}))
|
await assert.rejects(read({serverId:111})); await assert.rejects(read({minutes:1441})); await assert.rejects(read({interface:"__all__"})); await assert.rejects(read({skipHeavy:true}))
|
||||||
await assert.rejects(buildFlowAnalytics({serverId:110,minutes:5},{serverIds:[110],maxRows:1,authorize:async()=>{}}),/предел/)
|
await assert.rejects(buildFlowAnalytics({serverId:110,minutes:5},{serverIds:[110],maxRows:1,authorize:async()=>{}}),FlowSourceWindowTooLarge)
|
||||||
const cancelled = new AbortController(); cancelled.abort(); await assert.rejects(invokeMcpTool(principal,"mm_netflow_analytics_report_get",{serverId:110},cancelled.signal))
|
const cancelled = new AbortController(); cancelled.abort(); await assert.rejects(invokeMcpTool(principal,"mm_netflow_analytics_report_get",{serverId:110},cancelled.signal))
|
||||||
const duringQuery = (match: string, action: () => Promise<unknown>) =>
|
const duringQuery = (match: string, action: () => Promise<unknown>) =>
|
||||||
duringFlowSourceQuery(pool, match, action, () => assert.rejects(read()))
|
duringFlowSourceQuery(pool, match, action, () => assert.rejects(read()))
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import { ensurePartitionFor } from "../db/partitions.js"
|
|||||||
import { createMcpConnection, authenticateMcpToken, setConnectionStatus } from "../modules/mcp/store.js"
|
import { createMcpConnection, authenticateMcpToken, setConnectionStatus } from "../modules/mcp/store.js"
|
||||||
import { invokeMcpTool } from "../modules/mcp/runtime.js"
|
import { invokeMcpTool } from "../modules/mcp/runtime.js"
|
||||||
import { buildFlowMapHops, invalidateFlowMapHopsCache } from "../services/traffic-flow-map-hops.js"
|
import { buildFlowMapHops, invalidateFlowMapHopsCache } from "../services/traffic-flow-map-hops.js"
|
||||||
|
import { FlowSourceWindowTooLarge } from "../services/traffic-flow-read-window.js"
|
||||||
import { invalidateFlowCatalogCache } from "../services/traffic-flow-topology.js"
|
import { invalidateFlowCatalogCache } from "../services/traffic-flow-topology.js"
|
||||||
import { resetFlowRingsForTests, ingestParsedFlowsForServerForTests } from "../services/traffic-flow-ingest.js"
|
import { resetFlowRingsForTests, ingestParsedFlowsForServerForTests } from "../services/traffic-flow-ingest.js"
|
||||||
import { disableRipeEnqueueForTests, resetRipeCacheForTests } from "../services/traffic-flow-ripe.js"
|
import { disableRipeEnqueueForTests, resetRipeCacheForTests } from "../services/traffic-flow-ripe.js"
|
||||||
@@ -57,7 +58,7 @@ export async function verifyMcpFlowMap(actor: AuthUser) {
|
|||||||
ingestParsedFlowsForServerForTests(113,[{src:"198.18.240.6",dst:"8.8.4.4",proto:6,srcPort:1,dstPort:443,bytes:999,packets:1,inIface:"NEVER_MAP_PENDING",outIface:""}])
|
ingestParsedFlowsForServerForTests(113,[{src:"198.18.240.6",dst:"8.8.4.4",proto:6,srcPort:1,dstPort:443,bytes:999,packets:1,inIface:"NEVER_MAP_PENDING",outIface:""}])
|
||||||
assert.equal((await read()).map.totalBytes,600)
|
assert.equal((await read()).map.totalBytes,600)
|
||||||
for (const input of [{userId:users[2]},{userId:users[3]},{serverId:113},{minutes:1441},{interface:"__all__"},{minSharePct:0},{nestedLimit:51}]) await assert.rejects(read(input))
|
for (const input of [{userId:users[2]},{userId:users[3]},{serverId:113},{minutes:1441},{interface:"__all__"},{minSharePct:0},{nestedLimit:51}]) await assert.rejects(read(input))
|
||||||
await assert.rejects(buildFlowMapHops({serverId:112,minutes:5},{serverIds:[112],maxRows:1,authorize:async()=>{}}),/предел/)
|
await assert.rejects(buildFlowMapHops({serverId:112,minutes:5},{serverIds:[112],maxRows:1,authorize:async()=>{}}),FlowSourceWindowTooLarge)
|
||||||
const cancelled=new AbortController();cancelled.abort();await assert.rejects(invokeMcpTool(principal,"mm_netflow_map_hops_get",{serverId:112},cancelled.signal))
|
const cancelled=new AbortController();cancelled.abort();await assert.rejects(invokeMcpTool(principal,"mm_netflow_map_hops_get",{serverId:112},cancelled.signal))
|
||||||
const duringQuery = (match: string, action: () => Promise<unknown>) =>
|
const duringQuery = (match: string, action: () => Promise<unknown>) =>
|
||||||
duringFlowSourceQuery(pool, match, action, () => assert.rejects(read()))
|
duringFlowSourceQuery(pool, match, action, () => assert.rejects(read()))
|
||||||
|
|||||||
@@ -475,6 +475,7 @@ export function FlowAnalyticsDetail({
|
|||||||
|
|
||||||
{analytics && <>
|
{analytics && <>
|
||||||
{analytics.sourceWindow && <p role="status" className="mb-3 text-sm text-muted-foreground">Данные за последние {analytics.sourceWindow.effectiveMinutes} мин из запрошенных {analytics.sourceWindow.requestedMinutes} мин.</p>}
|
{analytics.sourceWindow && <p role="status" className="mb-3 text-sm text-muted-foreground">Данные за последние {analytics.sourceWindow.effectiveMinutes} мин из запрошенных {analytics.sourceWindow.requestedMinutes} мин.</p>}
|
||||||
|
<p className="mb-3 text-sm text-muted-foreground">График RX/TX показывает потоки с известным направлением. Общий объём включает также транзит с неопределённым направлением.</p>
|
||||||
<TrafficRxTxChart
|
<TrafficRxTxChart
|
||||||
rx={analytics?.rxSeries ?? card?.rxSeries ?? []}
|
rx={analytics?.rxSeries ?? card?.rxSeries ?? []}
|
||||||
tx={analytics?.txSeries ?? card?.txSeries ?? []}
|
tx={analytics?.txSeries ?? card?.txSeries ?? []}
|
||||||
|
|||||||
@@ -39,6 +39,12 @@ test("map Flow envelope retains zeros and refuses missing metadata and contradic
|
|||||||
assert.throws(()=>networkMapFlowSchema.parse({...empty,totalBytes:undefined}))
|
assert.throws(()=>networkMapFlowSchema.parse({...empty,totalBytes:undefined}))
|
||||||
assert.throws(()=>networkMapFlowSchema.parse({...empty,namedBytes:1}))
|
assert.throws(()=>networkMapFlowSchema.parse({...empty,namedBytes:1}))
|
||||||
assert.throws(()=>networkMapFlowSchema.parse({...empty,rangeMinutes:10}))
|
assert.throws(()=>networkMapFlowSchema.parse({...empty,rangeMinutes:10}))
|
||||||
|
const shorter={...empty,rangeMinutes:2,windowSec:120,sourceWindow:{requestedMinutes:5,effectiveMinutes:2}}
|
||||||
|
assert.equal(networkMapFlowSchema.parse(shorter).rangeMinutes,2)
|
||||||
|
assert.throws(()=>networkMapFlowSchema.parse({...shorter,sourceWindow:undefined}))
|
||||||
|
assert.throws(()=>networkMapFlowSchema.parse({...shorter,sourceWindow:{requestedMinutes:15,effectiveMinutes:2}}))
|
||||||
|
assert.throws(()=>networkMapFlowSchema.parse({...shorter,rangeMinutes:1,windowSec:60}))
|
||||||
|
assert.throws(()=>networkMapFlowSchema.parse({...shorter,windowSec:300}))
|
||||||
})
|
})
|
||||||
test("map DNS matches exactly requested names and accepts explicit unresolved null",()=>{
|
test("map DNS matches exactly requested names and accepts explicit unresolved null",()=>{
|
||||||
assert.deepEqual(validateNetworkMapDns({results:{"router.example":null}},["router.example"]),{"router.example":null})
|
assert.deepEqual(validateNetworkMapDns({results:{"router.example":null}},["router.example"]),{"router.example":null})
|
||||||
|
|||||||
@@ -27,7 +27,13 @@ export function validateNetworkMapSnapshot(servers:unknown,gre:unknown,probes:un
|
|||||||
|
|
||||||
import {flowMapHopsDtoSchema} from "@mmapp/contracts/traffic-flow"
|
import {flowMapHopsDtoSchema} from "@mmapp/contracts/traffic-flow"
|
||||||
import {isIpv4String} from "./gre-endpoint-resolve"
|
import {isIpv4String} from "./gre-endpoint-resolve"
|
||||||
export const networkMapFlowSchema=flowMapHopsDtoSchema.required().refine(data=>data.rangeMinutes===5&&data.namedBytes<=data.totalBytes&&data.unclassifiedBytes<=data.totalBytes)
|
export const networkMapFlowSchema = flowMapHopsDtoSchema.required().partial({ sourceWindow: true }).refine(data =>
|
||||||
|
(data.sourceWindow
|
||||||
|
? data.sourceWindow.requestedMinutes === 5 && data.sourceWindow.effectiveMinutes === data.rangeMinutes
|
||||||
|
: data.rangeMinutes === 5) &&
|
||||||
|
data.windowSec === data.rangeMinutes * 60 &&
|
||||||
|
data.namedBytes <= data.totalBytes && data.unclassifiedBytes <= data.totalBytes
|
||||||
|
)
|
||||||
export function validateNetworkMapDns(raw:unknown,hosts:string[]){
|
export function validateNetworkMapDns(raw:unknown,hosts:string[]){
|
||||||
const data=z.object({results:z.record(z.string(),z.string().refine(isIpv4String).nullable())}).parse(raw)
|
const data=z.object({results:z.record(z.string(),z.string().refine(isIpv4String).nullable())}).parse(raw)
|
||||||
const requested=new Set(hosts.map(host=>host.toLowerCase()))
|
const requested=new Set(hosts.map(host=>host.toLowerCase()))
|
||||||
|
|||||||
@@ -5,12 +5,13 @@ test.beforeEach(async({page})=>{await page.route("**/health",r=>r.fulfill({json:
|
|||||||
const server={id:1,name:"Router",host:"192.0.2.1",type:"home-router",country:"RU",enabled:true,status:"online"}
|
const server={id:1,name:"Router",host:"192.0.2.1",type:"home-router",country:"RU",enabled:true,status:"online"}
|
||||||
for(const malformed of [false,true])test("Карта: NetFlow отказ и повтор "+malformed,async({page})=>{
|
for(const malformed of [false,true])test("Карта: NetFlow отказ и повтор "+malformed,async({page})=>{
|
||||||
let failing=true
|
let failing=true
|
||||||
await page.route("**/api/**",r=>{const p=new URL(r.request().url()).pathname;return r.fulfill(p===flowPath?(failing?(malformed?{json:{}}:{status:503,json:{error:"NetFlow недоступен"}}):{json:empty}):{json:p==="/api/servers"?[server]:p==="/api/filters/gre-tunnels"?{tunnels:[],failures:[]}:p==="/api/uptime/speed-probes"?{probes:[]}:p==="/api/auth/config"?{required:false}:{}})})
|
const recovered=malformed?{...empty,rangeMinutes:2,windowSec:120,sourceWindow:{requestedMinutes:5,effectiveMinutes:2}}:empty
|
||||||
|
await page.route("**/api/**",r=>{const p=new URL(r.request().url()).pathname;return r.fulfill(p===flowPath?(failing?(malformed?{json:{}}:{status:503,json:{error:"NetFlow недоступен"}}):{json:recovered}):{json:p==="/api/servers"?[server]:p==="/api/filters/gre-tunnels"?{tunnels:[],failures:[]}:p==="/api/uptime/speed-probes"?{probes:[]}:p==="/api/auth/config"?{required:false}:{}})})
|
||||||
await page.goto("/network-map")
|
await page.goto("/network-map")
|
||||||
await expect(page.getByRole("alert").filter({hasText:"Первоначальная загрузка NetFlow"})).toBeVisible()
|
await expect(page.getByRole("alert").filter({hasText:"Первоначальная загрузка NetFlow"})).toBeVisible()
|
||||||
await expect(page.getByText("Данные NetFlow неизвестны",{exact:true})).toBeVisible()
|
await expect(page.getByText("Данные NetFlow неизвестны",{exact:true})).toBeVisible()
|
||||||
failing=false;await page.getByRole("button",{name:"Обновить",exact:true}).click()
|
failing=false;await page.getByRole("button",{name:"Обновить",exact:true}).click()
|
||||||
await expect(page.getByText(/NetFlow · 5 мин · ответ/)).toContainText("приёмник выключен")
|
await expect(page.getByText(malformed?/NetFlow · 2 мин из 5 запрошенных · ответ/:/NetFlow · 5 мин · ответ/)).toContainText("приёмник выключен")
|
||||||
await expect(page.getByRole("alert").filter({hasText:"NetFlow:"})).toHaveCount(0)
|
await expect(page.getByRole("alert").filter({hasText:"NetFlow:"})).toHaveCount(0)
|
||||||
})
|
})
|
||||||
test("Карта: NetFlow сохраняет сервис при фоновом сбое",async({page})=>{
|
test("Карта: NetFlow сохраняет сервис при фоновом сбое",async({page})=>{
|
||||||
|
|||||||
Reference in new issue
Block a user