Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f1443f1db5 | ||
|
|
a9a84fabac | ||
|
|
2b150fa3a6 |
@@ -9,7 +9,10 @@ import type {
|
||||
import { AppError } from "../errors.js";
|
||||
import { isValidIpv4 } from "../lib/validators.js";
|
||||
import { getView } from "./service-config-service.js";
|
||||
import { selectActiveIpsByMode } from "./routing/index.js";
|
||||
import {
|
||||
isSharedPool,
|
||||
resolveDesiredAIps,
|
||||
} from "./routing/index.js";
|
||||
|
||||
function assertAddress(address: string): void {
|
||||
if (!isValidIpv4(address)) {
|
||||
@@ -89,8 +92,12 @@ export async function getOverview(
|
||||
: null;
|
||||
|
||||
const active = new Set<string>();
|
||||
const serviceIps = service.ips.filter(
|
||||
(ip) => service.ip_enabled[ip] !== false,
|
||||
);
|
||||
for (const binding of bindings) {
|
||||
const metas = repos.listBindingIpsWithMeta(db, binding.id);
|
||||
const targetIps = metas.map((entry) => entry.ip);
|
||||
const rows = metas.map((entry) => {
|
||||
const status = repos.getIpHealthStatusRow(db, "binding", binding.id, entry.ip);
|
||||
return {
|
||||
@@ -100,12 +107,15 @@ export async function getOverview(
|
||||
health: status ? status.status : ("unknown" as const),
|
||||
};
|
||||
});
|
||||
for (const ip of selectActiveIpsByMode(
|
||||
for (const ip of resolveDesiredAIps(
|
||||
{
|
||||
lb_mode: binding.lb_mode,
|
||||
health_check_enabled: binding.health_check_enabled,
|
||||
},
|
||||
rows,
|
||||
targetIps,
|
||||
Date.now(),
|
||||
serviceIps,
|
||||
)) {
|
||||
active.add(ip);
|
||||
}
|
||||
@@ -134,10 +144,13 @@ export function opsSummary(db: Db) {
|
||||
if (binding.lb_mode !== "failover" || !binding.health_check_enabled) {
|
||||
return false;
|
||||
}
|
||||
return binding.target_ips.some((ip) => {
|
||||
const row = repos.getIpHealthStatusRow(db, "binding", binding.id, ip);
|
||||
return row?.status === "down";
|
||||
});
|
||||
return (
|
||||
isSharedPool(binding.target_ips) &&
|
||||
binding.target_ips.some((ip) => {
|
||||
const row = repos.getIpHealthStatusRow(db, "binding", binding.id, ip);
|
||||
return row?.status === "down";
|
||||
})
|
||||
);
|
||||
}).length;
|
||||
return {
|
||||
domains: domains.length,
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import type { LbMode } from "@cfdm/shared";
|
||||
import { failoverDesired } from "./failover.js";
|
||||
import { canApplyLb, isSharedPool } from "./pool.js";
|
||||
import { roundRobinDesired } from "./round-robin.js";
|
||||
import type { LbIpRow, LbTargetConfig } from "./types.js";
|
||||
import { weightedDesired } from "./weighted.js";
|
||||
@@ -7,6 +8,12 @@ import { weightedDesired } from "./weighted.js";
|
||||
export type { LbIpRow, LbTargetConfig } from "./types.js";
|
||||
export { isHealthy } from "./health.js";
|
||||
export { withBindingLock } from "./binding-lock.js";
|
||||
export {
|
||||
canApplyLb,
|
||||
isSharedPool,
|
||||
shouldRecordFailoverDnsDiff,
|
||||
uniqueIpCount,
|
||||
} from "./pool.js";
|
||||
export { WEIGHTED_DNS_TTL, WEIGHTED_SLOT_MS, weightedDesired } from "./weighted.js";
|
||||
|
||||
export function selectActiveIpsByMode(
|
||||
@@ -24,6 +31,23 @@ export function selectActiveIpsByMode(
|
||||
return roundRobinDesired(rows);
|
||||
}
|
||||
|
||||
export function resolveDesiredAIps(
|
||||
config: LbTargetConfig,
|
||||
rows: LbIpRow[],
|
||||
fallbackIps: readonly string[],
|
||||
nowMs = Date.now(),
|
||||
serviceIps: readonly string[] = fallbackIps,
|
||||
): string[] {
|
||||
const fallback = [...fallbackIps];
|
||||
if (!canApplyLb(serviceIps, fallback)) return fallback;
|
||||
if (!isSharedPool(rows.map((row) => row.ip))) return fallback;
|
||||
if (config.lb_mode === "weighted" || config.health_check_enabled) {
|
||||
const activeIps = selectActiveIpsByMode(config, rows, nowMs);
|
||||
if (activeIps.length > 0) return activeIps;
|
||||
}
|
||||
return fallback;
|
||||
}
|
||||
|
||||
export function strategyLabel(mode: LbMode): string {
|
||||
if (mode === "failover") return "Failover";
|
||||
if (mode === "weighted") return "Weighted";
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
import type { LbMode } from "@cfdm/shared";
|
||||
|
||||
export function uniqueIpCount(ips: readonly string[]): number {
|
||||
return new Set(ips.filter(Boolean)).size;
|
||||
}
|
||||
|
||||
/** Shared pool — two or more unique IPs. One IP (even duplicated) is not a pool. */
|
||||
export function isSharedPool(ips: readonly string[]): boolean {
|
||||
return uniqueIpCount(ips) >= 2;
|
||||
}
|
||||
|
||||
/** LB / drain only when the service itself has a pool AND this FQDN is shared. */
|
||||
export function canApplyLb(
|
||||
serviceIps: readonly string[],
|
||||
bindingIps: readonly string[],
|
||||
): boolean {
|
||||
return isSharedPool(serviceIps) && isSharedPool(bindingIps);
|
||||
}
|
||||
|
||||
export function shouldRecordFailoverDnsDiff(input: {
|
||||
configuredIps: readonly string[];
|
||||
lbMode: LbMode;
|
||||
added: readonly string[];
|
||||
removed: readonly string[];
|
||||
downIps: ReadonlySet<string>;
|
||||
}): boolean {
|
||||
if (!isSharedPool(input.configuredIps)) return false;
|
||||
if (input.lbMode !== "weighted") return true;
|
||||
return [...input.added, ...input.removed].some((ip) => input.downIps.has(ip));
|
||||
}
|
||||
@@ -29,8 +29,12 @@ import * as domainService from "./domain-service.js";
|
||||
import { syncServiceToVpsTracker } from "./vps-tracker-sync.js";
|
||||
import { fireEnsureHealthWorker, DEFAULT_HEALTH_FALLBACKS } from "./health/health-worker-deploy.js";
|
||||
import {
|
||||
canApplyLb,
|
||||
isHealthy,
|
||||
isSharedPool,
|
||||
resolveDesiredAIps,
|
||||
selectActiveIpsByMode,
|
||||
shouldRecordFailoverDnsDiff,
|
||||
withBindingLock,
|
||||
WEIGHTED_DNS_TTL,
|
||||
type LbIpRow,
|
||||
@@ -38,12 +42,24 @@ import {
|
||||
} from "./routing/index.js";
|
||||
|
||||
export type { LbIpRow, LbTargetConfig };
|
||||
export { selectActiveIpsByMode };
|
||||
export {
|
||||
canApplyLb,
|
||||
resolveDesiredAIps,
|
||||
selectActiveIpsByMode,
|
||||
shouldRecordFailoverDnsDiff,
|
||||
};
|
||||
|
||||
const AUTO_DNS_TTL = 1;
|
||||
|
||||
function ttlForLbMode(mode: LbMode): number {
|
||||
return mode === "weighted" ? WEIGHTED_DNS_TTL : AUTO_DNS_TTL;
|
||||
function ttlForBinding(mode: LbMode, ips: readonly string[]): number {
|
||||
return mode === "weighted" && isSharedPool(ips) ? WEIGHTED_DNS_TTL : AUTO_DNS_TTL;
|
||||
}
|
||||
|
||||
function enabledServiceIps(db: Db, serviceId: number): string[] {
|
||||
return repos
|
||||
.listServiceIpRows(db, serviceId)
|
||||
.filter((row) => row.enabled)
|
||||
.map((row) => row.ip);
|
||||
}
|
||||
|
||||
export function failoverARecordDiff(
|
||||
@@ -72,6 +88,22 @@ function recordFailoverDnsDiff(
|
||||
const { added, removed } = failoverARecordDiff(existingA, desiredIps);
|
||||
if (added.length === 0 && removed.length === 0) return;
|
||||
const binding = repos.getBinding(db, bindingId);
|
||||
const configuredIps = repos.listBindingIps(db, bindingId);
|
||||
const { config, rows } = getBindingLbState(db, bindingId);
|
||||
const downIps = new Set(
|
||||
rows.filter((row) => row.health === "down").map((row) => row.ip),
|
||||
);
|
||||
if (
|
||||
!shouldRecordFailoverDnsDiff({
|
||||
configuredIps,
|
||||
lbMode: config.lb_mode,
|
||||
added,
|
||||
removed,
|
||||
downIps,
|
||||
})
|
||||
) {
|
||||
return;
|
||||
}
|
||||
repos.insertFailoverLog(db, {
|
||||
serviceId: binding.service_id,
|
||||
bindingId,
|
||||
@@ -271,33 +303,27 @@ function getGroupLbState(
|
||||
};
|
||||
}
|
||||
|
||||
function computeActiveIps(
|
||||
db: Db,
|
||||
scope: HealthCheckScope,
|
||||
refId: number,
|
||||
): string[] {
|
||||
const state =
|
||||
scope === "binding"
|
||||
? getBindingLbState(db, refId)
|
||||
: getGroupLbState(db, refId);
|
||||
return selectActiveIpsByMode(state.config, state.rows);
|
||||
}
|
||||
|
||||
function desiredAIps(
|
||||
db: Db,
|
||||
scope: HealthCheckScope,
|
||||
refId: number,
|
||||
fallbackIps: string[],
|
||||
): string[] {
|
||||
const config =
|
||||
const state =
|
||||
scope === "binding"
|
||||
? getBindingLbState(db, refId).config
|
||||
: getGroupLbState(db, refId).config;
|
||||
if (config.lb_mode === "weighted" || config.health_check_enabled) {
|
||||
const activeIps = computeActiveIps(db, scope, refId);
|
||||
if (activeIps.length > 0) return activeIps;
|
||||
}
|
||||
return fallbackIps;
|
||||
? getBindingLbState(db, refId)
|
||||
: getGroupLbState(db, refId);
|
||||
const serviceIps =
|
||||
scope === "binding"
|
||||
? enabledServiceIps(db, repos.getBinding(db, refId).service_id)
|
||||
: fallbackIps;
|
||||
return resolveDesiredAIps(
|
||||
state.config,
|
||||
state.rows,
|
||||
fallbackIps,
|
||||
Date.now(),
|
||||
serviceIps,
|
||||
);
|
||||
}
|
||||
|
||||
async function collectKnownZones(
|
||||
@@ -349,7 +375,7 @@ async function buildView(db: Db, serviceId: number): Promise<ServiceView> {
|
||||
const { config, rows } = getBindingLbState(db, binding.id);
|
||||
const bindingActiveIps = targetCname
|
||||
? []
|
||||
: selectActiveIpsByMode(config, rows);
|
||||
: resolveDesiredAIps(config, rows, targetIps, Date.now(), ips);
|
||||
|
||||
return {
|
||||
binding_id: binding.id,
|
||||
@@ -470,6 +496,21 @@ function fallbackCnameHealth(
|
||||
);
|
||||
}
|
||||
|
||||
function overlayLiveHealth(
|
||||
stored: IpHealthState | undefined,
|
||||
live: IpHealthState | undefined,
|
||||
): IpHealthState {
|
||||
if (live && live !== "unknown") return live;
|
||||
return stored ?? live ?? "unknown";
|
||||
}
|
||||
|
||||
function bestAliveDisplayStatus(statuses: readonly string[]): IpHealthState {
|
||||
if (statuses.some((status) => status === "up")) return "up";
|
||||
if (statuses.some((status) => status === "degraded")) return "degraded";
|
||||
if (statuses.some((status) => status === "down")) return "down";
|
||||
return "unknown";
|
||||
}
|
||||
|
||||
function attachServiceHealth(
|
||||
db: Db,
|
||||
views: ServiceView[],
|
||||
@@ -477,10 +518,13 @@ function attachServiceHealth(
|
||||
const ids = views.map((v) => v.id);
|
||||
const healthByService = repos.aggregateIpHealthByServiceIds(db, ids);
|
||||
const ipHealthByService = repos.listIpHealthByServiceIds(db, ids);
|
||||
const liveByService = repos.listLatestLiveHealthByServiceIds(db, ids);
|
||||
return views.map((view) => {
|
||||
const health = healthByService.get(view.id);
|
||||
const rows = ipHealthByService.get(view.id) ?? [];
|
||||
const liveRows = liveByService.get(view.id) ?? [];
|
||||
const byIp = new Map(rows.map((row) => [row.ip, row]));
|
||||
const liveByIp = new Map(liveRows.map((row) => [row.ip, row]));
|
||||
const cnameFallback = fallbackCnameHealth(rows, view);
|
||||
const aRecordIps = new Set(
|
||||
(view.domains ?? []).flatMap((domain) =>
|
||||
@@ -489,20 +533,33 @@ function attachServiceHealth(
|
||||
);
|
||||
const ip_health = (view.ips ?? []).map((ip) => {
|
||||
const row = byIp.get(ip) ?? (aRecordIps.has(ip) ? undefined : cnameFallback);
|
||||
const live = liveByIp.get(ip);
|
||||
const status = overlayLiveHealth(row?.status, live?.status);
|
||||
const extras = live && live.status !== "unknown" ? live : row;
|
||||
return {
|
||||
ip,
|
||||
status: row?.status ?? ("unknown" as const),
|
||||
latency_ms: row?.latency_ms ?? null,
|
||||
last_checked_at: row?.last_checked_at ?? null,
|
||||
last_error: row?.last_error ?? null,
|
||||
provider: row?.provider ?? "local",
|
||||
colo: row?.colo ?? null,
|
||||
status,
|
||||
latency_ms: extras?.latency_ms ?? null,
|
||||
last_checked_at: extras?.last_checked_at ?? null,
|
||||
last_error:
|
||||
live && live.status !== "unknown"
|
||||
? live.last_error
|
||||
: (row?.last_error ?? null),
|
||||
provider: extras?.provider ?? "local",
|
||||
colo: extras?.colo ?? null,
|
||||
};
|
||||
});
|
||||
const displayStatus = bestAliveDisplayStatus(ip_health.map((row) => row.status));
|
||||
const latencyRow =
|
||||
ip_health.find((row) => row.status === displayStatus && row.latency_ms != null) ??
|
||||
ip_health.find((row) => row.latency_ms != null);
|
||||
return {
|
||||
...view,
|
||||
health_status: health?.health_status ?? "unknown",
|
||||
health_latency_ms: health?.health_latency_ms ?? null,
|
||||
health_status: overlayLiveHealth(health?.health_status, displayStatus),
|
||||
health_latency_ms:
|
||||
displayStatus !== "unknown"
|
||||
? (latencyRow?.latency_ms ?? null)
|
||||
: (health?.health_latency_ms ?? null),
|
||||
ip_health,
|
||||
};
|
||||
});
|
||||
@@ -638,6 +695,7 @@ async function syncBindingDns(
|
||||
}
|
||||
|
||||
const binding = repos.getBinding(db, bindingId);
|
||||
const configuredIps = repos.listBindingIps(db, bindingId);
|
||||
await syncBindingADns(
|
||||
db,
|
||||
cf,
|
||||
@@ -645,7 +703,7 @@ async function syncBindingDns(
|
||||
domainId,
|
||||
hostname,
|
||||
desiredIps,
|
||||
ttlForLbMode(binding.lb_mode),
|
||||
ttlForBinding(binding.lb_mode, configuredIps),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1208,7 +1266,7 @@ async function syncGroupDomainDns(
|
||||
domainId,
|
||||
hostname,
|
||||
desiredIps,
|
||||
ttlForLbMode(group.lb_mode),
|
||||
ttlForBinding(group.lb_mode, fallbackIps),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1701,9 +1759,12 @@ export async function reconcileDnsForTarget(
|
||||
const cnameTarget = binding.cname_target?.trim() || null;
|
||||
if (cnameTarget) return;
|
||||
const ips = repos.listServiceIps(db, service.id);
|
||||
const poolIps = enabledServiceIps(db, service.id);
|
||||
const targetIps = repos.listBindingIps(db, binding.id);
|
||||
validateTargetIpsInPool(targetIps, ips);
|
||||
const desiredIps = desiredAIps(db, "binding", refId, targetIps);
|
||||
const desiredIps = canApplyLb(poolIps, targetIps)
|
||||
? desiredAIps(db, "binding", refId, targetIps)
|
||||
: targetIps;
|
||||
await syncBindingDns(
|
||||
db,
|
||||
cf,
|
||||
@@ -1735,6 +1796,7 @@ export async function reconcileWeightedDns(
|
||||
for (const binding of repos.listAllBindings(db)) {
|
||||
if (binding.lb_mode !== "weighted") continue;
|
||||
if (binding.cname_target?.trim()) continue;
|
||||
if (!isSharedPool(binding.target_ips ?? [])) continue;
|
||||
try {
|
||||
await withBindingLock(binding.id, async () => {
|
||||
const latest = repos.getBinding(db, binding.id);
|
||||
@@ -1743,7 +1805,8 @@ export async function reconcileWeightedDns(
|
||||
const service = repos.getService(db, latest.service_id);
|
||||
if (!shouldPushDns(db, service)) return;
|
||||
const targetIps = repos.listBindingIps(db, latest.id);
|
||||
if (targetIps.length === 0) return;
|
||||
const poolIps = enabledServiceIps(db, service.id);
|
||||
if (!canApplyLb(poolIps, targetIps)) return;
|
||||
const ips = repos.listServiceIps(db, service.id);
|
||||
validateTargetIpsInPool(targetIps, ips);
|
||||
const desiredIps = desiredAIps(db, "binding", latest.id, targetIps);
|
||||
|
||||
@@ -436,4 +436,46 @@ describe("CNAME health mapped onto service IPs", () => {
|
||||
const view = await getView(db, service.id);
|
||||
expect(view.health_status).toBe("up");
|
||||
});
|
||||
|
||||
it("getView shows live OK over hysteresis unknown", async () => {
|
||||
const { createMemoryDb, repos, runMigrations } = await import("@cfdm/db");
|
||||
const { getView } = await import("../src/services/service-config-service.js");
|
||||
const { db, sqlite } = createMemoryDb();
|
||||
runMigrations(sqlite);
|
||||
|
||||
const domain = repos.createDomain(db, null, "rkns.top", "zone-id");
|
||||
const service = repos.createService(db, "RW Panel", "rw-panel");
|
||||
repos.replaceServiceIps(db, service.id, ["2.59.161.102"]);
|
||||
const binding = repos.insertBinding(db, domain.id, service.id, "c", null);
|
||||
repos.replaceBindingIpsWithMeta(db, binding.id, [
|
||||
{ ip: "2.59.161.102", weight: 1, priority: 1 },
|
||||
]);
|
||||
repos.upsertIpHealthStatus(
|
||||
db,
|
||||
"binding",
|
||||
binding.id,
|
||||
"2.59.161.102",
|
||||
"unknown",
|
||||
63,
|
||||
0,
|
||||
null,
|
||||
1,
|
||||
);
|
||||
repos.insertHealthProbeLog(db, {
|
||||
scope: "binding",
|
||||
refId: binding.id,
|
||||
ip: "2.59.161.102",
|
||||
provider: "local",
|
||||
status: "up",
|
||||
ok: true,
|
||||
latencyMs: 63,
|
||||
colo: null,
|
||||
error: null,
|
||||
});
|
||||
|
||||
const view = await getView(db, service.id);
|
||||
expect(view.health_status).toBe("up");
|
||||
expect(view.ip_health[0]?.status).toBe("up");
|
||||
expect(view.ip_health[0]?.latency_ms).toBe(63);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import {
|
||||
resolveDesiredAIps,
|
||||
selectActiveIpsByMode,
|
||||
shouldRecordFailoverDnsDiff,
|
||||
type LbIpRow,
|
||||
type LbTargetConfig,
|
||||
} from "../src/services/service-config-service.js";
|
||||
@@ -144,3 +146,115 @@ describe("selectActiveIpsByMode", () => {
|
||||
expect(selectActiveIpsByMode(config, [])).toEqual([]);
|
||||
});
|
||||
});
|
||||
|
||||
describe("resolveDesiredAIps", () => {
|
||||
it("keeps a dedicated single IP even when down", () => {
|
||||
expect(
|
||||
resolveDesiredAIps(
|
||||
weightedConfig,
|
||||
[row("1.1.1.1", { health: "down" })],
|
||||
["1.1.1.1"],
|
||||
),
|
||||
).toEqual(["1.1.1.1"]);
|
||||
});
|
||||
|
||||
it("does not drain when the service has only one unique IP", () => {
|
||||
expect(
|
||||
resolveDesiredAIps(
|
||||
weightedConfig,
|
||||
[row("1.1.1.1", { health: "down" })],
|
||||
["1.1.1.1", "1.1.1.1"],
|
||||
0,
|
||||
["1.1.1.1"],
|
||||
),
|
||||
).toEqual(["1.1.1.1", "1.1.1.1"]);
|
||||
});
|
||||
|
||||
it("does not apply overlay when service pool is a single IP", () => {
|
||||
const rows = [
|
||||
row("1.1.1.1", { health: "up" }),
|
||||
row("2.2.2.2", { health: "down" }),
|
||||
];
|
||||
expect(
|
||||
resolveDesiredAIps(
|
||||
weightedConfig,
|
||||
rows,
|
||||
["1.1.1.1", "2.2.2.2"],
|
||||
0,
|
||||
["1.1.1.1"],
|
||||
),
|
||||
).toEqual(["1.1.1.1", "2.2.2.2"]);
|
||||
});
|
||||
|
||||
it("applies weighted overlay on a shared pool", () => {
|
||||
const rows = [
|
||||
row("1.1.1.1", { weight: 1, health: "up" }),
|
||||
row("2.2.2.2", { weight: 3, health: "up" }),
|
||||
];
|
||||
expect(
|
||||
resolveDesiredAIps(weightedConfig, rows, ["1.1.1.1", "2.2.2.2"], 0),
|
||||
).toEqual(selectActiveIpsByMode(weightedConfig, rows, 0));
|
||||
});
|
||||
});
|
||||
|
||||
describe("shouldRecordFailoverDnsDiff", () => {
|
||||
it("skips duplicate listings of the same IP", () => {
|
||||
expect(
|
||||
shouldRecordFailoverDnsDiff({
|
||||
configuredIps: ["1.1.1.1", "1.1.1.1"],
|
||||
lbMode: "failover",
|
||||
added: [],
|
||||
removed: ["1.1.1.1"],
|
||||
downIps: new Set(["1.1.1.1"]),
|
||||
}),
|
||||
).toBe(false);
|
||||
});
|
||||
|
||||
it("skips dedicated extra-FQDN", () => {
|
||||
expect(
|
||||
shouldRecordFailoverDnsDiff({
|
||||
configuredIps: ["1.1.1.1"],
|
||||
lbMode: "failover",
|
||||
added: [],
|
||||
removed: ["1.1.1.1"],
|
||||
downIps: new Set(["1.1.1.1"]),
|
||||
}),
|
||||
).toBe(false);
|
||||
});
|
||||
|
||||
it("skips weighted live-to-live slot swap", () => {
|
||||
expect(
|
||||
shouldRecordFailoverDnsDiff({
|
||||
configuredIps: ["1.1.1.1", "2.2.2.2"],
|
||||
lbMode: "weighted",
|
||||
added: ["2.2.2.2"],
|
||||
removed: ["1.1.1.1"],
|
||||
downIps: new Set(),
|
||||
}),
|
||||
).toBe(false);
|
||||
});
|
||||
|
||||
it("logs weighted swap when a down ip leaves the pool", () => {
|
||||
expect(
|
||||
shouldRecordFailoverDnsDiff({
|
||||
configuredIps: ["1.1.1.1", "2.2.2.2"],
|
||||
lbMode: "weighted",
|
||||
added: ["2.2.2.2"],
|
||||
removed: ["1.1.1.1"],
|
||||
downIps: new Set(["1.1.1.1"]),
|
||||
}),
|
||||
).toBe(true);
|
||||
});
|
||||
|
||||
it("logs failover diffs on a shared pool", () => {
|
||||
expect(
|
||||
shouldRecordFailoverDnsDiff({
|
||||
configuredIps: ["1.1.1.1", "2.2.2.2"],
|
||||
lbMode: "failover",
|
||||
added: ["2.2.2.2"],
|
||||
removed: ["1.1.1.1"],
|
||||
downIps: new Set(["1.1.1.1"]),
|
||||
}),
|
||||
).toBe(true);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -63,8 +63,8 @@ export function FailoverTimeline({
|
||||
return (
|
||||
<EmptyState
|
||||
icon={ShieldCheckIcon}
|
||||
title="Нет инцидентов Failover"
|
||||
description="Нет Down и нет выходов из пула"
|
||||
title="Нет инцидентов"
|
||||
description="Нет Down и нет выходов из общего пула"
|
||||
stackedIcon={false}
|
||||
centered={false}
|
||||
/>
|
||||
|
||||
@@ -13,7 +13,7 @@ import {
|
||||
type HealthLogProbe,
|
||||
type HealthLogStatus,
|
||||
} from '@/lib/health-log'
|
||||
import type { FailoverLogEntry } from '@/lib/schemas'
|
||||
import type { FailoverLogEntry, ServiceView } from '@/lib/schemas'
|
||||
import { Badge } from '@/components/reui/badge'
|
||||
import {
|
||||
Frame,
|
||||
@@ -28,6 +28,23 @@ import {
|
||||
AlertTitle,
|
||||
} from '@/components/reui/alert'
|
||||
|
||||
type LbMode = ServiceView['lb_mode']
|
||||
|
||||
const PANEL_COPY: Record<LbMode, { title: string; description: string }> = {
|
||||
failover: {
|
||||
title: 'Failover (приоритет)',
|
||||
description: 'Down снимается с общего FQDN. История: кто вышел из пула и кто вернулся',
|
||||
},
|
||||
weighted: {
|
||||
title: 'Веса (подмена IP)',
|
||||
description: 'На общем FQDN один IP по весам. Down выводится из цикла',
|
||||
},
|
||||
round_robin: {
|
||||
title: 'Round Robin',
|
||||
description: 'На общем FQDN все живые A. Down снимается с пула',
|
||||
},
|
||||
}
|
||||
|
||||
function failoverCountLabel(count: number): string {
|
||||
const mod10 = count % 10
|
||||
const mod100 = count % 100
|
||||
@@ -38,8 +55,17 @@ function failoverCountLabel(count: number): string {
|
||||
return `${count} адресов Down`
|
||||
}
|
||||
|
||||
function alertDescription(events: { kind: string; fqdns: string[] }[]): string {
|
||||
const removedCount = events.filter((event) => event.kind === 'removed').length
|
||||
if (removedCount > 0) return 'Сняты с общего FQDN'
|
||||
if (events.some((event) => event.fqdns.length > 0)) {
|
||||
return 'Остались в A-записях общего FQDN как last-resort'
|
||||
}
|
||||
return 'Down: персональные FQDN не меняются'
|
||||
}
|
||||
|
||||
/**
|
||||
* Failover — текущие Down + кто вышел из пула и кто вернулся.
|
||||
* Балансировка — текущие Down + кто вышел из общего пула.
|
||||
* Preview: https://reui.io/preview/base/components/c-timeline-10
|
||||
* Preview: https://reui.io/preview/base/empty-state-12
|
||||
* Docs: https://reui.io/docs/components/base/frame
|
||||
@@ -48,16 +74,19 @@ function failoverCountLabel(count: number): string {
|
||||
* Docs: https://reui.io/docs/components/base/alert
|
||||
*/
|
||||
export function ServiceFailoverPanel({
|
||||
lbMode = 'round_robin',
|
||||
ipHealth,
|
||||
bindings,
|
||||
history,
|
||||
probes = [],
|
||||
}: {
|
||||
lbMode?: LbMode
|
||||
ipHealth: readonly FailoverHealthInput[]
|
||||
bindings: readonly FailoverBindingPool[]
|
||||
history: readonly FailoverLogEntry[]
|
||||
probes?: readonly HealthLogProbe[]
|
||||
}) {
|
||||
const copy = PANEL_COPY[lbMode] ?? PANEL_COPY.round_robin
|
||||
const liveByIp = latestHealthByIp(probes)
|
||||
const overlayHealth = ipHealth.map((row) => {
|
||||
const live = liveByIp.get(row.ip)
|
||||
@@ -77,14 +106,13 @@ export function ServiceFailoverPanel({
|
||||
})
|
||||
const events = toFailoverEvents(overlayHealth, bindings)
|
||||
const mergedHistory = mergeFailoverHistory(history, probes, bindings)
|
||||
const removedCount = events.filter((event) => event.kind === 'removed').length
|
||||
|
||||
return (
|
||||
<Frame stacked spacing="sm" className="min-w-0 w-full">
|
||||
<FramePanel className="flex flex-col gap-3">
|
||||
<FrameHeader className="gap-1 px-0 py-0">
|
||||
<FrameTitle className="flex flex-wrap items-center gap-2">
|
||||
Failover
|
||||
{copy.title}
|
||||
{events.length > 0 ? (
|
||||
<Badge variant="destructive-light" size="xs" radius="full">
|
||||
{events.length}
|
||||
@@ -95,20 +123,14 @@ export function ServiceFailoverPanel({
|
||||
</Badge>
|
||||
)}
|
||||
</FrameTitle>
|
||||
<FrameDescription>
|
||||
Текущие Down и история: кто вышел из пула и кто вернулся
|
||||
</FrameDescription>
|
||||
<FrameDescription>{copy.description}</FrameDescription>
|
||||
</FrameHeader>
|
||||
|
||||
{events.length > 0 ? (
|
||||
<Alert variant="destructive">
|
||||
<UnplugIcon aria-hidden="true" />
|
||||
<AlertTitle>{failoverCountLabel(events.length)}</AlertTitle>
|
||||
<AlertDescription>
|
||||
{removedCount > 0
|
||||
? 'Сняты с FQDN или остались last-resort'
|
||||
: 'Остались в A-записях как last-resort'}
|
||||
</AlertDescription>
|
||||
<AlertDescription>{alertDescription(events)}</AlertDescription>
|
||||
</Alert>
|
||||
) : null}
|
||||
|
||||
|
||||
@@ -51,7 +51,28 @@ describe('toFailoverEvents', () => {
|
||||
expect(isFailoverEventStatus('unhealthy')).toBe(false)
|
||||
})
|
||||
|
||||
it('Down всегда виден, даже без A-записей', () => {
|
||||
it('один IP у сервиса — не инцидент пула', () => {
|
||||
const events = toFailoverEvents(
|
||||
[
|
||||
row({
|
||||
ip: '10.0.0.1',
|
||||
status: 'down',
|
||||
consecutive_failures: 9,
|
||||
last_error: 'fetch failed',
|
||||
}),
|
||||
],
|
||||
[
|
||||
{
|
||||
fqdn: 'solo.example.com',
|
||||
configured: ['10.0.0.1'],
|
||||
active: [],
|
||||
},
|
||||
],
|
||||
)
|
||||
expect(events).toEqual([])
|
||||
})
|
||||
|
||||
it('Down без shared pool не событие балансировки', () => {
|
||||
const events = toFailoverEvents([
|
||||
row({
|
||||
ip: '130.49.213.153',
|
||||
@@ -60,19 +81,7 @@ describe('toFailoverEvents', () => {
|
||||
last_error: 'fetch failed',
|
||||
}),
|
||||
])
|
||||
expect(events).toEqual([
|
||||
{
|
||||
id: '130.49.213.153',
|
||||
address: '130.49.213.153',
|
||||
status: 'down',
|
||||
kind: 'last-resort',
|
||||
fqdns: [],
|
||||
consecutiveFailures: 9,
|
||||
lastFailureReason: 'fetch failed',
|
||||
lastCheckAt: null,
|
||||
},
|
||||
])
|
||||
expect(failoverEventCopy(events[0]!)).toBe('Down, в A-записях last-resort')
|
||||
expect(events).toEqual([])
|
||||
})
|
||||
|
||||
it('OK вне пула не инцидент (standby)', () => {
|
||||
@@ -137,6 +146,7 @@ describe('toFailoverEvents', () => {
|
||||
},
|
||||
])
|
||||
expect(failoverEventCopy(events[0]!)).toBe('Снята с gt.rkns.top')
|
||||
expect(events[0]?.fqdns).not.toContain('nsgt.rkns.top')
|
||||
})
|
||||
|
||||
it('Down только last-resort на своём FQDN', () => {
|
||||
@@ -150,11 +160,7 @@ describe('toFailoverEvents', () => {
|
||||
},
|
||||
],
|
||||
)
|
||||
expect(events[0]?.kind).toBe('last-resort')
|
||||
expect(events[0]?.fqdns).toEqual(['nsgt.rkns.top'])
|
||||
expect(failoverEventCopy(events[0]!)).toBe(
|
||||
'Down, в A-записях last-resort на nsgt.rkns.top',
|
||||
)
|
||||
expect(events).toEqual([])
|
||||
})
|
||||
|
||||
it('down без A-записи на configured FQDN — снятие', () => {
|
||||
@@ -279,7 +285,9 @@ describe('mergeFailoverHistory', () => {
|
||||
'removed:probe',
|
||||
])
|
||||
expect(history[0]?.copy).toBe('130.49.213.153 добавлена на gt.rkns.top')
|
||||
expect(history[1]?.copy).toContain('вышла из пула')
|
||||
expect(history[1]?.copy).toBe(
|
||||
'130.49.213.153 вышла из пула (gt.rkns.top)',
|
||||
)
|
||||
})
|
||||
|
||||
it('keeps DNS over a probe return in the same 2-minute window', () => {
|
||||
@@ -291,4 +299,38 @@ describe('mergeFailoverHistory', () => {
|
||||
expect(history).toHaveLength(1)
|
||||
expect(history[0]?.source).toBe('dns')
|
||||
})
|
||||
|
||||
it('drops probe leave/return when the service has no shared pool', () => {
|
||||
const history = mergeFailoverHistory(
|
||||
[],
|
||||
[
|
||||
probe({ id: 1, status: 'up', checked_at: '2026-08-20T09:00:00Z' }),
|
||||
probe({ id: 2, status: 'down', checked_at: '2026-08-20T09:10:00Z' }),
|
||||
],
|
||||
[
|
||||
{
|
||||
fqdn: 'solo.example.com',
|
||||
configured: ['130.49.213.153'],
|
||||
active: ['130.49.213.153'],
|
||||
},
|
||||
],
|
||||
)
|
||||
expect(history).toEqual([])
|
||||
})
|
||||
|
||||
it('drops dedicated extra-FQDN DNS rows', () => {
|
||||
const history = mergeFailoverHistory(
|
||||
[
|
||||
dns({
|
||||
id: 11,
|
||||
fqdn: 'nsgt.rkns.top',
|
||||
action: 'added',
|
||||
created_at: '2026-08-20 09:26:00',
|
||||
}),
|
||||
],
|
||||
[],
|
||||
mskHip,
|
||||
)
|
||||
expect(history).toEqual([])
|
||||
})
|
||||
})
|
||||
|
||||
@@ -44,6 +44,22 @@ export interface FailoverBindingPool {
|
||||
active: readonly string[]
|
||||
}
|
||||
|
||||
/** Unique A targets. Duplicates of the same IP are not a pool. */
|
||||
export function uniqueIpCount(ips: readonly string[]): number {
|
||||
return new Set(ips.filter(Boolean)).size
|
||||
}
|
||||
|
||||
/** Shared pool FQDN — two or more unique A targets. */
|
||||
export function isSharedPoolBinding(binding: FailoverBindingPool): boolean {
|
||||
return uniqueIpCount(binding.configured) >= 2
|
||||
}
|
||||
|
||||
export function hasSharedPool(
|
||||
bindings: readonly FailoverBindingPool[],
|
||||
): boolean {
|
||||
return bindings.some(isSharedPoolBinding)
|
||||
}
|
||||
|
||||
/** Инцидент только при down. up / degraded / unknown — не вывод из пула. */
|
||||
export function isFailoverEventStatus(status: string): boolean {
|
||||
return status === 'down'
|
||||
@@ -61,17 +77,19 @@ export function failoverEventCopy(event: FailoverEvent): string {
|
||||
}
|
||||
|
||||
/**
|
||||
* Текущие Down всегда в панели. Per-FQDN: снята с hostname или last-resort.
|
||||
* Standby (up / degraded / unknown) — не инцидент.
|
||||
* Инциденты пула только если у сервиса есть shared FQDN (2+ уникальных IP).
|
||||
* Один IP — не балансировка и не вывод из пула; Down смотрит health-монитор.
|
||||
*/
|
||||
export function toFailoverEvents(
|
||||
ipHealth: readonly FailoverHealthInput[],
|
||||
bindings: readonly FailoverBindingPool[] = [],
|
||||
): FailoverEvent[] {
|
||||
if (!hasSharedPool(bindings)) return []
|
||||
return ipHealth.filter((row) => isFailoverEventStatus(row.status)).map((row) => {
|
||||
const removedFqdns: string[] = []
|
||||
const lastResortFqdns: string[] = []
|
||||
for (const binding of bindings) {
|
||||
if (!isSharedPoolBinding(binding)) continue
|
||||
const configured = binding.configured.includes(row.ip)
|
||||
const active = binding.active.includes(row.ip)
|
||||
if (configured && !active) removedFqdns.push(binding.fqdn)
|
||||
@@ -98,7 +116,18 @@ function fqdnsForIp(
|
||||
ip: string,
|
||||
bindings: readonly FailoverBindingPool[],
|
||||
): string[] {
|
||||
return bindings.filter((binding) => binding.configured.includes(ip)).map((binding) => binding.fqdn)
|
||||
return bindings
|
||||
.filter((binding) => isSharedPoolBinding(binding) && binding.configured.includes(ip))
|
||||
.map((binding) => binding.fqdn)
|
||||
}
|
||||
|
||||
function isPoolFqdn(
|
||||
fqdn: string,
|
||||
bindings: readonly FailoverBindingPool[],
|
||||
): boolean {
|
||||
const binding = bindings.find((item) => item.fqdn === fqdn)
|
||||
if (!binding) return true
|
||||
return isSharedPoolBinding(binding)
|
||||
}
|
||||
|
||||
function fqdnLabel(fqdns: string[]): string {
|
||||
@@ -201,10 +230,12 @@ export function mergeFailoverHistory(
|
||||
bindings: readonly FailoverBindingPool[] = [],
|
||||
): FailoverHistoryItem[] {
|
||||
const merged = [
|
||||
...dns.map(dnsHistoryItem),
|
||||
...toIpAliveTransitions(probes).map((transition) =>
|
||||
probeHistoryItem(transition, bindings),
|
||||
),
|
||||
...dns
|
||||
.filter((item) => isPoolFqdn(item.fqdn, bindings))
|
||||
.map(dnsHistoryItem),
|
||||
...toIpAliveTransitions(probes)
|
||||
.filter((transition) => fqdnsForIp(transition.ip, bindings).length > 0)
|
||||
.map((transition) => probeHistoryItem(transition, bindings)),
|
||||
]
|
||||
merged.sort(
|
||||
(a, b) => eventTime(b.created_at) - eventTime(a.created_at) || a.id.localeCompare(b.id),
|
||||
|
||||
@@ -7,6 +7,7 @@ import {
|
||||
latestHealthByIp,
|
||||
providerHealthStatuses,
|
||||
resolveIpDisplayHealth,
|
||||
resolveServiceDisplayHealth,
|
||||
worstHealthStatus,
|
||||
type HealthLogProbe,
|
||||
} from '@/lib/health-log'
|
||||
@@ -146,3 +147,22 @@ describe('resolveIpDisplayHealth', () => {
|
||||
expect(resolveIpDisplayHealth('unknown', undefined)).toBe('unknown')
|
||||
})
|
||||
})
|
||||
|
||||
describe('resolveServiceDisplayHealth', () => {
|
||||
it('shows OK when live probes recovered and stored is still unknown', () => {
|
||||
expect(
|
||||
resolveServiceDisplayHealth(
|
||||
'unknown',
|
||||
[{ ip: '2.59.161.102', status: 'unknown' }],
|
||||
[
|
||||
probe({
|
||||
id: 1,
|
||||
ip: '2.59.161.102',
|
||||
status: 'up',
|
||||
checked_at: '2026-08-20T18:00:00Z',
|
||||
}),
|
||||
],
|
||||
),
|
||||
).toBe('up')
|
||||
})
|
||||
})
|
||||
|
||||
@@ -194,3 +194,22 @@ export function resolveIpDisplayHealth(
|
||||
if (live && live !== 'unknown') return live
|
||||
return stored ?? live ?? 'unknown'
|
||||
}
|
||||
|
||||
/** Service KPI / card: any-up of per-IP overlay (live probes beat hysteresis). */
|
||||
export function resolveServiceDisplayHealth(
|
||||
stored: HealthLogStatus | undefined,
|
||||
ipHealth: readonly { ip: string; status: string }[],
|
||||
probes: readonly HealthLogProbe[] = [],
|
||||
): HealthLogStatus {
|
||||
const liveByIp = latestHealthByIp(probes)
|
||||
const statuses =
|
||||
ipHealth.length > 0
|
||||
? ipHealth.map((row) =>
|
||||
resolveIpDisplayHealth(
|
||||
row.status as HealthLogStatus,
|
||||
liveByIp.get(row.ip)?.status,
|
||||
),
|
||||
)
|
||||
: [...liveByIp.values()].map((row) => row.status)
|
||||
return resolveIpDisplayHealth(stored, bestAliveHealthStatus(statuses))
|
||||
}
|
||||
|
||||
@@ -36,6 +36,8 @@ export const serviceGroupsQueryOptions = () =>
|
||||
}
|
||||
return parsed.data
|
||||
},
|
||||
refetchInterval: 10_000,
|
||||
staleTime: 5_000,
|
||||
})
|
||||
|
||||
export const servicesQueryOptions = () =>
|
||||
@@ -101,6 +103,8 @@ export const serviceViewQueryOptions = (id: number) =>
|
||||
const data = await api.get<unknown>(`/api/v1/services/${id}`)
|
||||
return serviceViewSchema.parse(data)
|
||||
},
|
||||
refetchInterval: 10_000,
|
||||
staleTime: 5_000,
|
||||
})
|
||||
|
||||
export const serviceHealthLogQueryOptions = (id: number) =>
|
||||
@@ -110,6 +114,8 @@ export const serviceHealthLogQueryOptions = (id: number) =>
|
||||
const data = await api.get<unknown>(`/api/v1/services/${id}/health-log`)
|
||||
return z.object({ items: z.array(healthProbeLogSchema) }).parse(data)
|
||||
},
|
||||
refetchInterval: 10_000,
|
||||
staleTime: 5_000,
|
||||
})
|
||||
|
||||
export const serviceFailoverLogQueryOptions = (id: number) =>
|
||||
|
||||
@@ -32,9 +32,11 @@ import {
|
||||
ServiceHealthMonitor,
|
||||
} from '@/components/reui-kit'
|
||||
import { api } from '@/lib/api-client'
|
||||
import { hasSharedPool } from '@/lib/failover-events'
|
||||
import {
|
||||
enabledHealthProviders,
|
||||
providerHealthStatuses,
|
||||
resolveServiceDisplayHealth,
|
||||
} from '@/lib/health-log'
|
||||
import type { ServiceView, UpdateServiceConfigInput } from '@/lib/schemas'
|
||||
import {
|
||||
@@ -115,6 +117,22 @@ function ServiceDetailPage() {
|
||||
})),
|
||||
[service?.domains],
|
||||
)
|
||||
const uniqueEnabledIps = useMemo(
|
||||
() =>
|
||||
(service?.ips ?? []).filter((ip) => service?.ip_enabled[ip] !== false),
|
||||
[service?.ips, service?.ip_enabled],
|
||||
)
|
||||
const displayHealth = useMemo(
|
||||
() =>
|
||||
resolveServiceDisplayHealth(
|
||||
service?.health_status,
|
||||
service?.ip_health ?? [],
|
||||
logItems,
|
||||
),
|
||||
[service?.health_status, service?.ip_health, logItems],
|
||||
)
|
||||
const showPoolPanel =
|
||||
uniqueEnabledIps.length >= 2 && hasSharedPool(failoverBindings)
|
||||
const nodes = (nodesQuery.data as OverviewPayload['nodes']) ?? []
|
||||
|
||||
const [editOpen, setEditOpen] = useState(false)
|
||||
@@ -251,7 +269,7 @@ function ServiceDetailPage() {
|
||||
actions={
|
||||
<>
|
||||
<LbModeTile mode={service.lb_mode} />
|
||||
<HealthCheckBadge status={service.health_status} />
|
||||
<HealthCheckBadge status={displayHealth} />
|
||||
<Tooltip>
|
||||
<TooltipTrigger
|
||||
render={
|
||||
@@ -278,20 +296,20 @@ function ServiceDetailPage() {
|
||||
id: 'status',
|
||||
icon: <ActivityIcon />,
|
||||
label: 'Статус',
|
||||
value: service.health_status === 'up' ? 'OK' : service.health_status,
|
||||
value: displayHealth === 'up' ? 'OK' : displayHealth,
|
||||
variant:
|
||||
service.health_status === 'down'
|
||||
displayHealth === 'down'
|
||||
? 'destructive'
|
||||
: service.health_status === 'degraded'
|
||||
: displayHealth === 'degraded'
|
||||
? 'warning'
|
||||
: 'default',
|
||||
iconClassName:
|
||||
service.health_status === 'down'
|
||||
displayHealth === 'down'
|
||||
? 'text-destructive'
|
||||
: service.health_status === 'degraded'
|
||||
: displayHealth === 'degraded'
|
||||
? 'text-warning'
|
||||
: 'text-success',
|
||||
hint: <HealthCheckBadge status={service.health_status} size="xs" />,
|
||||
hint: <HealthCheckBadge status={displayHealth} size="xs" />,
|
||||
},
|
||||
{
|
||||
id: 'fqdn',
|
||||
@@ -305,21 +323,33 @@ function ServiceDetailPage() {
|
||||
icon: <NetworkIcon />,
|
||||
label: 'IP',
|
||||
value: String(service.ips.length),
|
||||
hint: `${service.active_ips.length} в пуле`,
|
||||
hint: showPoolPanel
|
||||
? `${service.active_ips.length} в пуле`
|
||||
: uniqueEnabledIps.length <= 1
|
||||
? 'без балансировки'
|
||||
: service.ips.join(', ') || 'нет',
|
||||
},
|
||||
{
|
||||
id: 'pool',
|
||||
icon: <ServerIcon />,
|
||||
label: 'Активный пул',
|
||||
value: String((overview?.active_addresses ?? service.active_ips).length),
|
||||
hint: (overview?.active_addresses ?? service.active_ips).join(', ') || 'нет',
|
||||
label: showPoolPanel ? 'Активный пул' : 'Адреса',
|
||||
value: String(
|
||||
(overview?.active_addresses ?? service.active_ips).length,
|
||||
),
|
||||
hint:
|
||||
(overview?.active_addresses ?? service.active_ips).join(', ') ||
|
||||
'нет',
|
||||
},
|
||||
]}
|
||||
/>
|
||||
|
||||
<section
|
||||
aria-label="Мониторинг"
|
||||
className="grid min-w-0 items-start gap-2 @3xl:grid-cols-2"
|
||||
className={
|
||||
showPoolPanel
|
||||
? 'grid min-w-0 items-start gap-2 @3xl:grid-cols-2'
|
||||
: 'grid min-w-0 items-start gap-2'
|
||||
}
|
||||
>
|
||||
<ServiceHealthMonitor
|
||||
items={logItems}
|
||||
@@ -327,12 +357,15 @@ function ServiceDetailPage() {
|
||||
statuses={providerStatuses}
|
||||
isLoading={logQuery.isLoading}
|
||||
/>
|
||||
<ServiceFailoverPanel
|
||||
ipHealth={service.ip_health}
|
||||
bindings={failoverBindings}
|
||||
history={failoverHistory}
|
||||
probes={logItems}
|
||||
/>
|
||||
{showPoolPanel ? (
|
||||
<ServiceFailoverPanel
|
||||
lbMode={service.lb_mode}
|
||||
ipHealth={service.ip_health}
|
||||
bindings={failoverBindings}
|
||||
history={failoverHistory}
|
||||
probes={logItems}
|
||||
/>
|
||||
) : null}
|
||||
</section>
|
||||
|
||||
{service.ips.length === 0 && service.domains.length === 0 ? (
|
||||
|
||||
@@ -2341,6 +2341,113 @@ export function listIpHealthByServiceIds(
|
||||
return result;
|
||||
}
|
||||
|
||||
function parseIpHealthState(status: string | null): IpHealthState | undefined {
|
||||
if (
|
||||
status === "up" ||
|
||||
status === "down" ||
|
||||
status === "degraded" ||
|
||||
status === "unknown"
|
||||
) {
|
||||
return status;
|
||||
}
|
||||
return undefined;
|
||||
}
|
||||
|
||||
function bestAliveIpState(statuses: readonly IpHealthState[]): IpHealthState {
|
||||
if (statuses.some((status) => status === "up")) return "up";
|
||||
if (statuses.some((status) => status === "degraded")) return "degraded";
|
||||
if (statuses.some((status) => status === "down")) return "down";
|
||||
return "unknown";
|
||||
}
|
||||
|
||||
/**
|
||||
* Latest probe per service+IP+provider from health_probe_log, then any-up per IP.
|
||||
* Display overlay — hysteresis in ip_health_status is unchanged (DNS).
|
||||
*/
|
||||
export function listLatestLiveHealthByServiceIds(
|
||||
db: Db,
|
||||
serviceIds: number[],
|
||||
): Map<number, ServiceIpHealthRow[]> {
|
||||
const result = new Map<number, ServiceIpHealthRow[]>();
|
||||
if (serviceIds.length === 0) return result;
|
||||
const idList = sql.join(
|
||||
serviceIds.map((id) => sql`${id}`),
|
||||
sql`, `,
|
||||
);
|
||||
const rows = db.all<{
|
||||
service_id: number;
|
||||
ip: string;
|
||||
provider: string | null;
|
||||
status: string | null;
|
||||
latency_ms: number | null;
|
||||
last_error: string | null;
|
||||
colo: string | null;
|
||||
checked_at: string | null;
|
||||
}>(sql`
|
||||
SELECT sb.service_id AS service_id,
|
||||
l.ip AS ip,
|
||||
l.provider AS provider,
|
||||
l.status AS status,
|
||||
l.latency_ms AS latency_ms,
|
||||
l.error AS last_error,
|
||||
l.colo AS colo,
|
||||
l.checked_at AS checked_at
|
||||
FROM health_probe_log l
|
||||
INNER JOIN service_bindings sb
|
||||
ON l.scope = 'binding' AND l.ref_id = sb.id
|
||||
INNER JOIN (
|
||||
SELECT sb2.service_id AS service_id,
|
||||
l2.ip AS ip,
|
||||
l2.provider AS provider,
|
||||
MAX(l2.id) AS max_id
|
||||
FROM health_probe_log l2
|
||||
INNER JOIN service_bindings sb2
|
||||
ON l2.scope = 'binding' AND l2.ref_id = sb2.id
|
||||
WHERE sb2.service_id IN (${idList})
|
||||
GROUP BY sb2.service_id, l2.ip, l2.provider
|
||||
) latest
|
||||
ON latest.max_id = l.id
|
||||
`);
|
||||
|
||||
const byServiceIp = new Map<
|
||||
string,
|
||||
{ serviceId: number; ip: string; probes: ServiceIpHealthRow[] }
|
||||
>();
|
||||
for (const row of rows) {
|
||||
const status = parseIpHealthState(row.status);
|
||||
if (!status) continue;
|
||||
const key = `${row.service_id}\0${row.ip}`;
|
||||
const probe: ServiceIpHealthRow = {
|
||||
ip: row.ip,
|
||||
status,
|
||||
latency_ms: row.latency_ms,
|
||||
last_checked_at: row.checked_at,
|
||||
last_error: row.last_error,
|
||||
provider: normalizeStatusProvider(row.provider),
|
||||
colo: row.colo,
|
||||
};
|
||||
const bucket = byServiceIp.get(key);
|
||||
if (bucket) bucket.probes.push(probe);
|
||||
else {
|
||||
byServiceIp.set(key, {
|
||||
serviceId: row.service_id,
|
||||
ip: row.ip,
|
||||
probes: [probe],
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
for (const { serviceId, ip, probes } of byServiceIp.values()) {
|
||||
const status = bestAliveIpState(probes.map((probe) => probe.status));
|
||||
const preferred =
|
||||
probes.find((probe) => probe.status === status) ?? probes[0]!;
|
||||
const list = result.get(serviceId) ?? [];
|
||||
list.push({ ...preferred, ip, status });
|
||||
result.set(serviceId, list);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
export function mergeHealthAggregates(
|
||||
parts: Array<HealthAggregate | undefined | null>,
|
||||
): HealthAggregate {
|
||||
|
||||
Reference in New Issue
Block a user