@wizeworks/lens-cloud 0.3.0-alpha.2 → 0.3.0-alpha.4

package/dist/repo/tags.js

@@ -0,0 +1,33 @@
+import { BUILT_IN_PREFIX, isBuiltInName, tagList } from "@wizeworks/lens-core";
+import { newId } from "../auth/crypto.js";
+/** Built-ins first (minus those the project turned off), then its rules by name. */
+export async function projectTags(q, projectId) {
+    const rows = await q.query("SELECT id, name, color, query FROM tag_rules WHERE project_id = $1", [projectId]);
+    const off = await q.query("SELECT name FROM tag_builtins WHERE project_id = $1 AND NOT enabled", [projectId]);
+    const rules = rows.map((r) => ({ id: r.id, name: r.name, color: r.color, query: r.query, builtIn: false, enabled: true }));
+    return tagList(rules, new Set(off.map((r) => r.name)));
+}
+export async function createTag(q, projectId, input, actor, now) {
+    const id = newId();
+    const sql = "INSERT INTO tag_rules (project_id, id, name, color, query, created_by, created_ms, updated_ms) VALUES ($1, $2, $3, $4, $5, $6, $7, $7)";
+    await q.query(sql, [projectId, id, input.name, input.color, input.query, actor, now]);
+    return { id, ...input, builtIn: false, enabled: true };
+}
+export async function updateTag(q, projectId, id, input, now) {
+    const sql = "UPDATE tag_rules SET name = $3, color = $4, query = $5, updated_ms = $6 WHERE project_id = $1 AND id = $2";
+    await q.query(sql, [projectId, id, input.name, input.color, input.query, now]);
+}
+/** False when the project has no rule with this id. */
+export async function deleteTag(q, projectId, id) {
+    return (await q.query("DELETE FROM tag_rules WHERE project_id = $1 AND id = $2 RETURNING id", [projectId, id])).length > 0;
+}
+/** Turn a built-in on or off for one project; false when `id` is not a built-in. */
+export async function setBuiltIn(q, projectId, id, enabled) {
+    const name = id.startsWith(BUILT_IN_PREFIX) ? id.slice(BUILT_IN_PREFIX.length) : "";
+    if (!isBuiltInName(name))
+        return false;
+    const sql = "INSERT INTO tag_builtins (project_id, name, enabled) VALUES ($1, $2, $3) ON CONFLICT (project_id, name) DO UPDATE SET enabled = EXCLUDED.enabled";
+    await q.query(sql, [projectId, name, enabled]);
+    return true;
+}
+//# sourceMappingURL=tags.js.map

package/dist/repo/tags.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tags.js","sourceRoot":"","sources":["../../src/repo/tags.ts"],"names":[],"mappings":"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"}

package/dist/repo/trace-join.d.ts

@@ -0,0 +1,9 @@
+import { type Trace } from "@wizeworks/lens-core";
+import type { Queryable } from "../db/db.js";
+/** Every project of one organization. */
+export declare function orgProjectIds(q: Queryable, orgId: string): Promise<string[]>;
+/** The projects of `ids` that belong to `orgId`. Anything outside the organization is dropped. */
+export declare function inOrg(q: Queryable, orgId: string, ids: readonly string[]): Promise<string[]>;
+/** One trace with its parts from the projects in `scope` (already checked: same organization, readable by the caller). Undefined when the primary project has no part. */
+export declare function getJoinedTrace(q: Queryable, primaryId: string, scope: readonly string[], traceId: string): Promise<Trace | undefined>;
+//# sourceMappingURL=trace-join.d.ts.map

package/dist/repo/trace-join.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"trace-join.d.ts","sourceRoot":"","sources":["../../src/repo/trace-join.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyC,KAAK,KAAK,EAAE,MAAM,sBAAsB,CAAC;AACzF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAG7C,yCAAyC;AACzC,wBAAsB,aAAa,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAGlF;AAED,kGAAkG;AAClG,wBAAsB,KAAK,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAIlG;AASD,0KAA0K;AAC1K,wBAAsB,cAAc,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,CAU3I"}

package/dist/repo/trace-join.js

@@ -0,0 +1,35 @@
+import { buildTrace } from "@wizeworks/lens-core";
+import { getTrace } from "./trace-read.js";
+/** Every project of one organization. */
+export async function orgProjectIds(q, orgId) {
+    const rows = await q.query("SELECT id FROM projects WHERE org_id = $1", [orgId]);
+    return rows.map((r) => r.id);
+}
+/** The projects of `ids` that belong to `orgId`. Anything outside the organization is dropped. */
+export async function inOrg(q, orgId, ids) {
+    if (ids.length === 0)
+        return [];
+    const rows = await q.query("SELECT id FROM projects WHERE org_id = $1 AND id = ANY($2)", [orgId, [...ids]]);
+    return rows.map((r) => r.id);
+}
+async function partsOf(q, projectIds, traceId) {
+    const ids = [...projectIds];
+    const spans = await q.query("SELECT json FROM spans WHERE project_id = ANY($1) AND trace_id = $2", [ids, traceId]);
+    const logs = await q.query("SELECT json FROM logs WHERE project_id = ANY($1) AND trace_id = $2", [ids, traceId]);
+    return { spans: spans.map((r) => JSON.parse(r.json)), logs: logs.map((r) => JSON.parse(r.json)) };
+}
+/** One trace with its parts from the projects in `scope` (already checked: same organization, readable by the caller). Undefined when the primary project has no part. */
+export async function getJoinedTrace(q, primaryId, scope, traceId) {
+    const own = await getTrace(q, primaryId, traceId);
+    const others = scope.filter((id) => id !== primaryId);
+    if (!own || others.length === 0)
+        return own;
+    const extra = await partsOf(q, others, traceId);
+    if (extra.spans.length + extra.logs.length === 0)
+        return own;
+    const seen = new Set(own.spans.map((s) => s.spanId));
+    const spans = [...own.spans, ...extra.spans.filter((s) => !seen.has(s.spanId) && seen.add(s.spanId))];
+    const logs = [...own.logs, ...extra.logs].sort((a, b) => a.timeMs - b.timeMs);
+    return buildTrace(traceId, spans, logs, []);
+}
+//# sourceMappingURL=trace-join.js.map

