feat: unify sentinel monitor checks
This commit is contained in:
Codex
@@ -27,14 +27,14 @@
|
||||
html,
|
||||
body,
|
||||
#monitor-web-root {
|
||||
height: 100%;
|
||||
min-height: 100%;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
body {
|
||||
background: var(--bg);
|
||||
color: var(--text);
|
||||
overflow: hidden;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
button,
|
||||
@@ -45,11 +45,10 @@ input {
|
||||
|
||||
.monitor-shell {
|
||||
display: flex;
|
||||
height: 100dvh;
|
||||
min-height: 0;
|
||||
min-height: 100dvh;
|
||||
flex-direction: column;
|
||||
gap: 10px;
|
||||
overflow: hidden;
|
||||
overflow: visible;
|
||||
padding: 12px;
|
||||
}
|
||||
|
||||
@@ -462,7 +461,7 @@ select {
|
||||
|
||||
.timeline-list {
|
||||
display: grid;
|
||||
max-height: 150px;
|
||||
max-height: 300px;
|
||||
gap: 7px;
|
||||
overflow: auto;
|
||||
padding-right: 2px;
|
||||
@@ -549,9 +548,9 @@ select {
|
||||
display: grid;
|
||||
grid-template-columns: minmax(260px, 0.82fr) minmax(420px, 1.34fr) minmax(300px, 1fr);
|
||||
gap: 10px;
|
||||
flex: 1 1 auto;
|
||||
min-height: 0;
|
||||
overflow: hidden;
|
||||
flex: 0 0 auto;
|
||||
min-height: clamp(680px, calc(100dvh - 220px), 980px);
|
||||
overflow: visible;
|
||||
}
|
||||
|
||||
.pane {
|
||||
@@ -615,6 +614,7 @@ select {
|
||||
.finding-list,
|
||||
.detail-stack {
|
||||
display: grid;
|
||||
align-content: start;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
@@ -658,6 +658,18 @@ select {
|
||||
background: var(--green);
|
||||
}
|
||||
|
||||
.check-code {
|
||||
flex: 0 0 auto;
|
||||
border: 1px solid var(--line-strong);
|
||||
border-radius: 6px;
|
||||
background: #ffffff;
|
||||
color: var(--ink);
|
||||
padding: 2px 6px;
|
||||
font-family: "SFMono-Regular", Consolas, "Liberation Mono", monospace;
|
||||
font-size: 11px;
|
||||
line-height: 1.2;
|
||||
}
|
||||
|
||||
.tag {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
@@ -702,6 +714,40 @@ select {
|
||||
background: #ffffff;
|
||||
}
|
||||
|
||||
.summary-list {
|
||||
display: grid;
|
||||
overflow: hidden;
|
||||
border: 1px solid var(--line);
|
||||
border-radius: 8px;
|
||||
background: #ffffff;
|
||||
}
|
||||
|
||||
.summary-row {
|
||||
display: grid;
|
||||
grid-template-columns: minmax(86px, 0.35fr) minmax(0, 1fr);
|
||||
gap: 10px;
|
||||
align-items: center;
|
||||
min-height: 34px;
|
||||
padding: 7px 10px;
|
||||
border-bottom: 1px solid var(--line);
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.summary-row:last-child {
|
||||
border-bottom: 0;
|
||||
}
|
||||
|
||||
.summary-row span {
|
||||
color: var(--muted);
|
||||
}
|
||||
|
||||
.summary-row strong {
|
||||
min-width: 0;
|
||||
overflow-wrap: anywhere;
|
||||
font-size: 12px;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
pre {
|
||||
max-height: 240px;
|
||||
margin: 0;
|
||||
|
||||
@@ -71,13 +71,18 @@ createApp({
|
||||
timeLabel: formatDate(rawTime),
|
||||
absoluteTime: formatAbsoluteDate(rawTime),
|
||||
reportSha: shortHash(run.reportJsonSha256 || run.report_json_sha256 || run.reportSha256 || ""),
|
||||
title: `${shortId(run.id)} ${formatAbsoluteDate(rawTime)} 红色 ${red} 警告 ${warning} 总量 ${total}`,
|
||||
title: `${shortId(run.id)} ${formatAbsoluteDate(rawTime)} 错误 ${red} 警告 ${warning} 总量 ${total}`,
|
||||
};
|
||||
}));
|
||||
const timelineRuns = computed(() => runs.value.slice(0, 16));
|
||||
const rootCauseFindings = computed(() => {
|
||||
const rows = findings.value.filter((item) => item.rootCause || item.nextAction || ["red", "warning"].includes(severityClass(item)));
|
||||
return rows.slice(0, 14);
|
||||
const rows = findings.value.filter((item) => item.checkRegistered !== false || item.rootCause || item.nextAction || ["red", "warning", "info"].includes(severityClass(item)));
|
||||
return rows.slice(0, 32);
|
||||
});
|
||||
const visibleCheckFindings = computed(() => {
|
||||
const needle = findingFilter.value.trim().toLowerCase();
|
||||
const rows = needle.length === 0 ? rootCauseFindings.value : rootCauseFindings.value.filter((item) => findingSearchText(item).includes(needle));
|
||||
return rows.slice(0, 24);
|
||||
});
|
||||
const cadence = computed(() => {
|
||||
const intervalMs = Number(overview.value?.scheduler?.intervalMs || 0);
|
||||
@@ -220,6 +225,7 @@ createApp({
|
||||
trendDots,
|
||||
timelineRuns,
|
||||
rootCauseFindings,
|
||||
visibleCheckFindings,
|
||||
cadence,
|
||||
healthChecks,
|
||||
loadAll,
|
||||
@@ -238,7 +244,10 @@ createApp({
|
||||
shortId,
|
||||
rootCauseText,
|
||||
findingTitle,
|
||||
findingCode,
|
||||
levelLabel,
|
||||
detailSummaryText,
|
||||
detailSummaryRows,
|
||||
commandSummary,
|
||||
statusLabel,
|
||||
};
|
||||
@@ -292,13 +301,13 @@ createApp({
|
||||
<section class="trend-panel" aria-labelledby="trend-heading">
|
||||
<div class="panel-header">
|
||||
<div>
|
||||
<h2 id="trend-heading">红色 / 警告数量曲线</h2>
|
||||
<h2 id="trend-heading">错误 / 警告监测项曲线</h2>
|
||||
<p>按运行更新时间展示最近 {{ trendRows.length }} 次变化</p>
|
||||
</div>
|
||||
<span class="pill" :class="cadence.stale ? 'warning' : 'healthy'">{{ cadence.stale ? "非阻塞报警" : "新鲜" }}</span>
|
||||
</div>
|
||||
<div class="trend-chart-wrap">
|
||||
<svg class="trend-chart" viewBox="0 0 720 142" role="img" aria-label="红色和警告发现数量趋势" data-monitor-trend-curve="true">
|
||||
<svg class="trend-chart" viewBox="0 0 720 142" role="img" aria-label="错误和警告监测项数量趋势" data-monitor-trend-curve="true">
|
||||
<line class="trend-grid-line" x1="24" x2="696" y1="24" y2="24"></line>
|
||||
<line class="trend-grid-line" x1="24" x2="696" y1="75" y2="75"></line>
|
||||
<line class="trend-grid-line" x1="24" x2="696" y1="126" y2="126"></line>
|
||||
@@ -335,15 +344,15 @@ createApp({
|
||||
<strong>{{ shortId(hoveredTrendDot.runId) }}</strong>
|
||||
<span>{{ hoveredTrendDot.absoluteTime }}</span>
|
||||
<span>状态 {{ hoveredTrendDot.status }}</span>
|
||||
<span>红色 {{ hoveredTrendDot.red }} / 警告 {{ hoveredTrendDot.warning }} / 总量 {{ hoveredTrendDot.total }}</span>
|
||||
<span>错误 {{ hoveredTrendDot.red }} / 警告 {{ hoveredTrendDot.warning }} / 总量 {{ hoveredTrendDot.total }}</span>
|
||||
<span v-if="hoveredTrendDot.reportSha">report {{ hoveredTrendDot.reportSha }}</span>
|
||||
</div>
|
||||
<div v-if="trendRows.length === 0" class="trend-empty">暂无运行数据</div>
|
||||
</div>
|
||||
<div class="trend-legend">
|
||||
<span class="legend-item"><span class="legend-swatch red"></span>红色 {{ redCount({ severityCounts: severityTotals }) }}</span>
|
||||
<span class="legend-item"><span class="legend-swatch red"></span>错误 {{ redCount({ severityCounts: severityTotals }) }}</span>
|
||||
<span class="legend-item"><span class="legend-swatch warning"></span>警告 {{ warningCount({ severityCounts: severityTotals }) }}</span>
|
||||
<span class="legend-item"><span class="legend-swatch total"></span>发现总量 {{ findingCount({ findingCount: overview?.latestRun?.findingCount, severityCounts: severityTotals }) }}</span>
|
||||
<span class="legend-item"><span class="legend-swatch total"></span>监测项总量 {{ findingCount({ findingCount: overview?.latestRun?.findingCount, severityCounts: severityTotals }) }}</span>
|
||||
<span class="legend-item">{{ cadence.alert }}</span>
|
||||
</div>
|
||||
</section>
|
||||
@@ -384,7 +393,7 @@ createApp({
|
||||
<strong>{{ cadence.latestAge >= 0 ? formatDuration(cadence.latestAge) : "-" }}</strong>
|
||||
</div>
|
||||
<div class="metric">
|
||||
<span>红色</span>
|
||||
<span>错误</span>
|
||||
<strong>{{ redCount({ severityCounts: severityTotals }) }}</strong>
|
||||
</div>
|
||||
<div class="metric">
|
||||
@@ -412,7 +421,7 @@ createApp({
|
||||
<input v-model="runFilter" type="search" placeholder="搜索 run / scenario" aria-label="搜索运行">
|
||||
<select v-model="severityFilter" aria-label="严重级别筛选">
|
||||
<option value="">全部</option>
|
||||
<option value="red">红色</option>
|
||||
<option value="red">错误</option>
|
||||
<option value="warning">警告</option>
|
||||
<option value="info">信息</option>
|
||||
<option value="healthy">正常</option>
|
||||
@@ -453,7 +462,7 @@ createApp({
|
||||
<h3>摘要</h3>
|
||||
<div class="detail-grid">
|
||||
<div class="metric"><span>状态</span><strong>{{ selectedRun.status || "-" }}</strong></div>
|
||||
<div class="metric"><span>发现数</span><strong>{{ findingCount(selectedRun) }}</strong></div>
|
||||
<div class="metric"><span>监测项</span><strong>{{ findingCount(selectedRun) }}</strong></div>
|
||||
<div class="metric"><span>Observer</span><strong>{{ selectedRun.observerId || "-" }}</strong></div>
|
||||
<div class="metric"><span>更新时间</span><strong>{{ formatDate(selectedRun.updatedAt || selectedRun.createdAt) }}</strong></div>
|
||||
</div>
|
||||
@@ -467,7 +476,12 @@ createApp({
|
||||
</section>
|
||||
<section class="detail-card">
|
||||
<h3>报告摘要</h3>
|
||||
<pre>{{ detailSummaryText(selectedDetail) }}</pre>
|
||||
<div class="summary-list">
|
||||
<div v-for="row in detailSummaryRows(selectedDetail)" :key="row.key" class="summary-row">
|
||||
<span>{{ row.label }}</span>
|
||||
<strong>{{ row.value }}</strong>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
<section class="detail-card">
|
||||
<h3>复现命令</h3>
|
||||
@@ -480,29 +494,29 @@ createApp({
|
||||
<aside class="pane pane-findings" aria-labelledby="findings-heading">
|
||||
<div class="pane-header">
|
||||
<div>
|
||||
<h2 id="findings-heading">根因与发现</h2>
|
||||
<p class="muted">优先展示 OTel/报告中已归因线索</p>
|
||||
<h2 id="findings-heading">监测项</h2>
|
||||
<p class="muted">按 YAML 编号、等级和中文标题展示</p>
|
||||
</div>
|
||||
<span class="tag">{{ findings.length }} 项</span>
|
||||
</div>
|
||||
<div class="filter-row">
|
||||
<input v-model="findingFilter" type="search" placeholder="搜索 finding / root cause" aria-label="搜索发现">
|
||||
<input v-model="findingFilter" type="search" placeholder="搜索编号 / 标题 / 根因" aria-label="搜索监测项">
|
||||
</div>
|
||||
<div class="finding-list">
|
||||
<article
|
||||
v-for="item in rootCauseFindings.filter((finding) => !findingFilter || JSON.stringify(finding).toLowerCase().includes(findingFilter.toLowerCase())).slice(0, 24)"
|
||||
v-for="item in visibleCheckFindings"
|
||||
:key="item.code || item.findingId || item.latestRunId"
|
||||
class="finding-card"
|
||||
:class="severityClass(item)"
|
||||
>
|
||||
<span class="row-line">
|
||||
<span class="severity-line"><span class="severity-dot"></span><strong>{{ findingTitle(item) }}</strong></span>
|
||||
<span class="tag" :class="severityClass(item)">{{ item.runCount || item.count || 1 }}</span>
|
||||
<span class="severity-line"><span class="severity-dot"></span><span class="check-code">{{ findingCode(item) }}</span><strong>{{ findingTitle(item) }}</strong></span>
|
||||
<span class="tag" :class="severityClass(item)">{{ levelLabel(item) }} · {{ item.runCount || item.count || 1 }}</span>
|
||||
</span>
|
||||
<p class="muted">{{ rootCauseText(item) }}</p>
|
||||
<p v-if="item.nextAction" class="muted">方案: {{ item.nextAction }}</p>
|
||||
<p v-if="item.nextAction" class="muted">处理: {{ item.nextAction }}</p>
|
||||
</article>
|
||||
<div v-if="rootCauseFindings.length === 0" class="empty">暂无已归因发现</div>
|
||||
<div v-if="visibleCheckFindings.length === 0" class="empty">暂无匹配监测项</div>
|
||||
</div>
|
||||
</aside>
|
||||
</section>
|
||||
@@ -565,7 +579,7 @@ function findingCount(item) {
|
||||
}
|
||||
|
||||
function severityClass(item) {
|
||||
const explicit = String(item?.maxSeverity || item?.severity || "").toLowerCase();
|
||||
const explicit = String(item?.maxSeverity || item?.checkLevel || item?.severity || item?.level || "").toLowerCase();
|
||||
if (["red", "critical", "error", "blocked"].includes(explicit)) return "red";
|
||||
if (["warning", "warn", "amber"].includes(explicit)) return "warning";
|
||||
if (["info", "notice"].includes(explicit)) return "info";
|
||||
@@ -617,18 +631,73 @@ function clamp(value, min, max) {
|
||||
}
|
||||
|
||||
function rootCauseText(item) {
|
||||
return item?.rootCause || item?.evidenceSummary || item?.summary || "尚未记录根因，等待下一次 OTel/报告归因。";
|
||||
if (item?.rootCause) return `根因: ${item.rootCause}`;
|
||||
return item?.checkSummaryZh || item?.summary || item?.evidenceSummary || "尚未记录根因，等待下一次 OTel/报告归因。";
|
||||
}
|
||||
|
||||
function findingTitle(item) {
|
||||
return item?.code || item?.findingId || item?.scenarioId || item?.latestRunId || "finding";
|
||||
return item?.checkTitleZh || item?.check?.titleZh || item?.findingId || item?.code || item?.scenarioId || item?.latestRunId || "未登记监测项";
|
||||
}
|
||||
|
||||
function findingCode(item) {
|
||||
return item?.checkCode || item?.check?.code || "未登记";
|
||||
}
|
||||
|
||||
function levelLabel(item) {
|
||||
const value = String(item?.checkLevel || item?.severity || item?.level || "").toLowerCase();
|
||||
if (["critical", "red"].includes(value)) return "严重";
|
||||
if (["error", "blocked", "failed"].includes(value)) return "错误";
|
||||
if (["warning", "warn", "amber"].includes(value)) return "警告";
|
||||
if (["info", "notice"].includes(value)) return "信息";
|
||||
return "未知";
|
||||
}
|
||||
|
||||
function findingSearchText(item) {
|
||||
return [
|
||||
item?.checkCode,
|
||||
item?.check?.code,
|
||||
item?.checkTitleZh,
|
||||
item?.check?.titleZh,
|
||||
item?.checkLevel,
|
||||
item?.severity,
|
||||
item?.findingId,
|
||||
item?.code,
|
||||
item?.summary,
|
||||
item?.checkSummaryZh,
|
||||
item?.rootCause,
|
||||
item?.evidenceSummary,
|
||||
item?.nextAction,
|
||||
item?.scenarioId,
|
||||
item?.latestRunId,
|
||||
].filter((value) => value !== null && value !== undefined).join(" ").toLowerCase();
|
||||
}
|
||||
|
||||
function detailSummaryText(detail) {
|
||||
if (!detail) return "加载详情中";
|
||||
if (detail.ok === false) return detail.error || "详情不可用";
|
||||
const summary = detail.summary && Object.keys(detail.summary).length > 0 ? detail.summary : detail.run;
|
||||
return JSON.stringify(summary || {}, null, 2);
|
||||
return detailSummaryRows(detail).map((row) => `${row.label}: ${row.value}`).join("\n");
|
||||
}
|
||||
|
||||
function detailSummaryRows(detail) {
|
||||
if (!detail) return [{ key: "loading", label: "状态", value: "加载详情中" }];
|
||||
if (detail.ok === false) return [{ key: "error", label: "状态", value: detail.error || "详情不可用" }];
|
||||
const run = detail.run || {};
|
||||
const summary = detail.summary || {};
|
||||
const artifacts = detail.artifacts || {};
|
||||
const counts = run.severityCounts || {};
|
||||
const rows = [
|
||||
{ key: "run", label: "运行", value: shortId(run.id || run.runId || detail.runId) },
|
||||
{ key: "scenario", label: "场景", value: run.scenarioId || run.scenario_id || "-" },
|
||||
{ key: "status", label: "状态", value: run.status || "-" },
|
||||
{ key: "checks", label: "监测项", value: String(run.findingCount ?? run.finding_count ?? 0) },
|
||||
{ key: "error", label: "错误", value: String(redCount({ severityCounts: counts })) },
|
||||
{ key: "warning", label: "警告", value: String(warningCount({ severityCounts: counts })) },
|
||||
{ key: "observer", label: "Observer", value: run.observerId || run.observer_id || "-" },
|
||||
{ key: "updated", label: "更新时间", value: formatAbsoluteDate(run.updatedAt || run.updated_at || run.createdAt || run.created_at) },
|
||||
{ key: "report", label: "报告", value: shortHash(artifacts.reportJsonSha256 || run.reportJsonSha256 || run.report_json_sha256 || "") || "-" },
|
||||
];
|
||||
const windowStart = summary.analysisWindow?.start || summary.window?.start;
|
||||
const windowEnd = summary.analysisWindow?.end || summary.window?.end;
|
||||
if (windowStart || windowEnd) rows.push({ key: "window", label: "窗口", value: `${formatDate(windowStart)} - ${formatDate(windowEnd)}` });
|
||||
return rows;
|
||||
}
|
||||
|
||||
function commandSummary(detail) {
|
||||
|
||||
@@ -92,7 +92,7 @@ export function loadWebProbeSentinelServiceConfig(spec: HwlabRuntimeLaneSpec, op
|
||||
const plan = webProbeSentinelConfigPlan(spec, "status", sentinel.id);
|
||||
const runtime = recordTarget(readSentinelConfigRefTarget(sentinel.configRefs.runtime));
|
||||
const scenarios = scenarioArrayTarget(readSentinelConfigRefTarget(sentinel.configRefs.scenarios));
|
||||
const reportViews = recordTarget(readSentinelConfigRefTarget(sentinel.configRefs.reportViews));
|
||||
const reportViews = resolveReportViewsWithCheckCatalog(recordTarget(readSentinelConfigRefTarget(sentinel.configRefs.reportViews)));
|
||||
const rawPublicExposure = recordTarget(readSentinelConfigRefTarget(sentinel.configRefs.publicExposure));
|
||||
const publicExposure = effectiveWebProbeSentinelPublicExposure(spec, sentinel.id, rawPublicExposure);
|
||||
const cicd = recordTarget(readSentinelConfigRefTarget(sentinel.configRefs.cicd));
|
||||
@@ -268,6 +268,15 @@ export function createWebProbeSentinelService(options: WebProbeSentinelServiceOp
|
||||
return service;
|
||||
}
|
||||
|
||||
function resolveReportViewsWithCheckCatalog(reportViews: Record<string, unknown>): Record<string, unknown> {
|
||||
const ref = stringOrNull(reportViews.checkCatalogRef);
|
||||
if (ref === null) return reportViews;
|
||||
return {
|
||||
...reportViews,
|
||||
checkCatalog: recordTarget(readSentinelConfigRefTarget(ref)),
|
||||
};
|
||||
}
|
||||
|
||||
export function startWebProbeSentinelHttpService(service: WebProbeSentinelService): { readonly url: string; readonly stop: () => void } {
|
||||
const server = Bun.serve({
|
||||
hostname: service.config.listenHost,
|
||||
@@ -664,7 +673,7 @@ function runCounts(db: Database): Record<string, number> {
|
||||
function dashboardOverview(config: WebProbeSentinelServiceConfig, db: Database, health: Record<string, unknown>, maintenance: MaintenanceState): Record<string, unknown> {
|
||||
const latestRow = db.query("SELECT * FROM runs ORDER BY updated_at DESC LIMIT 1").get() as Record<string, unknown> | null;
|
||||
const latestRun = latestRow === null ? null : dashboardRunSummary(config, db, latestRow);
|
||||
const severityCounts = globalSeverityCounts(db);
|
||||
const severityCounts = globalSeverityCounts(config, db);
|
||||
const latestUpdatedAt = latestRow === null ? null : stringOrNull(latestRow.updated_at);
|
||||
const latestRunAgeSeconds = latestUpdatedAt === null ? null : ageSeconds(latestUpdatedAt);
|
||||
return {
|
||||
@@ -744,7 +753,7 @@ function dashboardRunDetail(config: WebProbeSentinelServiceConfig, db: Database,
|
||||
const row = readRunRow(db, runId);
|
||||
if (row === null) return { ok: false, error: "run-not-found", runId, valuesRedacted: true };
|
||||
const stored = readMetadata(db, `run.report.${runId}`) ?? {};
|
||||
const findings = findingsForRun(db, runId, dashboardPageSize(config));
|
||||
const findings = findingsForRun(config, db, runId, dashboardPageSize(config));
|
||||
const views = record(stored.views);
|
||||
return {
|
||||
ok: true,
|
||||
@@ -775,20 +784,24 @@ function dashboardFindings(config: WebProbeSentinelServiceConfig, db: Database,
|
||||
const limit = dashboardPage(url, config).limit;
|
||||
const filters = dashboardFindingFilters(url);
|
||||
const where = findingWhereClause(filters);
|
||||
const queryLimit = Math.min(dashboardMaxPageSize(config), Math.max(limit + 1, limit * 4));
|
||||
const rows = db.query(`
|
||||
SELECT f.finding_id, f.severity, r.scenario_id, SUM(f.count) AS count, COUNT(DISTINCT f.run_id) AS run_count,
|
||||
SELECT f.finding_id,
|
||||
(SELECT f2.severity FROM findings f2 JOIN runs r2 ON r2.id = f2.run_id WHERE f2.finding_id = f.finding_id AND r2.scenario_id = r.scenario_id ORDER BY f2.created_at DESC LIMIT 1) AS severity,
|
||||
r.scenario_id, SUM(f.count) AS count, COUNT(DISTINCT f.run_id) AS run_count,
|
||||
MAX(f.created_at) AS latest_at, MAX(f.summary) AS summary
|
||||
FROM findings f
|
||||
JOIN runs r ON r.id = f.run_id
|
||||
${where.sql}
|
||||
GROUP BY f.finding_id, f.severity, r.scenario_id
|
||||
ORDER BY ${severityRankSql("f.severity")} DESC, latest_at DESC
|
||||
GROUP BY f.finding_id, r.scenario_id
|
||||
ORDER BY latest_at DESC
|
||||
LIMIT ?
|
||||
`).all(...where.params, limit) as Record<string, unknown>[];
|
||||
`).all(...where.params, queryLimit) as Record<string, unknown>[];
|
||||
const severityFilter = stringOrNull(filters.severity);
|
||||
const items = rows.map((row) => {
|
||||
const latestRun = latestRunForFinding(db, row);
|
||||
const latestDetail = latestRun === null ? null : storedFindingDetailForRow(db, row, stringOrNull(latestRun.id));
|
||||
return {
|
||||
return enrichFindingWithCheck(config, {
|
||||
code: stringOrNull(row.finding_id),
|
||||
findingId: stringOrNull(row.finding_id),
|
||||
severity: stringOrNull(row.severity),
|
||||
@@ -806,8 +819,10 @@ function dashboardFindings(config: WebProbeSentinelServiceConfig, db: Database,
|
||||
evidenceSummary: stringOrNull(latestDetail?.evidenceSummary),
|
||||
traceability: latestRun === null ? null : runTraceability(config, latestRun),
|
||||
valuesRedacted: true,
|
||||
};
|
||||
});
|
||||
});
|
||||
}).filter((item) => severityFilter === null || stringOrNull(item.checkLevel) === severityFilter || stringOrNull(item.severity) === severityFilter)
|
||||
.sort(compareCheckFindingRows)
|
||||
.slice(0, limit);
|
||||
return {
|
||||
ok: true,
|
||||
contractVersion: DASHBOARD_CONTRACT_VERSION,
|
||||
@@ -817,7 +832,7 @@ function dashboardFindings(config: WebProbeSentinelServiceConfig, db: Database,
|
||||
filters,
|
||||
page: {
|
||||
limit,
|
||||
hasMore: items.length === limit,
|
||||
hasMore: rows.length === queryLimit,
|
||||
sort: "severity",
|
||||
direction: "desc",
|
||||
},
|
||||
@@ -871,7 +886,7 @@ function dashboardReportView(config: WebProbeSentinelServiceConfig, db: Database
|
||||
|
||||
function dashboardRunSummary(config: WebProbeSentinelServiceConfig, db: Database, row: Record<string, unknown>): Record<string, unknown> {
|
||||
const id = stringOrNull(row.id);
|
||||
const severityCounts = id === null ? {} : severityCountsForRun(db, id);
|
||||
const severityCounts = id === null ? {} : severityCountsForRun(config, db, id);
|
||||
const maxSeverity = maxSeverityFromCounts(severityCounts);
|
||||
return {
|
||||
id,
|
||||
@@ -989,11 +1004,6 @@ function runWhereClause(filters: Record<string, unknown>): { readonly sql: strin
|
||||
function findingWhereClause(filters: Record<string, unknown>): { readonly sql: string; readonly params: readonly (string | number)[] } {
|
||||
const clauses: string[] = [];
|
||||
const params: (string | number)[] = [];
|
||||
const severity = stringOrNull(filters.severity);
|
||||
if (severity !== null) {
|
||||
clauses.push("f.severity = ?");
|
||||
params.push(severity);
|
||||
}
|
||||
const code = stringOrNull(filters.code);
|
||||
if (code !== null) {
|
||||
clauses.push("f.finding_id = ?");
|
||||
@@ -1052,15 +1062,15 @@ function readRunRow(db: Database, runId: string): Record<string, unknown> | null
|
||||
return db.query("SELECT * FROM runs WHERE id = ?").get(runId) as Record<string, unknown> | null;
|
||||
}
|
||||
|
||||
function findingsForRun(db: Database, runId: string, limit: number): readonly Record<string, unknown>[] {
|
||||
function findingsForRun(config: WebProbeSentinelServiceConfig, db: Database, runId: string, limit: number): readonly Record<string, unknown>[] {
|
||||
const rows = db.query("SELECT finding_id, severity, count, summary, report_json_sha256, created_at FROM findings WHERE run_id = ? ORDER BY created_at DESC LIMIT ?")
|
||||
.all(runId, limit) as Record<string, unknown>[];
|
||||
return rows.map((row) => enrichFindingRowWithStoredDetail(db, runId, row));
|
||||
return rows.map((row) => enrichFindingRowWithStoredDetail(config, db, runId, row));
|
||||
}
|
||||
|
||||
function enrichFindingRowWithStoredDetail(db: Database, runId: string, row: Record<string, unknown>): Record<string, unknown> {
|
||||
function enrichFindingRowWithStoredDetail(config: WebProbeSentinelServiceConfig, db: Database, runId: string, row: Record<string, unknown>): Record<string, unknown> {
|
||||
const detail = storedFindingDetailForRow(db, row, runId);
|
||||
return {
|
||||
return enrichFindingWithCheck(config, {
|
||||
...row,
|
||||
code: stringOrNull(row.finding_id),
|
||||
findingId: stringOrNull(row.finding_id),
|
||||
@@ -1070,7 +1080,7 @@ function enrichFindingRowWithStoredDetail(db: Database, runId: string, row: Reco
|
||||
nextAction: stringOrNull(detail?.nextAction),
|
||||
evidenceSummary: stringOrNull(detail?.evidenceSummary),
|
||||
valuesRedacted: true,
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
function storedFindingDetailForRow(db: Database, row: Record<string, unknown>, runId: string | null): Record<string, unknown> | null {
|
||||
@@ -1137,14 +1147,110 @@ function compactFindingEvidenceSummary(value: unknown): string | null {
|
||||
return text.length > 240 ? `${text.slice(0, 239)}…` : text;
|
||||
}
|
||||
|
||||
function globalSeverityCounts(db: Database): Record<string, number> {
|
||||
const rows = db.query("SELECT severity, SUM(count) AS count FROM findings GROUP BY severity").all() as { severity: string; count: number }[];
|
||||
return Object.fromEntries(rows.map((row) => [row.severity, Number(row.count)]));
|
||||
function enrichFindingWithCheck(config: WebProbeSentinelServiceConfig, value: Record<string, unknown>): Record<string, unknown> {
|
||||
const rawSeverity = stringOrNull(value.severity) ?? stringOrNull(value.level);
|
||||
const check = checkForFinding(config, value);
|
||||
const checkLevel = stringOrNull(check.level) ?? normalizeCheckLevel(rawSeverity) ?? "unknown";
|
||||
return {
|
||||
...value,
|
||||
rawSeverity,
|
||||
severity: checkLevel,
|
||||
level: checkLevel,
|
||||
check,
|
||||
checkId: stringOrNull(check.id),
|
||||
checkCode: stringOrNull(check.code),
|
||||
checkLevel,
|
||||
checkTitleZh: stringOrNull(check.titleZh),
|
||||
checkSummaryZh: stringOrNull(check.summaryZh),
|
||||
checkRegistered: check.registered === true,
|
||||
blocking: value.blocking === true || check.blocking === true,
|
||||
valuesRedacted: true,
|
||||
};
|
||||
}
|
||||
|
||||
function severityCountsForRun(db: Database, runId: string): Record<string, number> {
|
||||
const rows = db.query("SELECT severity, SUM(count) AS count FROM findings WHERE run_id = ? GROUP BY severity").all(runId) as { severity: string; count: number }[];
|
||||
return Object.fromEntries(rows.map((row) => [row.severity, Number(row.count)]));
|
||||
function checkForFinding(config: WebProbeSentinelServiceConfig, value: Record<string, unknown>): Record<string, unknown> {
|
||||
const findingId = stringOrNull(value.finding_id) ?? stringOrNull(value.findingId) ?? stringOrNull(value.id) ?? stringOrNull(value.kind) ?? stringOrNull(value.code) ?? "unknown-check";
|
||||
const entry = checkCatalogById(config).get(findingId) ?? null;
|
||||
const rawLevel = normalizeCheckLevel(stringOrNull(value.severity) ?? stringOrNull(value.level));
|
||||
if (entry === null) {
|
||||
const summary = stringOrNull(value.summary) ?? stringOrNull(value.message) ?? findingId;
|
||||
return {
|
||||
id: findingId,
|
||||
code: null,
|
||||
level: rawLevel ?? "unknown",
|
||||
titleZh: findingId,
|
||||
summaryZh: summary.slice(0, 160),
|
||||
blocking: value.blocking === true,
|
||||
order: 10000,
|
||||
registered: false,
|
||||
valuesRedacted: true,
|
||||
};
|
||||
}
|
||||
return {
|
||||
id: stringOrNull(entry.id) ?? findingId,
|
||||
code: stringOrNull(entry.code),
|
||||
level: normalizeCheckLevel(stringOrNull(entry.level)) ?? rawLevel ?? "unknown",
|
||||
titleZh: stringOrNull(entry.titleZh) ?? findingId,
|
||||
summaryZh: stringOrNull(entry.summaryZh) ?? stringOrNull(value.summary) ?? stringOrNull(value.message) ?? findingId,
|
||||
blocking: entry.blocking === true,
|
||||
order: numberOr(entry.order, 10000),
|
||||
registered: true,
|
||||
valuesRedacted: true,
|
||||
};
|
||||
}
|
||||
|
||||
function checkCatalogById(config: WebProbeSentinelServiceConfig): Map<string, Record<string, unknown>> {
|
||||
const catalog = record(config.reportViews.checkCatalog);
|
||||
const items = arrayRecords(catalog.items);
|
||||
const result = new Map<string, Record<string, unknown>>();
|
||||
for (const item of items) {
|
||||
const id = stringOrNull(item.id);
|
||||
if (id !== null) result.set(id, item);
|
||||
const aliases = Array.isArray(item.aliases) ? item.aliases : [];
|
||||
for (const alias of aliases) {
|
||||
if (typeof alias === "string" && alias.length > 0) result.set(alias, item);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
function checkLevelCounts(config: WebProbeSentinelServiceConfig, rows: readonly Record<string, unknown>[]): Record<string, number> {
|
||||
const counts: Record<string, number> = {};
|
||||
for (const row of rows) {
|
||||
const check = checkForFinding(config, row);
|
||||
const level = stringOrNull(check.level) ?? normalizeCheckLevel(stringOrNull(row.severity)) ?? "unknown";
|
||||
counts[level] = (counts[level] ?? 0) + numberOr(row.count, 1);
|
||||
}
|
||||
return counts;
|
||||
}
|
||||
|
||||
function compareCheckFindingRows(left: Record<string, unknown>, right: Record<string, unknown>): number {
|
||||
const severity = severityRank(stringOrNull(right.checkLevel) ?? stringOrNull(right.severity)) - severityRank(stringOrNull(left.checkLevel) ?? stringOrNull(left.severity));
|
||||
if (severity !== 0) return severity;
|
||||
const order = numberOr(record(left.check).order, 10000) - numberOr(record(right.check).order, 10000);
|
||||
if (order !== 0) return order;
|
||||
const rightTime = Date.parse(stringOrNull(right.latestAt) ?? "");
|
||||
const leftTime = Date.parse(stringOrNull(left.latestAt) ?? "");
|
||||
return (Number.isFinite(rightTime) ? rightTime : 0) - (Number.isFinite(leftTime) ? leftTime : 0);
|
||||
}
|
||||
|
||||
function normalizeCheckLevel(value: string | null): string | null {
|
||||
const normalized = (value ?? "").toLowerCase();
|
||||
if (["critical", "fatal"].includes(normalized)) return "critical";
|
||||
if (["red", "error", "failed", "blocked"].includes(normalized)) return "error";
|
||||
if (["warning", "warn", "amber", "yellow"].includes(normalized)) return "warning";
|
||||
if (["info", "notice"].includes(normalized)) return "info";
|
||||
return null;
|
||||
}
|
||||
|
||||
function globalSeverityCounts(config: WebProbeSentinelServiceConfig, db: Database): Record<string, number> {
|
||||
const rows = db.query("SELECT finding_id, severity, count FROM findings").all() as Record<string, unknown>[];
|
||||
return checkLevelCounts(config, rows);
|
||||
}
|
||||
|
||||
function severityCountsForRun(config: WebProbeSentinelServiceConfig, db: Database, runId: string): Record<string, number> {
|
||||
const rows = db.query("SELECT finding_id, severity, count FROM findings WHERE run_id = ?").all(runId) as Record<string, unknown>[];
|
||||
return checkLevelCounts(config, rows);
|
||||
}
|
||||
|
||||
function latestRunForFinding(db: Database, row: Record<string, unknown>): Record<string, unknown> | null {
|
||||
@@ -1152,10 +1258,10 @@ function latestRunForFinding(db: Database, row: Record<string, unknown>): Record
|
||||
SELECT r.*
|
||||
FROM findings f
|
||||
JOIN runs r ON r.id = f.run_id
|
||||
WHERE f.finding_id = ? AND f.severity = ? AND r.scenario_id = ?
|
||||
WHERE f.finding_id = ? AND r.scenario_id = ?
|
||||
ORDER BY f.created_at DESC
|
||||
LIMIT 1
|
||||
`).get(stringOrNull(row.finding_id), stringOrNull(row.severity), stringOrNull(row.scenario_id)) as Record<string, unknown> | null;
|
||||
`).get(stringOrNull(row.finding_id), stringOrNull(row.scenario_id)) as Record<string, unknown> | null;
|
||||
}
|
||||
|
||||
function runTraceability(config: WebProbeSentinelServiceConfig, row: Record<string, unknown>): Record<string, unknown> {
|
||||
@@ -1323,7 +1429,8 @@ function recordRunResult(config: WebProbeSentinelServiceConfig, db: Database, in
|
||||
db.query("DELETE FROM findings WHERE run_id = ?").run(runId);
|
||||
for (const item of findings) {
|
||||
const findingId = stringOrNull(item.id) ?? stringOrNull(item.kind) ?? stringOrNull(item.code) ?? "finding";
|
||||
const severity = stringOrNull(item.severity) ?? stringOrNull(item.level) ?? "unknown";
|
||||
const check = checkForFinding(config, { ...item, id: findingId });
|
||||
const severity = stringOrNull(check.level) ?? normalizeCheckLevel(stringOrNull(item.severity) ?? stringOrNull(item.level)) ?? "unknown";
|
||||
const summary = stringOrNull(item.summary) ?? stringOrNull(item.message) ?? findingId;
|
||||
db.query("INSERT INTO findings (run_id, finding_id, severity, count, summary, report_json_sha256, created_at) VALUES (?, ?, ?, ?, ?, ?, ?)")
|
||||
.run(runId, findingId.slice(0, 160), severity.slice(0, 40), numberOr(item.count, 1), summary.slice(0, 500), reportJsonSha256, now);
|
||||
@@ -1357,7 +1464,7 @@ function reportRunView(config: WebProbeSentinelServiceConfig, db: Database, view
|
||||
const selectedRunId = stringOrNull(row.id);
|
||||
if (selectedRunId === null) return { ok: false, error: "report-run-id-missing", view, valuesRedacted: true };
|
||||
const stored = readMetadata(db, `run.report.${selectedRunId}`) ?? {};
|
||||
const findings = findingsForRun(db, selectedRunId, 50);
|
||||
const findings = findingsForRun(config, db, selectedRunId, 50);
|
||||
const views = record(stored.views);
|
||||
const storedView = record(views[view]);
|
||||
const renderedText = typeof storedView.renderedText === "string" ? storedView.renderedText : view === "summary" ? renderStoredSummary(row, stored, findings) : view === "findings" ? renderStoredFindings(row, findings) : null;
|
||||
@@ -1376,12 +1483,16 @@ function reportRunView(config: WebProbeSentinelServiceConfig, db: Database, view
|
||||
}
|
||||
|
||||
function formatStoredFindingLine(item: Record<string, unknown>): string {
|
||||
const check = record(item.check);
|
||||
const code = stringOrNull(item.checkCode) ?? stringOrNull(check.code) ?? stringOrNull(item.finding_id) ?? stringOrNull(item.findingId) ?? stringOrNull(item.code) ?? "-";
|
||||
const title = stringOrNull(item.checkTitleZh) ?? stringOrNull(check.titleZh) ?? stringOrNull(item.summary) ?? "";
|
||||
const summary = stringOrNull(item.checkSummaryZh) ?? stringOrNull(check.summaryZh) ?? stringOrNull(item.summary) ?? "";
|
||||
const rootCause = stringOrNull(item.rootCause);
|
||||
const status = stringOrNull(item.rootCauseStatus);
|
||||
const nextAction = stringOrNull(item.nextAction);
|
||||
const evidence = stringOrNull(item.evidenceSummary);
|
||||
return [
|
||||
`${item.severity ?? "-"} ${item.finding_id ?? item.findingId ?? item.code ?? "-"} count=${item.count ?? "-"} ${item.summary ?? ""}`,
|
||||
`${item.severity ?? "-"} ${code} ${title} count=${item.count ?? "-"} ${summary}`,
|
||||
rootCause === null ? null : `rootCause=${rootCause}${status === null ? "" : ` status=${status}`}`,
|
||||
evidence === null ? null : `evidence=${evidence}`,
|
||||
nextAction === null ? null : `next=${nextAction}`,
|
||||
@@ -1397,7 +1508,7 @@ function renderStoredSummary(row: Record<string, unknown>, stored: Record<string
|
||||
`observer=${stringOrNull(row.observer_id) ?? "-"} stateDir=${stringOrNull(row.state_dir) ?? "-"}`,
|
||||
`report=${stringOrNull(row.report_json_sha256) ?? "-"} artifacts=${String(row.artifact_count ?? 0)} findings=${String(row.finding_count ?? findings.length)}`,
|
||||
`publicOrigin=${stringOrNull(stored.publicOrigin) ?? "-"}`,
|
||||
`analysisWindow=${JSON.stringify(record(summary.analysisWindow))}`,
|
||||
`analysisWindow=${formatStoredAnalysisWindow(summary.analysisWindow)}`,
|
||||
"",
|
||||
"Findings",
|
||||
findings.length === 0 ? "-" : findings.slice(0, 12).map(formatStoredFindingLine).join("\n"),
|
||||
@@ -1413,6 +1524,17 @@ function renderStoredFindings(row: Record<string, unknown>, findings: readonly R
|
||||
].join("\n");
|
||||
}
|
||||
|
||||
function formatStoredAnalysisWindow(value: unknown): string {
|
||||
const window = record(value);
|
||||
const fields = [
|
||||
["start", stringOrNull(window.start)],
|
||||
["end", stringOrNull(window.end)],
|
||||
["samples", numberOr(window.sampleCount, numberOr(window.samples, -1)) >= 0 ? String(numberOr(window.sampleCount, numberOr(window.samples, 0))) : null],
|
||||
["durationMs", numberOr(window.durationMs, -1) >= 0 ? String(numberOr(window.durationMs, 0)) : null],
|
||||
].filter((entry): entry is [string, string] => entry[1] !== null);
|
||||
return fields.length === 0 ? "-" : fields.map(([key, item]) => `${key}=${item}`).join(" ");
|
||||
}
|
||||
|
||||
function thisMaintenanceFlag(input: Record<string, unknown>): number {
|
||||
return input.maintenance === true ? 1 : 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user