Public changes compared with the previous published export: 89 files changed. Affected areas: - backend/app: 21 files - dependencies: 5 files - deployment and CI: 6 files - documentation: 2 files - frontend: 3 files - frontend/src: 20 files - project files: 1 file - tests: 30 files - unraid: 1 file Changed files: - Updated: ".env.example" - Updated: "Dockerfile.unraid" - Updated: "README.md" - Updated: "backend/Dockerfile" - Added: "backend/app/alerts.py" - Updated: "backend/app/auth.py" - Added: "backend/app/backups.py" - Updated: "backend/app/config_io.py" - Updated: "backend/app/demo.py" - Updated: "backend/app/discovery.py" - Updated: "backend/app/discovery_store.py" - Updated: "backend/app/docker_discovery.py" - Updated: "backend/app/events.py" - Updated: "backend/app/evidence.py" - Updated: "backend/app/health.py" - Updated: "backend/app/incidents.py" - Added: "backend/app/loops.py" - Updated: "backend/app/main.py" - Updated: "backend/app/models.py" - Updated: "backend/app/observation.py" - Updated: "backend/app/probes.py" - Added: "backend/app/response_cache.py" - Updated: "backend/app/scheduler.py" - Updated: "backend/app/semantic.py" - Updated: "backend/app/store.py" - Updated: "backend/pyproject.toml" - Updated: "backend/tests/test_api.py" - Updated: "backend/tests/test_config_io.py" - Updated: "backend/tests/test_demo.py" - Updated: "backend/tests/test_discovery_v120.py" - Updated: "backend/tests/test_health.py" - Updated: "backend/tests/test_probes.py" - Updated: "backend/tests/test_scheduler.py" - Updated: "backend/tests/test_v130_probe_reachability.py" - Updated: "backend/tests/test_v160_evidence_changes.py" - Added: "backend/tests/test_v163_alerts.py" - Added: "backend/tests/test_v163_backups.py" - Added: "backend/tests/test_v163_data_integrity.py" - Added: "backend/tests/test_v163_efficiency.py" - Added: "backend/tests/test_v163_health_performance.py" - Added: "backend/tests/test_v163_loops.py" - Added: "backend/tests/test_v163_management.py" - Added: "backend/tests/test_v163_realtime.py" - Added: "backend/tests/test_v163_security.py" - Added: "backend/tests/test_v163_semantic_etag.py" - Added: "compose.demo.yaml" - Updated: "compose.yaml" - Added: "docker-compose.broker.yml" - Updated: "docker-compose.yml" - Updated: "docs/ARCHITECTURE.md" - Added: "frontend/e2e/a11y.spec.ts" - Updated: "frontend/e2e/demo.spec.ts" - Updated: "frontend/index.html" - Updated: "frontend/nginx.conf" - Updated: "frontend/package-lock.json" - Updated: "frontend/package.json" - Updated: "frontend/playwright.config.ts" - Updated: "frontend/src/App.tsx" - Updated: "frontend/src/LivingEdge.tsx" - Added: "frontend/src/activityView.test.ts" - Added: "frontend/src/activityView.ts" - Updated: "frontend/src/api.ts" - Added: "frontend/src/apiAuth.test.ts" - Added: "frontend/src/components/ActionsMenu.tsx" - Added: "frontend/src/components/ConfirmDialog.test.tsx" - Added: "frontend/src/components/ConfirmDialog.tsx" - Added: "frontend/src/components/StatusIcon.tsx" - Updated: "frontend/src/demo/DemoWalkthrough.test.ts" - Updated: "frontend/src/demo/DemoWalkthrough.tsx" - Added: "frontend/src/elk-worker-url.d.ts" - Added: "frontend/src/labels.ts" - Updated: "frontend/src/main.tsx" - Added: "frontend/src/realtime/refreshPlan.test.ts" - Added: "frontend/src/realtime/refreshPlan.ts" - Updated: "frontend/src/realtime/useRealtimeEvents.ts" - Added: "frontend/src/routing/urlState.test.ts" - Added: "frontend/src/routing/urlState.ts" - Updated: "frontend/src/styles.css" - Added: "frontend/src/topology/GraphListView.test.tsx" - Added: "frontend/src/topology/GraphListView.tsx" - Updated: "frontend/src/topology/ServiceNode.tsx" - Updated: "frontend/src/topology/TopologyCommandBar.tsx" - Added: "frontend/src/topology/semanticGraph.test.ts" - Updated: "frontend/src/topology/semanticGraph.ts" - Added: "frontend/src/topologyLayout.test.ts" - Updated: "frontend/src/topologyLayout.ts" - Updated: "package-lock.json" - Updated: "package.json" - Updated: "unraid/my-servicemap.xml" Export provenance/manifests refreshed; excluded from the change summary. Publish curated ServiceMap source from af46f684e468dffd3a5190e28d3b572d4c26bfd7
300 lines
11 KiB
TypeScript
300 lines
11 KiB
TypeScript
import { MarkerType, type Edge } from "@xyflow/react";
|
|
|
|
import type { Criticality, HealthStatus, SemanticTopology } from "../api";
|
|
import type { ServiceNode } from "./ServiceNode";
|
|
|
|
export type SemanticView = "domains" | "applications" | "components";
|
|
export type SemanticFilterStatus = "all" | "unresolved" | "problems" | HealthStatus;
|
|
|
|
/** Statuses that "Problems only" shows: anything needing attention. */
|
|
export const PROBLEM_STATUSES: ReadonlySet<string> = new Set(["down", "degraded", "recovering"]);
|
|
|
|
export function matchesStatusFilter(status: string, filter: SemanticFilterStatus): boolean {
|
|
if (filter === "all") return true;
|
|
if (filter === "unresolved") return status === "unknown" || status === "unmonitored";
|
|
if (filter === "problems") return PROBLEM_STATUSES.has(status);
|
|
return status === filter;
|
|
}
|
|
|
|
const CRITICALITY_RANK: Record<Criticality, number> = { low: 0, medium: 1, high: 2, critical: 3 };
|
|
|
|
export type ServiceFacts = { criticality: Criticality; flapping: boolean };
|
|
|
|
export type SemanticGraphOptions = {
|
|
/** Per-service facts the semantic projection does not carry. */
|
|
serviceFacts?: (serviceId: string) => ServiceFacts | undefined;
|
|
/**
|
|
* Extra filters (domain, application, environment, criticality, lifecycle,
|
|
* monitoring, group) evaluated per service. A domain or application node is
|
|
* shown when at least one of its components matches.
|
|
*/
|
|
serviceFilter?: (serviceId: string) => boolean;
|
|
};
|
|
|
|
export type SemanticGraph = {
|
|
nodes: ServiceNode[];
|
|
edges: Edge[];
|
|
/** Relations not drawn because of the per-level cap or the weight rule. */
|
|
hiddenEdgeCount: number;
|
|
};
|
|
|
|
/** Projects canonical services and relationships into the active semantic level. */
|
|
export function semanticTopologyGraph(
|
|
topology: SemanticTopology,
|
|
view: SemanticView,
|
|
scopeId: string | null,
|
|
incidentOnly: boolean,
|
|
search: string,
|
|
statusFilter: SemanticFilterStatus,
|
|
options: SemanticGraphOptions = {},
|
|
): SemanticGraph {
|
|
const facts = (ids: string[]): ServiceFacts => {
|
|
let criticality: Criticality = "low";
|
|
let flapping = false;
|
|
let known = false;
|
|
for (const id of ids) {
|
|
const item = options.serviceFacts?.(id);
|
|
if (!item) continue;
|
|
known = true;
|
|
if (CRITICALITY_RANK[item.criticality] > CRITICALITY_RANK[criticality]) criticality = item.criticality;
|
|
flapping ||= item.flapping;
|
|
}
|
|
return known ? { criticality, flapping } : { criticality: "medium", flapping: false };
|
|
};
|
|
const applicationById = new Map(
|
|
topology.applications.map((item) => [item.id, item]),
|
|
);
|
|
const componentById = new Map(
|
|
topology.components.map((item) => [item.service_id, item]),
|
|
);
|
|
const domainById = new Map(topology.domains.map((item) => [item.id, item]));
|
|
const scopedApplications =
|
|
view === "applications" && scopeId
|
|
? topology.applications.filter((item) => item.domain_id === scopeId)
|
|
: topology.applications;
|
|
const scopedComponents =
|
|
view === "components" && scopeId
|
|
? topology.components.filter((item) => item.application_id === scopeId)
|
|
: topology.components;
|
|
const isIncidentVisible = <
|
|
T extends { root_cause: boolean; affected: boolean },
|
|
>(
|
|
item: T,
|
|
) => !incidentOnly || item.root_cause || item.affected;
|
|
const nodes: ServiceNode[] =
|
|
view === "domains"
|
|
? topology.domains.filter(isIncidentVisible).map((domain) => ({
|
|
id: domain.id,
|
|
type: "service",
|
|
position: { x: 0, y: 0 },
|
|
selected: domain.root_cause,
|
|
data: {
|
|
name: domain.name,
|
|
status: domain.status,
|
|
kind: "http",
|
|
latency: null,
|
|
dependencyCount: 0,
|
|
rootCause: domain.root_cause,
|
|
impacted: domain.affected,
|
|
group: domain.name,
|
|
...facts(domain.application_ids.flatMap((id) => applicationById.get(id)?.component_ids ?? [])),
|
|
category: "domain",
|
|
memberIds: domain.application_ids.flatMap(
|
|
(id) => applicationById.get(id)?.component_ids ?? [],
|
|
),
|
|
nodeKind: "domain",
|
|
explanation: `${domain.resolved_application_count}/${domain.application_count} opgelost · ${domain.unresolved_application_count} onopgelost${domain.incident_count ? ` · ${domain.incident_count} incident` : ""}`,
|
|
},
|
|
className: `service-node domain-node status-${domain.status}`,
|
|
}))
|
|
: view === "applications"
|
|
? scopedApplications.filter(isIncidentVisible).map((app) => ({
|
|
id: app.id,
|
|
type: "service",
|
|
position: { x: 0, y: 0 },
|
|
selected: app.root_cause,
|
|
data: {
|
|
name: app.name,
|
|
status: app.status,
|
|
kind: "http",
|
|
latency: null,
|
|
dependencyCount: app.dependency_application_ids.length,
|
|
rootCause: app.root_cause,
|
|
impacted: app.affected,
|
|
group: domainById.get(app.domain_id)?.name ?? null,
|
|
...facts(app.component_ids),
|
|
category: "application",
|
|
application: app.name,
|
|
applicationNode: true,
|
|
memberIds: app.component_ids,
|
|
nodeKind: "application",
|
|
roles: app.roles,
|
|
explanation: app.status_explanation,
|
|
monitoredComponents: app.resolved_components,
|
|
unmonitoredComponents: app.unresolved_components,
|
|
domainId: app.domain_id,
|
|
},
|
|
className: `service-node application-node status-${app.status}`,
|
|
}))
|
|
: scopedComponents.filter(isIncidentVisible).map((component) => ({
|
|
id: component.service_id,
|
|
type: "service",
|
|
position: { x: 0, y: 0 },
|
|
data: {
|
|
name: component.name,
|
|
status: component.effective_status,
|
|
kind: component.kind,
|
|
latency: component.latest_latency_ms,
|
|
dependencyCount: component.dependency_ids.length,
|
|
rootCause: component.root_cause,
|
|
impacted: component.affected,
|
|
group:
|
|
applicationById.get(component.application_id)?.name ?? null,
|
|
...facts([component.service_id]),
|
|
category: component.role,
|
|
nodeKind: "component",
|
|
role: component.role,
|
|
explanation: component.unknown_reason
|
|
? `${component.unknown_reason.replaceAll("_", " ")} · ${component.dependent_ids.length} afhankelijken`
|
|
: `${component.monitoring_state.replace("_", " ")} · ${component.dependent_ids.length} afhankelijken`,
|
|
},
|
|
className: `service-node component-node status-${component.effective_status}`,
|
|
}));
|
|
const normalizedSearch = search.trim().toLocaleLowerCase();
|
|
const serviceFilter = options.serviceFilter;
|
|
const visibleNodes = nodes.filter((node) => {
|
|
const descendants = node.data.memberIds ?? [node.id];
|
|
if (serviceFilter && !descendants.some((serviceId) => serviceFilter(serviceId))) return false;
|
|
const descendantMatches = descendants.some((serviceId) =>
|
|
componentById
|
|
.get(serviceId)
|
|
?.name.toLocaleLowerCase()
|
|
.includes(normalizedSearch),
|
|
);
|
|
return (
|
|
(!normalizedSearch ||
|
|
`${node.data.name} ${node.data.explanation ?? ""}`
|
|
.toLocaleLowerCase()
|
|
.includes(normalizedSearch) ||
|
|
descendantMatches) &&
|
|
matchesStatusFilter(node.data.status, statusFilter)
|
|
);
|
|
});
|
|
const nodeIds = new Set(visibleNodes.map((node) => node.id));
|
|
const nodeIdFor = (serviceId: string): string | null => {
|
|
const component = componentById.get(serviceId);
|
|
if (!component) return null;
|
|
if (view === "components") return component.service_id;
|
|
if (view === "applications") return component.application_id;
|
|
return component.domain_id;
|
|
};
|
|
const canonicalPairs = topology.components.flatMap((component) =>
|
|
component.dependency_ids.map((target_service_id) => ({
|
|
source_service_id: component.service_id,
|
|
target_service_id,
|
|
active: true,
|
|
relation_type: "depends_on",
|
|
})),
|
|
);
|
|
const relationshipPairs = topology.relations
|
|
.filter((relation) => relation.active && relation.target_service_id)
|
|
.map((relation) => ({
|
|
source_service_id: relation.source_service_id,
|
|
target_service_id: relation.target_service_id as string,
|
|
active: relation.active,
|
|
relation_type: relation.relation_type,
|
|
}));
|
|
const uniquePairs = new Map<
|
|
string,
|
|
{
|
|
source_service_id: string;
|
|
target_service_id: string;
|
|
active: boolean;
|
|
relation_type: string;
|
|
}
|
|
>();
|
|
for (const relation of [...canonicalPairs, ...relationshipPairs]) {
|
|
const key = `${relation.source_service_id}->${relation.target_service_id}`;
|
|
if (!uniquePairs.has(key)) uniquePairs.set(key, relation);
|
|
}
|
|
const statusRank: Record<HealthStatus, number> = {
|
|
down: 5,
|
|
degraded: 4,
|
|
recovering: 3,
|
|
maintenance: 2,
|
|
unknown: 1,
|
|
unmonitored: 0,
|
|
healthy: 0,
|
|
};
|
|
const projected = new Map<
|
|
string,
|
|
{
|
|
id: string;
|
|
source: string;
|
|
target: string;
|
|
status: HealthStatus;
|
|
weight: number;
|
|
relationType: string;
|
|
}
|
|
>();
|
|
for (const relation of uniquePairs.values()) {
|
|
if (!relation.active) continue;
|
|
// A relation is stored dependent -> dependency; render dependency -> dependent.
|
|
const source = nodeIdFor(relation.target_service_id);
|
|
const target = nodeIdFor(relation.source_service_id);
|
|
if (
|
|
!source ||
|
|
!target ||
|
|
source === target ||
|
|
!nodeIds.has(source) ||
|
|
!nodeIds.has(target)
|
|
)
|
|
continue;
|
|
const id = `${source}->${target}`;
|
|
const status =
|
|
componentById.get(relation.source_service_id)?.effective_status ??
|
|
"unknown";
|
|
const existing = projected.get(id);
|
|
if (existing) {
|
|
existing.weight += 1;
|
|
if (statusRank[status] > statusRank[existing.status])
|
|
existing.status = status;
|
|
} else {
|
|
projected.set(id, {
|
|
id,
|
|
source,
|
|
target,
|
|
status,
|
|
weight: 1,
|
|
relationType: relation.relation_type,
|
|
});
|
|
}
|
|
}
|
|
const projectedEdges = [...projected.values()].sort(
|
|
(left, right) =>
|
|
right.weight - left.weight || left.id.localeCompare(right.id),
|
|
);
|
|
const edgeLimit =
|
|
view === "domains" ? 12 : view === "applications" ? 28 : Infinity;
|
|
const highSignal =
|
|
view === "components"
|
|
? projectedEdges
|
|
: projectedEdges.filter((edge) => edge.weight >= 2);
|
|
const visibleEdges = (highSignal.length ? highSignal : projectedEdges).slice(
|
|
0,
|
|
edgeLimit,
|
|
);
|
|
return {
|
|
nodes: visibleNodes,
|
|
hiddenEdgeCount: projectedEdges.length - visibleEdges.length,
|
|
edges: visibleEdges.map((edge) => ({
|
|
id: edge.id,
|
|
source: edge.source,
|
|
target: edge.target,
|
|
markerEnd: { type: MarkerType.ArrowClosed },
|
|
animated: edge.status === "down" || edge.status === "degraded",
|
|
className: `edge-${edge.status} relation-${edge.relationType}`,
|
|
})),
|
|
};
|
|
}
|