package/dist/repo/trace-join.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"trace-join.js","sourceRoot":"","sources":["../../src/repo/trace-join.ts"],"names":[],"mappings":"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"}

package/dist/repo/trace-read.d.ts

@@ -1,17 +1,7 @@
 import { type HubService, type Trace } from "@wizeworks/lens-core";
 import type { Queryable } from "../db/db.js";
-export interface TraceQuery {
-    projectId: string;
-    /** Changed at or after (server clock). */
-    since?: number;
-    /** Started before. For paging back. */
-    before?: number;
-    /** Started at or after. For time windows. */
-    from?: number;
-    env?: string;
-    session?: string;
-    limit: number;
-}
+import type { TraceQuery } from "../telemetry/store.js";
+export type { TraceQuery };
 export declare function findTraceIds(q: Queryable, t: TraceQuery): Promise<string[]>;
 /** Full traces, in the order of `ids`. */
 export declare function loadTraces(q: Queryable, projectId: string, ids: readonly string[]): Promise<Trace[]>;
@@ -20,7 +10,10 @@ export declare function getTrace(q: Queryable, projectId: string, traceId: strin
 /** How many traces started in [from, to). */
 export declare function countTraces(q: Queryable, projectId: string, from: number, to: number, env?: string): Promise<number>;
 export declare function listServices(q: Queryable, projectId: string, now: number): Promise<HubService[]>;
-export declare function environmentsOf(q: Queryable, projectId: string): Promise<string[]>;
+/** Environments of the project's services, plus those seen on traces (from the telemetry store). */
+export declare function environmentsOf(q: Queryable, projectId: string, traceEnvs: readonly string[]): Promise<string[]>;
+/** Environments seen on a project's traces (Postgres store). */
+export declare function traceEnvsPg(q: Queryable, projectId: string): Promise<string[]>;
 export declare function countRows(q: Queryable, projectId: string): Promise<{
     traces: number;
     spans: number;

package/dist/repo/trace-read.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trace-read.d.ts","sourceRoot":"","sources":["../../src/repo/trace-read.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6C,KAAK,UAAU,EAA6B,KAAK,KAAK,EAAE,MAAM,sBAAsB,CAAC;AACzI,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,0CAA0C;IAC1C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,uCAAuC;IACvC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,6CAA6C;IAC7C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf;AAID,wBAAsB,YAAY,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAejF;AAmBD,0CAA0C;AAC1C,wBAAsB,UAAU,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CAS1G;AAED,eAAO,MAAM,WAAW,MAAa,SAAS,KAAK,UAAU,KAAG,OAAO,CAAC,KAAK,EAAE,CAAyD,CAAC;AAEzI,wBAAsB,QAAQ,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,CAG3G;AAED,6CAA6C;AAC7C,wBAAsB,WAAW,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAM1H;AASD,wBAAsB,YAAY,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAGtG;AAED,wBAAsB,cAAc,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAGvF;AAED,wBAAsB,SAAS,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAG3G"}
+{"version":3,"file":"trace-read.d.ts","sourceRoot":"","sources":["../../src/repo/trace-read.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6C,KAAK,UAAU,EAAiD,KAAK,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC7J,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAExD,YAAY,EAAE,UAAU,EAAE,CAAC;AAI3B,wBAAsB,YAAY,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAgBjF;AAmBD,0CAA0C;AAC1C,wBAAsB,UAAU,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CAS1G;AAED,eAAO,MAAM,WAAW,MAAa,SAAS,KAAK,UAAU,KAAG,OAAO,CAAC,KAAK,EAAE,CAAyD,CAAC;AAEzI,wBAAsB,QAAQ,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,CAG3G;AAED,6CAA6C;AAC7C,wBAAsB,WAAW,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAM1H;AASD,wBAAsB,YAAY,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAGtG;AAED,oGAAoG;AACpG,wBAAsB,cAAc,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAGrH;AAED,gEAAgE;AAChE,wBAAsB,WAAW,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAEpF;AAED,wBAAsB,SAAS,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAG3G"}

package/dist/repo/trace-read.js

@@ -1,4 +1,4 @@
-import { buildTrace, HUB_ONLINE_MS } from "@wizeworks/lens-core";
+import { buildTrace, HUB_ONLINE_MS, LOOSE_TRACE_PREFIX } from "@wizeworks/lens-core";
 const CHUNK = 500;
 export async function findTraceIds(q, t) {
     const where = ["project_id = $1"];
@@ -17,6 +17,8 @@ export async function findTraceIds(q, t) {
         add("env = ?", t.env);
     if (t.session)
         add("trace_id IN (SELECT trace_id FROM spans WHERE project_id = $1 AND session = ?)", t.session);
+    if (t.noLoose)
+        add("substr(trace_id, 1, 16) <> ?", LOOSE_TRACE_PREFIX);
     args.push(t.limit);
     const rows = await q.query(`SELECT trace_id FROM traces WHERE ${where.join(" AND ")} ORDER BY start_ms DESC LIMIT $${args.length}`, args);
     return rows.map((r) => r.trace_id);
@@ -65,9 +67,14 @@ export async function listServices(q, projectId, now) {
     const rows = await q.query("SELECT via, info, first_seen, last_seen FROM services WHERE project_id = $1 ORDER BY last_seen DESC", [projectId]);
     return rows.map((r) => ({ ...JSON.parse(r.info), via: r.via, firstSeenMs: r.first_seen, lastSeenMs: r.last_seen, online: now - r.last_seen <= HUB_ONLINE_MS }));
 }
-export async function environmentsOf(q, projectId) {
-    const rows = await q.query("SELECT environment AS e FROM services WHERE project_id = $1 UNION SELECT DISTINCT env FROM traces WHERE project_id = $1", [projectId]);
-    return rows.map((r) => r.e).filter(Boolean).sort();
+/** Environments of the project's services, plus those seen on traces (from the telemetry store). */
+export async function environmentsOf(q, projectId, traceEnvs) {
+    const rows = await q.query("SELECT DISTINCT environment AS e FROM services WHERE project_id = $1", [projectId]);
+    return [...new Set([...rows.map((r) => r.e), ...traceEnvs])].filter(Boolean).sort();
+}
+/** Environments seen on a project's traces (Postgres store). */
+export async function traceEnvsPg(q, projectId) {
+    return (await q.query("SELECT DISTINCT env AS e FROM traces WHERE project_id = $1", [projectId])).map((r) => r.e);
 }
 export async function countRows(q, projectId) {
     const n = async (table) => (await q.query(`SELECT count(*)::int AS n FROM ${table} WHERE project_id = $1`, [projectId]))[0]?.n ?? 0;

package/dist/repo/trace-read.js.map

@@ -1 +1 @@
-{"version":3,"file":"trace-read.js","sourceRoot":"","sources":["../../src/repo/trace-read.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"trace-read.js","sourceRoot":"","sources":["../../src/repo/trace-read.ts"],"names":[],"mappings":"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"}

package/dist/repo/trace-write.d.ts

@@ -1,9 +1,13 @@
 import type { HubWrite } from "@wizeworks/lens-hub/kit";
 import type { Queryable } from "../db/db.js";
-/** Save one batch for one project, in the caller's transaction. */
+/** Record the sender in the project's service registry (Postgres, whatever keeps the telemetry). */
+export declare function writeService(q: Queryable, projectId: string, w: HubWrite, now: number): Promise<void>;
+/** Save one batch for one project: registry and telemetry, in the caller's transaction (Postgres small mode, and tests). */
 export declare function writeBatch(q: Queryable, projectId: string, w: HubWrite, now: number): Promise<void>;
+/** Save one batch's spans, logs, trace bounds, and metrics to Postgres, in the caller's transaction. */
+export declare function writeTelemetry(q: Queryable, projectId: string, w: HubWrite, now: number): Promise<void>;
 /** Drop metric points older than each organization's retention. */
 export declare function pruneMetricsByRetention(q: Queryable, now: number): Promise<void>;
-/** Drop traces older than each organization's retention. Returns how many traces were dropped. */
+/** Drop traces older than each organization's retention, and loose batches (lines outside a request) older than the log retention. Returns how many were dropped. */
 export declare function pruneByRetention(q: Queryable, now: number): Promise<number>;
 //# sourceMappingURL=trace-write.d.ts.map

package/dist/repo/trace-write.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trace-write.d.ts","sourceRoot":"","sources":["../../src/repo/trace-write.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EAAM,SAAS,EAAE,MAAM,aAAa,CAAC;AAoCjD,mEAAmE;AACnE,wBAAsB,UAAU,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAwBzG;AASD,mEAAmE;AACnE,wBAAsB,uBAAuB,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAOtF;AAED,kGAAkG;AAClG,wBAAsB,gBAAgB,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAejF"}
+{"version":3,"file":"trace-write.d.ts","sourceRoot":"","sources":["../../src/repo/trace-write.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EAAM,SAAS,EAAE,MAAM,aAAa,CAAC;AAsCjD,oGAAoG;AACpG,wBAAsB,YAAY,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAS3G;AAED,4HAA4H;AAC5H,wBAAsB,UAAU,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAGzG;AAED,wGAAwG;AACxG,wBAAsB,cAAc,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAmB7G;AASD,mEAAmE;AACnE,wBAAsB,uBAAuB,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAOtF;AAED,qKAAqK;AACrK,wBAAsB,gBAAgB,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAgBjF"}

package/dist/repo/trace-write.js

@@ -1,7 +1,9 @@
 import { createHash } from "node:crypto";
-import { ATTR_BROWSER_SESSION, logKey, PG_DIALECT, pruneStatements, seriesKeyOf } from "@wizeworks/lens-core";
+import { ATTR_BROWSER_SESSION, INFRA_SERVICE, logKey, LOOSE_TRACE_PREFIX, PG_DIALECT, pruneStatements, seriesKeyOf } from "@wizeworks/lens-core";
 import { runStatements, stateOf } from "../settle.js";
+import { LOG_DAYS_SQL } from "./log-retention.js";
 import { pruneMetricRollups, writeMetricRollups } from "./metric-write.js";
+import { KEEP_DAYS } from "./settings.js";
 const CHUNK = 200;
 /** `INSERT ... VALUES ($1, $2), ($3, $4) ... <tail>` for many rows at once. */
 async function insertMany(q, head, rows, tail) {
@@ -31,11 +33,23 @@ function traceRows(w, projectId, now) {
     const env = w.sender.environment ?? "";
     return [...bounds].map(([id, [start, end]]) => [projectId, id, start, end, now, env]);
 }
-/** Save one batch for one project, in the caller's transaction. */
-export async function writeBatch(q, projectId, w, now) {
+/** Record the sender in the project's service registry (Postgres, whatever keeps the telemetry). */
+export async function writeService(q, projectId, w, now) {
     const s = w.sender;
+    // The collector's host and Kubernetes receivers are not a service.
+    if (s.service === INFRA_SERVICE)
+        return;
     await q.query(`INSERT INTO services (project_id, service, environment, host, via, info, first_seen, last_seen) VALUES ($1, $2, $3, $4, $5, $6, $7, $7)
      ON CONFLICT (project_id, service, environment, host) DO UPDATE SET via = EXCLUDED.via, info = EXCLUDED.info, last_seen = EXCLUDED.last_seen`, [projectId, s.service, s.environment ?? "", s.host ?? "", w.via, JSON.stringify(s), now]);
+}
+/** Save one batch for one project: registry and telemetry, in the caller's transaction (Postgres small mode, and tests). */
+export async function writeBatch(q, projectId, w, now) {
+    await writeService(q, projectId, w, now);
+    await writeTelemetry(q, projectId, w, now);
+}
+/** Save one batch's spans, logs, trace bounds, and metrics to Postgres, in the caller's transaction. */
+export async function writeTelemetry(q, projectId, w, now) {
+    const s = w.sender;
     await insertMany(q, "INSERT INTO traces (project_id, trace_id, start_ms, end_ms, updated_ms, env)", traceRows(w, projectId, now), `
     ON CONFLICT (project_id, trace_id) DO UPDATE SET start_ms = LEAST(traces.start_ms, EXCLUDED.start_ms),
       end_ms = GREATEST(traces.end_ms, EXCLUDED.end_ms), updated_ms = EXCLUDED.updated_ms,
@@ -61,14 +75,15 @@ function dedupe(items, key) {
 /** Drop metric points older than each organization's retention. */
 export async function pruneMetricsByRetention(q, now) {
     await q.query(`DELETE FROM metric_points m USING projects p, orgs o WHERE p.id = m.project_id AND o.id = p.org_id
-     AND m.time_ms < $1 - o.retention_days * 86400000.0`, [now]);
+     AND m.time_ms < $1 - ${KEEP_DAYS} * 86400000.0`, [now]);
     await pruneMetricRollups(q, now);
 }
-/** Drop traces older than each organization's retention. Returns how many traces were dropped. */
+/** Drop traces older than each organization's retention, and loose batches (lines outside a request) older than the log retention. Returns how many were dropped. */
 export async function pruneByRetention(q, now) {
+    const loose = `substr(t.trace_id, 1, 16) = '${LOOSE_TRACE_PREFIX}'`;
     const prune = async (x) => {
-        const doomed = await x.query(`SELECT t.project_id, t.trace_id, t.env, t.contrib, o.retention_days FROM traces t JOIN projects p ON p.id = t.project_id JOIN orgs o ON o.id = p.org_id
-       WHERE t.start_ms < $1 - o.retention_days * 86400000.0 LIMIT 5000`, [now]);
+        const doomed = await x.query(`SELECT t.project_id, t.trace_id, t.env, t.contrib, ${KEEP_DAYS} AS retention_days, p.log_retention_days FROM traces t JOIN projects p ON p.id = t.project_id JOIN orgs o ON o.id = p.org_id
+       WHERE (NOT ${loose} AND t.start_ms < $1 - ${KEEP_DAYS} * 86400000.0) OR (${loose} AND t.start_ms < $1 - ${LOG_DAYS_SQL} * 86400000.0) LIMIT 5000`, [now]);
         // Take their contributions out of the rollups and drop their facts first.
         await runStatements(x, pruneStatements(PG_DIALECT, doomed.map((d) => stateOf(d, d.retention_days ?? 30)), now, true));
         for (const table of ["spans", "logs", "traces"]) {

package/dist/repo/trace-write.js.map

@@ -1 +1 @@
-{"version":3,"file":"trace-write.js","sourceRoot":"","sources":["../../src/repo/trace-write.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"trace-write.js","sourceRoot":"","sources":["../../src/repo/trace-write.ts"],"names":[],"mappings":"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"}

package/dist/repo/uptime.d.ts

@@ -0,0 +1,21 @@
+import { type UptimeCheck, type UptimeCheckInput, type UptimeIncident, type UptimeResult } from "@wizeworks/lens-core";
+import type { AuthSecret } from "../auth/secret.js";
+import type { Queryable } from "../db/db.js";
+export type CloudCheck = UptimeCheck & {
+    projectId: string;
+};
+export declare const listChecks: (q: Queryable, secrets: readonly AuthSecret[], projectId: string) => Promise<CloudCheck[]>;
+export declare function checkById(q: Queryable, secrets: readonly AuthSecret[], projectId: string, id: string): Promise<CloudCheck | undefined>;
+export declare const countChecks: (q: Queryable, projectId: string) => Promise<number>;
+export declare function createCheck(q: Queryable, secrets: readonly AuthSecret[], projectId: string, c: UptimeCheckInput, by: string, now: number): Promise<string>;
+/** Save a change. A shorter interval brings the next run closer; a check turned off ends its open incident and starts over as pending. */
+export declare function updateCheck(q: Queryable, secrets: readonly AuthSecret[], current: CloudCheck, c: UptimeCheckInput, now: number): Promise<void>;
+export declare function deleteCheck(q: Queryable, projectId: string, id: string): Promise<boolean>;
+/** Take the checks that are due and push their next run out, in one step, so two cloud replicas never run the same check. */
+export declare function claimDue(q: Queryable, secrets: readonly AuthSecret[], now: number, limit: number): Promise<CloudCheck[]>;
+/** Keep a run's result on its check, and open or close an incident. */
+export declare function saveRun(q: Queryable, c: CloudCheck, r: UptimeResult): Promise<void>;
+/** A project's incidents still open or ended in the last 90 days. */
+export declare const listIncidents: (q: Queryable, projectId: string, now: number) => Promise<UptimeIncident[]>;
+export declare const pruneIncidents: (q: Queryable, now: number) => Promise<void>;
+//# sourceMappingURL=uptime.d.ts.map

package/dist/repo/uptime.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"uptime.d.ts","sourceRoot":"","sources":["../../src/repo/uptime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkD,KAAK,WAAW,EAAE,KAAK,gBAAgB,EAAE,KAAK,cAAc,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEvK,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAG7C,MAAM,MAAM,UAAU,GAAG,WAAW,GAAG;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC;AAS7D,eAAO,MAAM,UAAU,MAAa,SAAS,WAAW,SAAS,UAAU,EAAE,aAAa,MAAM,KAAG,OAAO,CAAC,UAAU,EAAE,CACa,CAAC;AAErI,wBAAsB,SAAS,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,UAAU,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAE5I;AAED,eAAO,MAAM,WAAW,MAAa,SAAS,aAAa,MAAM,KAAG,OAAO,CAAC,MAAM,CAC+C,CAAC;AAElI,wBAAsB,WAAW,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,UAAU,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,EAAE,gBAAgB,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAQhK;AAED,0IAA0I;AAC1I,wBAAsB,WAAW,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,UAAU,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,EAAE,gBAAgB,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQpJ;AAED,wBAAsB,WAAW,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAE/F;AAED,6HAA6H;AAC7H,wBAAsB,QAAQ,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,UAAU,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAQ9H;AAED,uEAAuE;AACvE,wBAAsB,OAAO,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAQzF;AAED,qEAAqE;AACrE,eAAO,MAAM,aAAa,MAAO,SAAS,aAAa,MAAM,OAAO,MAAM,KAAG,OAAO,CAAC,cAAc,EAAE,CAKlG,CAAC;AAEJ,eAAO,MAAM,cAAc,MAAa,SAAS,OAAO,MAAM,KAAG,OAAO,CAAC,IAAI,CAAmG,CAAC"}

package/dist/repo/uptime.js

@@ -0,0 +1,53 @@
+import { changeOf, lastRunOf, nextRunMs, UPTIME_KEEP_MS } from "@wizeworks/lens-core";
+import { newId } from "../auth/crypto.js";
+import { openHeaders, sealHeaders } from "../uptime/headers.js";
+const COLUMNS = `id, project_id AS "projectId", name, url, method, headers, expect_status AS "expectStatus", expect_body AS "expectBody",
+  interval_min AS "intervalMin", timeout_ms AS "timeoutMs", env, enabled, created_ms AS "createdMs", state, last_run_ms AS "lastRunMs",
+  last_duration_ms AS "lastDurationMs", last_status AS "lastStatus", last_error AS "lastError", tls_expires_ms AS "tlsExpiresMs"`;
+const toChecks = (secrets, rows) => Promise.all(rows.map(async (r) => ({ ...r, headers: await openHeaders(secrets, r.headers) })));
+export const listChecks = async (q, secrets, projectId) => toChecks(secrets, await q.query(`SELECT ${COLUMNS} FROM uptime_checks WHERE project_id = $1 ORDER BY name, id`, [projectId]));
+export async function checkById(q, secrets, projectId, id) {
+    return (await toChecks(secrets, await q.query(`SELECT ${COLUMNS} FROM uptime_checks WHERE project_id = $1 AND id = $2`, [projectId, id])))[0];
+}
+export const countChecks = async (q, projectId) => Number((await q.query("SELECT count(*) AS n FROM uptime_checks WHERE project_id = $1", [projectId]))[0]?.n ?? 0);
+export async function createCheck(q, secrets, projectId, c, by, now) {
+    const id = newId();
+    await q.query(`INSERT INTO uptime_checks (id, project_id, name, url, method, headers, expect_status, expect_body, interval_min, timeout_ms, env, enabled, created_by, created_ms, next_ms)
+     VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $14)`, [id, projectId, c.name, c.url, c.method, await sealHeaders(secrets, c.headers), c.expectStatus, c.expectBody, c.intervalMin, c.timeoutMs, c.env, c.enabled, by, now]);
+    return id;
+}
+/** Save a change. A shorter interval brings the next run closer; a check turned off ends its open incident and starts over as pending. */
+export async function updateCheck(q, secrets, current, c, now) {
+    const next = Math.min(nextRunMs({ lastRunMs: current.lastRunMs, intervalMin: c.intervalMin }, now), now + c.intervalMin * 60_000);
+    await q.query(`UPDATE uptime_checks SET name = $2, url = $3, method = $4, headers = $5, expect_status = $6, expect_body = $7, interval_min = $8, timeout_ms = $9,
+       env = $10, enabled = $11, next_ms = $12, state = CASE WHEN $11 THEN state ELSE 'pending' END WHERE id = $1`, [current.id, c.name, c.url, c.method, await sealHeaders(secrets, c.headers), c.expectStatus, c.expectBody, c.intervalMin, c.timeoutMs, c.env, c.enabled, next]);
+    if (!c.enabled)
+        await q.query("UPDATE uptime_incidents SET end_ms = $2 WHERE check_id = $1 AND end_ms IS NULL", [current.id, now]);
+}
+export async function deleteCheck(q, projectId, id) {
+    return (await q.query("DELETE FROM uptime_checks WHERE project_id = $1 AND id = $2 RETURNING id", [projectId, id])).length > 0;
+}
+/** Take the checks that are due and push their next run out, in one step, so two cloud replicas never run the same check. */
+export async function claimDue(q, secrets, now, limit) {
+    const rows = await q.query(`UPDATE uptime_checks SET next_ms = $1 + interval_min * 60000
+     WHERE id IN (SELECT id FROM uptime_checks WHERE enabled AND next_ms <= $1 ORDER BY next_ms LIMIT $2 FOR UPDATE SKIP LOCKED)
+     RETURNING ${COLUMNS}`, [now, limit]);
+    return toChecks(secrets, rows);
+}
+/** Keep a run's result on its check, and open or close an incident. */
+export async function saveRun(q, c, r) {
+    const change = changeOf(c, r);
+    const last = lastRunOf(r);
+    await q.query("UPDATE uptime_checks SET state = $2, last_run_ms = $3, last_duration_ms = $4, last_status = $5, last_error = $6, tls_expires_ms = $7 WHERE id = $1", [
+        c.id, last.state, last.lastRunMs, last.lastDurationMs, last.lastStatus, last.lastError, last.tlsExpiresMs,
+    ]);
+    if (change.open !== null)
+        await q.query("INSERT INTO uptime_incidents (id, check_id, project_id, start_ms, reason) VALUES ($1, $2, $3, $4, $5)", [newId(), c.id, c.projectId, r.startMs, change.open]);
+    if (change.closeAtMs !== null)
+        await q.query("UPDATE uptime_incidents SET end_ms = $2 WHERE check_id = $1 AND end_ms IS NULL", [c.id, change.closeAtMs]);
+}
+/** A project's incidents still open or ended in the last 90 days. */
+export const listIncidents = (q, projectId, now) => q.query(`SELECT id, check_id AS "checkId", start_ms AS "startMs", end_ms AS "endMs", reason FROM uptime_incidents
+     WHERE project_id = $1 AND (end_ms IS NULL OR end_ms >= $2) ORDER BY start_ms DESC`, [projectId, now - UPTIME_KEEP_MS]);
+export const pruneIncidents = async (q, now) => void (await q.query("DELETE FROM uptime_incidents WHERE end_ms < $1", [now - UPTIME_KEEP_MS]));
+//# sourceMappingURL=uptime.js.map

package/dist/repo/uptime.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"uptime.js","sourceRoot":"","sources":["../../src/repo/uptime.ts"],"names":[],"mappings":"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"}

package/dist/routes/alerts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"alerts.d.ts","sourceRoot":"","sources":["../../src/routes/alerts.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAGrC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAsGhD,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAMhD"}
+{"version":3,"file":"alerts.d.ts","sourceRoot":"","sources":["../../src/routes/alerts.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAGrC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAwGhD,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAShD"}

package/dist/routes/alerts.js

@@ -1,87 +1,50 @@
-import { isAlertMetric, isMetricAlertStat, MAX_METRIC_NAME } from "@wizeworks/lens-core";
+import { MUTED_FOREVER, parseAlertRule } from "@wizeworks/lens-core";
+import { checkTarget } from "@wizeworks/lens-hub/kit";
 import { notify } from "../alerts/evaluate.js";
-import { checkTarget } from "../alerts/notify.js";
 import { requireProject } from "../auth/principal.js";
-import { fail, readJsonBody, sendJson, str } from "../http/http.js";
+import { fail, readJsonBody, sendJson } from "../http/http.js";
+import { addEvent, listEvents, ruleEvents, ruleValues } from "../repo/alert-events.js";
+import { ackRule, createRule, deleteRule, listRules, muteRule, ruleById, updateRule } from "../repo/alerts.js";
+import { sloById } from "../repo/slos.js";
 import { memberEmails } from "../repo/users.js";
-import { createRule, deleteRule, listEvents, listRules, ruleById, updateRule } from "../repo/alerts.js";
-const WINDOWS = [5, 15, 60, 360, 1440].map((m) => m * 60_000);
-const MAX_CHANNELS = 5;
 const MAX_EMAILS = 20;
+/** Who did it, in words: the person's name or email. Only people can mute and acknowledge. */
+const whoOf = (a) => (a.principal.kind === "user" && a.principal.user ? a.principal.user.name || a.principal.user.email : "someone");
+const DAY_MS = 86_400_000;
 /** Email goes only to members of the organization with a confirmed address, so a rule cannot send mail to strangers. */
 async function emailChannel(ctx, orgId, to) {
     const allowed = new Set(await memberEmails(ctx.app.db, orgId, ctx.app.mailer.live));
     const list = Array.isArray(to) ? [...new Set(to.filter((x) => typeof x === "string").map((x) => x.trim().toLowerCase()))] : [];
     if (list.length === 0 || list.length > MAX_EMAILS)
-        fail(400, `Send to 1 to ${MAX_EMAILS} email addresses.`);
+        return `Send to 1 to ${MAX_EMAILS} email addresses.`;
     const stranger = list.find((e) => !allowed.has(e));
-    if (stranger)
-        fail(400, `${stranger} is not a member of this organization with a confirmed email.`);
-    return { kind: "email", to: list };
-}
-async function channelsOf(ctx, orgId, raw) {
-    const list = Array.isArray(raw) ? raw.slice(0, MAX_CHANNELS) : [];
-    const out = [];
-    for (const c of list) {
-        if (c.kind === "email") {
-            out.push(await emailChannel(ctx, orgId, c.to));
-            continue;
-        }
-        if ((c.kind !== "webhook" && c.kind !== "slack") || typeof c.url !== "string")
-            return fail(400, "Each channel needs kind (webhook, slack, or email) and url (or to).");
-        const problem = await checkTarget(c.url, ctx.app.config.allowPrivateWebhooks);
-        if (problem)
-            fail(400, `${c.url}: ${problem}`);
-        out.push({ kind: c.kind, url: c.url });
-    }
-    return out;
-}
-/** The metric part of a rule: for "metric" rules, the OpenTelemetry metric to read. */
-function metricPart(b) {
-    if (b.metric !== "metric") {
-        if (!isAlertMetric(b.metric))
-            fail(400, "Pick a metric: error_rate, p95_ms, avg_ms, requests, new_errors, slow_queries, or metric.");
-        return { metric: b.metric, metricName: "", metricStat: "", metricService: "" };
-    }
-    const name = typeof b.metricName === "string" ? b.metricName.trim() : "";
-    if (!name || name.length > MAX_METRIC_NAME)
-        fail(400, "Set metricName to the metric to watch, for example process.cpu.utilization.");
-    const stat = b.metricStat ?? "avg";
-    if (!isMetricAlertStat(stat))
-        fail(400, "Pick a metricStat: last, avg, max, p95, p99, or rate.");
-    const service = typeof b.metricService === "string" ? b.metricService.trim().slice(0, 100) : "";
-    return { metric: "metric", metricName: name, metricStat: stat, metricService: service };
+    return stranger ? `${stranger} is not a member of this organization with a confirmed email.` : { kind: "email", to: list };
 }
 /** Check a rule from the request body. A change sends only what it changes: the rest comes from `current`. */
-async function ruleInput(ctx, orgId, current) {
+async function ruleInput(ctx, orgId, projectId, current) {
     const b = { ...current, ...(await readJsonBody(ctx.req)) };
-    const metric = metricPart(b);
-    if (b.op !== ">" && b.op !== "<")
-        fail(400, 'Set op to ">" or "<".');
-    const threshold = Number(b.threshold);
-    if (!Number.isFinite(threshold))
-        fail(400, "Set a number for threshold.");
-    const windowMs = Number(b.windowMs ?? 5 * 60_000);
-    if (!WINDOWS.includes(windowMs))
-        fail(400, "Pick a window of 5, 15, 60, 360, or 1440 minutes.");
-    return {
-        name: str(b, "name").slice(0, 100),
-        ...metric,
-        op: b.op,
-        threshold,
-        windowMs,
-        env: typeof b.env === "string" ? b.env.slice(0, 50) : "",
-        channels: await channelsOf(ctx, orgId, b.channels),
-        enabled: b.enabled !== false,
-    };
+    const allowPrivate = ctx.app.config.allowPrivateWebhooks;
+    const checkSlo = async (id) => ((await sloById(ctx.app.db, projectId, id)) ? null : "That SLO is not in this project.");
+    const r = await parseAlertRule(b, { checkUrl: (url) => checkTarget(url, allowPrivate), checkSlo, email: (to) => emailChannel(ctx, orgId, to) });
+    return typeof r === "string" ? fail(400, r) : r;
 }
 async function list(ctx) {
     const { project } = await requireProject(ctx, ctx.params.project);
     sendJson(ctx.res, 200, { rules: await listRules(ctx.app.db, project.id), events: await listEvents(ctx.app.db, project.id, 100) });
 }
+/** One rule: its events and its values over `from`..`to` (default the last day). */
+async function one(ctx) {
+    const { project } = await requireProject(ctx, ctx.params.project);
+    const rule = await ruleById(ctx.app.db, project.id, ctx.params.id);
+    if (!rule)
+        return fail(404, "Alert rule not found.");
+    const to = Number(ctx.url.searchParams.get("to")) || ctx.app.config.now() + 1;
+    const from = Number(ctx.url.searchParams.get("from")) || to - DAY_MS;
+    sendJson(ctx.res, 200, { rule, events: await ruleEvents(ctx.app.db, rule.id, 100), values: await ruleValues(ctx.app.db, rule.id, from, to) });
+}
 async function create(ctx) {
     const { project, actor } = await requireProject(ctx, ctx.params.project, "write");
-    const id = await createRule(ctx.app.db, project.id, await ruleInput(ctx, project.orgId), actor, ctx.app.config.now());
+    const id = await createRule(ctx.app.db, project.id, await ruleInput(ctx, project.orgId, project.id), actor, ctx.app.config.now());
     sendJson(ctx.res, 201, await ruleById(ctx.app.db, project.id, id));
 }
 async function change(ctx) {
@@ -89,7 +52,7 @@ async function change(ctx) {
     const current = await ruleById(ctx.app.db, project.id, ctx.params.id);
     if (!current)
         fail(404, "Alert rule not found.");
-    await updateRule(ctx.app.db, project.id, ctx.params.id, await ruleInput(ctx, project.orgId, current));
+    await updateRule(ctx.app.db, project.id, ctx.params.id, await ruleInput(ctx, project.orgId, project.id, current));
     sendJson(ctx.res, 200, await ruleById(ctx.app.db, project.id, ctx.params.id));
 }
 async function remove(ctx) {
@@ -106,11 +69,47 @@ async function test(ctx) {
         return fail(404, "Alert rule not found.");
     sendJson(ctx.res, 200, { delivery: await notify(ctx.app, rule, "test", rule.lastValue, ctx.app.config.now()) });
 }
+/** `{ untilMs }`: no notices until then (`null` unmutes, `-1` mutes until unmuted). */
+async function mute(ctx) {
+    const access = await requireProject(ctx, ctx.params.project, "write");
+    const { project } = access;
+    const actor = whoOf(access);
+    const rule = await ruleById(ctx.app.db, project.id, ctx.params.id);
+    if (!rule)
+        return fail(404, "Alert rule not found.");
+    const raw = (await readJsonBody(ctx.req)).untilMs;
+    const now = ctx.app.config.now();
+    const untilMs = raw === null ? null : raw === -1 ? MUTED_FOREVER : Number(raw);
+    if (untilMs !== null && (!Number.isFinite(untilMs) || untilMs <= now))
+        return fail(400, "Set untilMs to a future time, -1 for until unmuted, or null to unmute.");
+    await muteRule(ctx.app.db, project.id, rule.id, untilMs);
+    const message = untilMs === null ? `Unmuted by ${actor}` : untilMs === MUTED_FOREVER ? `Muted by ${actor} until unmuted` : `Muted by ${actor} until ${new Date(untilMs).toISOString().slice(0, 16).replace("T", " ")} UTC`;
+    await addEvent(ctx.app.db, rule, { kind: untilMs === null ? "unmute" : "mute", value: null, message, timeMs: now, delivery: "" });
+    sendJson(ctx.res, 200, await ruleById(ctx.app.db, project.id, rule.id));
+}
+/** Acknowledge a firing rule: reminders stop until it resolves. */
+async function ack(ctx) {
+    const access = await requireProject(ctx, ctx.params.project, "write");
+    const { project } = access;
+    const actor = whoOf(access);
+    const rule = await ruleById(ctx.app.db, project.id, ctx.params.id);
+    if (!rule)
+        return fail(404, "Alert rule not found.");
+    if (rule.state !== "firing")
+        return fail(400, "Only a firing rule can be acknowledged.");
+    const now = ctx.app.config.now();
+    await ackRule(ctx.app.db, project.id, rule.id, now);
+    await addEvent(ctx.app.db, rule, { kind: "ack", value: rule.lastValue, message: `Acknowledged by ${actor}`, timeMs: now, delivery: "" });
+    sendJson(ctx.res, 200, await ruleById(ctx.app.db, project.id, rule.id));
+}
 export function alertRoutes(r) {
     r.on("GET", "api/projects/:project/alerts", list)
         .on("POST", "api/projects/:project/alerts", create)
+        .on("GET", "api/projects/:project/alerts/:id", one)
         .on("PATCH", "api/projects/:project/alerts/:id", change)
         .on("DELETE", "api/projects/:project/alerts/:id", remove)
-        .on("POST", "api/projects/:project/alerts/:id/test", test);
+        .on("POST", "api/projects/:project/alerts/:id/test", test)
+        .on("POST", "api/projects/:project/alerts/:id/mute", mute)
+        .on("POST", "api/projects/:project/alerts/:id/ack", ack);
 }
 //# sourceMappingURL=alerts.js.map