feat(health): добавить Globalping и мультивыбор источников проб

Несколько источников проб сразу и правило агрегации на сервисе вместо XOR Local/Cloudflare.

Co-authored-by: Cursor <[email protected]>

apps/api/src/lib/globalping-client.ts

@@ -0,0 +1,277 @@
+import type { HealthCheckTarget } from "@cfdm/shared";
+import {
+  clampGlobalpingLimit,
+  parseGlobalpingLocations,
+} from "@cfdm/shared";
+
+export const GLOBALPING_API_ROOT = "https://api.globalping.io";
+export const GLOBALPING_MIN_POLL_MS = 500;
+export const GLOBALPING_UA = "CFDM-health/1.0";
+
+export interface GlobalpingClientOptions {
+  token?: string | null;
+  locations?: string;
+  limit?: number;
+  pollIntervalMs?: number;
+  maxWaitMs?: number;
+  fetchImpl?: typeof fetch;
+}
+
+export interface GlobalpingProbeResult {
+  ok: boolean;
+  latencyMs: number;
+  error: string | null;
+  colo: string | null;
+}
+
+interface MeasurementCreateBody {
+  type: "ping" | "http";
+  target: string;
+  inProgressUpdates: false;
+  limit: number;
+  locations: Array<{ magic: string }>;
+  measurementOptions: Record<string, unknown>;
+}
+
+interface MeasurementProbe {
+  continent?: string;
+  country?: string;
+  city?: string;
+  network?: string;
+}
+
+interface MeasurementResultRow {
+  probe?: MeasurementProbe;
+  result?: {
+    status?: string;
+    statusCode?: number;
+    timings?: { total?: number };
+    stats?: { avg?: number; loss?: number };
+  };
+}
+
+interface MeasurementResponse {
+  id?: string;
+  status?: string;
+  results?: MeasurementResultRow[];
+}
+
+function sleep(ms: number): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+function locationLabel(probe: MeasurementProbe | undefined): string | null {
+  if (!probe) return null;
+  const city = probe.city?.trim();
+  const country = probe.country?.trim();
+  if (city && country) return `${city}, ${country}`;
+  return city || country || null;
+}
+
+export function buildMeasurementBody(
+  target: HealthCheckTarget,
+  options: GlobalpingClientOptions,
+): MeasurementCreateBody {
+  const limit = clampGlobalpingLimit(options.limit, 3);
+  const locations = parseGlobalpingLocations(options.locations).map((magic) => ({
+    magic,
+  }));
+  const port = target.port ?? (target.type === "http" ? 80 : 80);
+  const ip = String(target.ip || "").trim();
+  const hostname = (target.hostname || ip).trim();
+
+  if (target.type === "http") {
+    const path = target.path?.trim() || "/";
+    const protocol = port === 443 ? "HTTPS" : "HTTP";
+    return {
+      type: "http",
+      target: ip,
+      inProgressUpdates: false,
+      limit,
+      locations,
+      measurementOptions: {
+        protocol,
+        port,
+        request: {
+          method: "GET",
+          host: hostname,
+          path: path.startsWith("/") ? path : `/${path}`,
+        },
+      },
+    };
+  }
+
+  return {
+    type: "ping",
+    target: ip,
+    inProgressUpdates: false,
+    limit,
+    locations,
+    measurementOptions: {
+      protocol: "TCP",
+      port,
+    },
+  };
+}
+
+function rowOk(target: HealthCheckTarget, row: MeasurementResultRow): boolean {
+  const result = row.result;
+  if (!result) return false;
+  const status = String(result.status ?? "").toLowerCase();
+  if (status && status !== "finished") return false;
+  if (target.type === "http") {
+    const code = result.statusCode;
+    if (code == null) return false;
+    if (target.expected_status != null) return code === target.expected_status;
+    return code >= 200 && code < 400;
+  }
+  const loss = result.stats?.loss;
+  if (loss != null && loss >= 100) return false;
+  return status === "finished" || status === "";
+}
+
+function rowLatency(row: MeasurementResultRow): number {
+  const total = row.result?.timings?.total;
+  if (typeof total === "number" && Number.isFinite(total)) return Math.round(total);
+  const avg = row.result?.stats?.avg;
+  if (typeof avg === "number" && Number.isFinite(avg)) return Math.round(avg);
+  return 0;
+}
+
+export function summarizeMeasurement(
+  target: HealthCheckTarget,
+  doc: MeasurementResponse,
+): GlobalpingProbeResult {
+  const rows = doc.results ?? [];
+  if (rows.length === 0) {
+    return {
+      ok: false,
+      latencyMs: 0,
+      error: "Globalping: пустой результат",
+      colo: null,
+    };
+  }
+  const oks = rows.map((row) => rowOk(target, row));
+  const okCount = oks.filter(Boolean).length;
+  const ok = okCount > rows.length / 2;
+  const latencies = rows.map(rowLatency);
+  const latencyMs = Math.round(
+    latencies.reduce((sum, n) => sum + n, 0) / latencies.length,
+  );
+  const colo =
+    locationLabel(rows.find((_, i) => oks[i])?.probe) ??
+    locationLabel(rows[0]?.probe);
+  if (ok) {
+    return { ok: true, latencyMs, error: null, colo };
+  }
+  const expected =
+    target.type === "http" && target.expected_status != null
+      ? `ожидали HTTP ${target.expected_status}`
+      : target.type === "http"
+        ? "ожидали HTTP 2xx/3xx"
+        : "TCP ping с packet loss < 100%";
+  return {
+    ok: false,
+    latencyMs,
+    error: `Globalping: ${okCount}/${rows.length} проб успешны (${expected})`,
+    colo,
+  };
+}
+
+async function parseJson(response: Response): Promise<MeasurementResponse> {
+  try {
+    return (await response.json()) as MeasurementResponse;
+  } catch {
+    return {};
+  }
+}
+
+export async function runGlobalpingMeasurement(
+  target: HealthCheckTarget,
+  options: GlobalpingClientOptions = {},
+): Promise<GlobalpingProbeResult> {
+  const fetchImpl = options.fetchImpl ?? fetch;
+  const pollMs =
+    options.pollIntervalMs === undefined
+      ? GLOBALPING_MIN_POLL_MS
+      : Math.max(0, options.pollIntervalMs);
+  const maxWaitMs = options.maxWaitMs ?? Math.max(target.timeout_ms ?? 3000, 3000) + 15_000;
+  const headers: Record<string, string> = {
+    Accept: "application/json",
+    "Content-Type": "application/json",
+    "User-Agent": GLOBALPING_UA,
+  };
+  const token = options.token?.trim();
+  if (token) headers.Authorization = `Bearer ${token}`;
+
+  const created = await fetchImpl(`${GLOBALPING_API_ROOT}/v1/measurements`, {
+    method: "POST",
+    headers,
+    body: JSON.stringify(buildMeasurementBody(target, options)),
+  });
+  if (created.status === 429) {
+    return {
+      ok: false,
+      latencyMs: 0,
+      error: "Globalping: 429 rate limit",
+      colo: null,
+    };
+  }
+  if (created.status !== 202 && created.status !== 200) {
+    const body = await parseJson(created);
+    return {
+      ok: false,
+      latencyMs: 0,
+      error: `Globalping: HTTP ${created.status}${body.status ? ` (${body.status})` : ""}`,
+      colo: null,
+    };
+  }
+  const createdBody = await parseJson(created);
+  const id = createdBody.id?.trim();
+  if (!id) {
+    return {
+      ok: false,
+      latencyMs: 0,
+      error: "Globalping: нет id измерения",
+      colo: null,
+    };
+  }
+
+  const started = Date.now();
+  while (Date.now() - started < maxWaitMs) {
+    await sleep(pollMs);
+    const polled = await fetchImpl(`${GLOBALPING_API_ROOT}/v1/measurements/${id}`, {
+      method: "GET",
+      headers: {
+        Accept: "application/json",
+        "User-Agent": GLOBALPING_UA,
+        ...(token ? { Authorization: `Bearer ${token}` } : {}),
+      },
+    });
+    if (polled.status === 429) {
+      return {
+        ok: false,
+        latencyMs: 0,
+        error: "Globalping: 429 rate limit",
+        colo: null,
+      };
+    }
+    if (!polled.ok) {
+      return {
+        ok: false,
+        latencyMs: 0,
+        error: `Globalping: HTTP ${polled.status} при опросе`,
+        colo: null,
+      };
+    }
+    const doc = await parseJson(polled);
+    if (String(doc.status ?? "").toLowerCase() === "in-progress") continue;
+    return summarizeMeasurement(target, doc);
+  }
+  return {
+    ok: false,
+    latencyMs: Date.now() - started,
+    error: "Globalping: timeout ожидания measurement",
+    colo: null,
+  };
+}

apps/api/src/services/health-check-scheduler.ts

@@ -2,6 +2,7 @@ import type { FastifyInstance } from "fastify";
 import { AsyncTask, CronJob } from "toad-scheduler";
 import {
   getAppSettings,
+  getAppSettingsSecrets,
   updateAppSettings,
   type HealthEngineFallbacks,
 } from "@cfdm/db";
@@ -71,11 +72,17 @@ export function createHealthCheckTask(
         successRecoveries: settings.healthSuccessRecoveries,
       };
       const mailbox = mailboxFromSettings(app.db, app.cf, fallbacks);
+      const secrets = getAppSettingsSecrets(app.db);
       const n = await healthCheckService.runAllChecks(app.db, {
         thresholds,
         probeGapMs: config.healthProbeGapMs,
         mailbox,
         staleAfterMs: cronStaleAfterMs(settings.healthCheckCron),
+        globalping: {
+          token: secrets.globalpingToken,
+          locations: secrets.globalpingLocations,
+          limit: secrets.globalpingLimit,
+        },
         onStatusChange: async (target, prev, next) => {
           try {
             const label =

apps/api/src/services/health-check-service.ts

@@ -3,11 +3,20 @@ import { resolve4, resolve6 } from "node:dns/promises";
 import { Agent, buildConnector, fetch as undiciFetch } from "undici";
 import type { Db } from "@cfdm/db";
 import { repos } from "@cfdm/db";
-import type { HealthCheckTarget, IpHealthState } from "@cfdm/shared";
+import type { HealthCheckTarget, IpHealthState, HealthCheckProvider } from "@cfdm/shared";
+import {
+  aggregateHealthOk,
+  parseHealthAggregate,
+  targetProviders,
+} from "@cfdm/shared";
 import { AppError } from "../errors.js";
 import { nextHealthState } from "./health/state-machine.js";
 import { LocalHealthCheckProvider } from "./health/local.js";
 import { workerNotConfiguredResult } from "./health/worker.js";
+import {
+  globalpingNotConfiguredResult,
+  probeWithGlobalping,
+} from "./health/globalping.js";
 import {
   buildTargetsDoc,
   indexResults,
@@ -15,6 +24,7 @@ import {
   originProbeKey,
   type HealthMailbox,
 } from "./health/mailbox.js";
+import type { GlobalpingClientOptions } from "../lib/globalping-client.js";
 
 export interface HealthCheckThresholds {
   degradedFailures: number;
@@ -275,6 +285,7 @@ export interface RunAllChecksOptions {
   mailbox?: HealthMailbox | null;
   /** Results older than this are stale (default 10 min). */
   staleAfterMs?: number;
+  globalping?: GlobalpingClientOptions | null;
   onStatusChange?: (
     target: HealthCheckTarget,
     prevState: IpHealthState | null,
@@ -287,20 +298,60 @@ function sleep(ms: number): Promise<void> {
 }
 
 /**
- * One network hit per key. Group+binding on the same IP share a single TCP/HTTP probe
- * so anti-bot / rate-limit on the origin is not tripped by back-to-back checks.
+ * One network hit per origin+provider. Group+binding on the same IP share a probe.
  */
-export function physicalProbeKey(target: HealthCheckTarget): string {
-  const kind = target.provider === "cloudflare" ? "cloudflare" : "local";
-  return `${kind}|${originProbeKey(target)}`;
+export function physicalProbeKey(
+  target: HealthCheckTarget,
+  provider: HealthCheckProvider = target.provider,
+): string {
+  return `${provider}|${originProbeKey(target)}`;
 }
 
-function applyProbeResult(
+function logSourceResult(
   db: Db,
   target: HealthCheckTarget,
+  provider: HealthCheckProvider,
   result: ProbeResult,
+): void {
+  repos.insertHealthProbeLog(db, {
+    scope: target.scope,
+    refId: target.ref_id,
+    ip: target.ip,
+    provider,
+    status: result.ok ? "up" : "down",
+    ok: result.ok,
+    latencyMs: result.latencyMs,
+    colo: result.colo ?? null,
+    error: result.error,
+  });
+}
+
+function applyAggregatedStatus(
+  db: Db,
+  target: HealthCheckTarget,
+  sources: Array<{ provider: HealthCheckProvider; result: ProbeResult }>,
   options: RunAllChecksOptions,
 ): void {
+  const policy = parseHealthAggregate(target.aggregate);
+  const oks = sources.map((s) => s.result.ok);
+  const aggregatedOk = aggregateHealthOk(oks, policy);
+  const latencies = sources.map((s) => s.result.latencyMs);
+  const latencyMs = latencies.length
+    ? Math.round(latencies.reduce((sum, n) => sum + n, 0) / latencies.length)
+    : 0;
+  const colo =
+    sources.find((s) => s.result.colo)?.result.colo ??
+    sources[0]?.result.colo ??
+    null;
+  const error = aggregatedOk
+    ? null
+    : sources
+        .map((s) => s.result.error)
+        .filter((msg): msg is string => Boolean(msg))
+        .join("; ") || "health aggregate down";
+  const statusProvider =
+    sources.length > 1 ? "aggregate" : (sources[0]?.provider ?? target.provider);
+
   const prev = repos.getIpHealthStatusRow(
     db,
     target.scope,
@@ -308,8 +359,8 @@ function applyProbeResult(
     target.ip,
   );
   const { state, failures, successes, node } = deriveState(
-    result.ok,
-    result.latencyMs,
+    aggregatedOk,
+    latencyMs,
     prev
       ? {
           consecutive_failures: prev.consecutive_failures,
@@ -322,30 +373,18 @@ function applyProbeResult(
   const prevState: IpHealthState | null = prev
     ? (prev.status as IpHealthState)
     : null;
-  const provider = target.provider === "cloudflare" ? "cloudflare" : "local";
   repos.upsertIpHealthStatus(
     db,
     target.scope,
     target.ref_id,
     target.ip,
     state,
-    result.latencyMs,
+    latencyMs,
     failures,
-    result.error,
+    error,
     successes,
-    { colo: result.colo ?? null, provider },
+    { colo, provider: statusProvider },
   );
-  repos.insertHealthProbeLog(db, {
-    scope: target.scope,
-    refId: target.ref_id,
-    ip: target.ip,
-    provider,
-    status: state,
-    ok: result.ok,
-    latencyMs: result.latencyMs,
-    colo: result.colo ?? null,
-    error: result.error,
-  });
   const matchedNode = repos.findNodeByIp(db, target.ip);
   if (matchedNode && matchedNode.enabled) {
     repos.updateNode(db, matchedNode.id, {
@@ -353,7 +392,7 @@ function applyProbeResult(
       consecutive_failures: failures,
       consecutive_successes: successes,
       last_check_at: new Date().toISOString().replace("T", " ").slice(0, 19),
-      last_failure_reason: result.error,
+      last_failure_reason: error,
     });
   }
   if (prevState !== state) {
@@ -379,42 +418,26 @@ export async function runAllChecks(
   const local = new LocalHealthCheckProvider();
   const staleAfterMs = options.staleAfterMs ?? 10 * 60_000;
 
-  const byPhysical = new Map<string, HealthCheckTarget[]>();
+  const byOrigin = new Map<string, HealthCheckTarget[]>();
   for (const target of targets) {
-    const key = physicalProbeKey(target);
-    const list = byPhysical.get(key);
+    const key = originProbeKey(target);
+    const list = byOrigin.get(key);
     if (list) list.push(target);
-    else byPhysical.set(key, [target]);
+    else byOrigin.set(key, [target]);
   }
 
-  const localGroups: HealthCheckTarget[][] = [];
-  const cloudflareGroups: HealthCheckTarget[][] = [];
-  for (const group of byPhysical.values()) {
-    if (group[0]?.provider === "cloudflare") cloudflareGroups.push(group);
-    else localGroups.push(group);
-  }
-
-  let probeIndex = 0;
-  for (const group of localGroups) {
-    if (probeIndex > 0 && gapMs > 0) {
-      await sleep(gapMs);
-    }
-    probeIndex += 1;
-    const representative =
-      group.find((t) => t.scope === "binding") ?? group[0]!;
-    const result = await local.probe(representative);
-    for (const target of group) {
-      applyProbeResult(db, target, result, options);
-    }
-  }
-
-  if (cloudflareGroups.length > 0) {
-    const mailbox = options.mailbox ?? null;
+  const needsCloudflare = targets.some((t) =>
+    targetProviders(t).includes("cloudflare"),
+  );
+  let mailboxResults = new Map<string, { ok: boolean; latencyMs: number; error: string | null }>();
+  let mailboxColo: string | null = null;
+  let mailboxStale = true;
+  const mailbox = options.mailbox ?? null;
+  if (needsCloudflare) {
     const resultsDoc = mailbox ? await mailbox.getResults() : null;
-    const byKey = indexResults(resultsDoc);
-    const stale = !mailbox || isResultsStale(resultsDoc, staleAfterMs);
-    const colo = resultsDoc?.colo ?? null;
-
+    mailboxResults = indexResults(resultsDoc);
+    mailboxStale = !mailbox || isResultsStale(resultsDoc, staleAfterMs);
+    mailboxColo = resultsDoc?.colo ?? null;
     if (mailbox) {
       try {
         const next = buildTargetsDoc(targets);
@@ -426,28 +449,71 @@ export async function runAllChecks(
         // ingest still proceeds
       }
     }
+  }
 
-    for (const group of cloudflareGroups) {
-      const representative =
-        group.find((t) => t.scope === "binding") ?? group[0]!;
-      const item = byKey.get(originProbeKey(representative));
-      let result: ProbeResult;
-      if (!mailbox) {
-        result = workerNotConfiguredResult();
-      } else if (stale || !item) {
-        result = staleWorkerResult(colo);
-      } else {
+  const probeCache = new Map<string, ProbeResult>();
+  let probeIndex = 0;
+
+  async function resolveProvider(
+    provider: HealthCheckProvider,
+    representative: HealthCheckTarget,
+    originKey: string,
+  ): Promise<ProbeResult> {
+    const cacheKey = `${provider}|${originKey}`;
+    const cached = probeCache.get(cacheKey);
+    if (cached) return cached;
+
+    let result: ProbeResult;
+    if (provider === "local") {
+      if (probeIndex > 0 && gapMs > 0) await sleep(gapMs);
+      probeIndex += 1;
+      result = await local.probe(representative);
+    } else if (provider === "cloudflare") {
+      const item = mailboxResults.get(originKey);
+      if (!mailbox) result = workerNotConfiguredResult();
+      else if (mailboxStale || !item) result = staleWorkerResult(mailboxColo);
+      else {
         result = {
           ok: item.ok,
           latencyMs: item.latencyMs,
           error: item.error,
-          colo,
+          colo: mailboxColo,
         };
       }
-      for (const target of group) {
-        applyProbeResult(db, target, result, options);
+    } else {
+      if (!options.globalping?.token?.trim()) {
+        result = globalpingNotConfiguredResult();
+      } else {
+        if (probeIndex > 0 && gapMs > 0) await sleep(gapMs);
+        probeIndex += 1;
+        result = await probeWithGlobalping(representative, options.globalping);
       }
     }
+    probeCache.set(cacheKey, result);
+    return result;
+  }
+
+  for (const [originKey, group] of byOrigin) {
+    const representative =
+      group.find((t) => t.scope === "binding") ?? group[0]!;
+    const needed = new Set<HealthCheckProvider>();
+    for (const target of group) {
+      for (const provider of targetProviders(target)) needed.add(provider);
+    }
+    for (const provider of needed) {
+      await resolveProvider(provider, representative, originKey);
+    }
+    for (const target of group) {
+      const providers = targetProviders(target);
+      const sources = providers.map((provider) => ({
+        provider,
+        result: probeCache.get(`${provider}|${originKey}`)!,
+      }));
+      for (const source of sources) {
+        logSourceResult(db, target, source.provider, source.result);
+      }
+      applyAggregatedStatus(db, target, sources, options);
+    }
   }
 
   repos.pruneStaleIpHealthStatus(db, targets);
@@ -473,6 +539,8 @@ export async function runDomainMonitors(
       timeout_ms: monitor.timeout_ms,
       verify_tls: false,
       provider: "local",
+      providers: ["local"],
+      aggregate: "majority",
     };
     let result: ProbeResult;
     if (monitor.type === "http") {

apps/api/src/services/health/globalping.ts

@@ -0,0 +1,40 @@
+import type { HealthCheckTarget } from "@cfdm/shared";
+import {
+  runGlobalpingMeasurement,
+  type GlobalpingClientOptions,
+} from "../../lib/globalping-client.js";
+import type { ProbeResult } from "../health-check-service.js";
+
+export function globalpingNotConfiguredResult(): ProbeResult {
+  return {
+    ok: false,
+    latencyMs: 0,
+    error: "Globalping: токен не задан",
+    colo: null,
+  };
+}
+
+export async function probeWithGlobalping(
+  target: HealthCheckTarget,
+  options: GlobalpingClientOptions,
+): Promise<ProbeResult> {
+  if (!options.token?.trim()) {
+    return globalpingNotConfiguredResult();
+  }
+  try {
+    const result = await runGlobalpingMeasurement(target, options);
+    return {
+      ok: result.ok,
+      latencyMs: result.latencyMs,
+      error: result.error,
+      colo: result.colo,
+    };
+  } catch (err) {
+    return {
+      ok: false,
+      latencyMs: 0,
+      error: err instanceof Error ? err.message : "Globalping: ошибка запроса",
+      colo: null,
+    };
+  }
+}

apps/api/src/services/health/health-worker-deploy.ts

@@ -1,6 +1,6 @@
 import { getAppSettings, repos, updateAppSettings, type HealthEngineFallbacks } from "@cfdm/db";
 import type { Db } from "@cfdm/db";
-import { HEALTH_PROBE_KV_TITLE, HEALTH_PROBE_SCRIPT_NAME } from "@cfdm/shared";
+import { HEALTH_PROBE_KV_TITLE, HEALTH_PROBE_SCRIPT_NAME, targetHasProvider } from "@cfdm/shared";
 import type { CloudflareClient } from "../../lib/cf-client.js";
 import { AppError } from "../../errors.js";
 import { loadHealthProbeWorkerSource } from "./health-probe-script.js";
@@ -126,7 +126,7 @@ export async function maybeEnsureHealthWorker(
 ): Promise<void> {
   const hasCloudflare = repos
     .listHealthCheckTargets(db)
-    .some((target) => target.provider === "cloudflare");
+    .some((target) => targetHasProvider(target, "cloudflare"));
   if (!hasCloudflare) return;
   const settings = getAppSettings(db, fallbacks);
   if (settings.healthWorkerKvNamespaceId.trim() && !settings.healthWorkerError) {
@@ -172,7 +172,7 @@ export function fireEnsureHealthWorker(
   if (!cf.isConfigured) return;
   const hasCloudflare = repos
     .listHealthCheckTargets(db)
-    .some((target) => target.provider === "cloudflare");
+    .some((target) => targetHasProvider(target, "cloudflare"));
   if (!hasCloudflare) {
     void syncCloudflareTargetsToKv(db, cf, fallbacks).catch((err) => {
       log?.warn({ err }, "health worker KV sync failed");

apps/api/src/services/health/mailbox.ts

@@ -5,7 +5,7 @@ import type {
   HealthProbeTargetItem,
   HealthProbeTargetsDoc,
 } from "@cfdm/shared";
-import { HEALTH_KV_RESULTS_KEY, HEALTH_KV_TARGETS_KEY } from "@cfdm/shared";
+import { HEALTH_KV_RESULTS_KEY, HEALTH_KV_TARGETS_KEY, targetHasProvider } from "@cfdm/shared";
 import type { CloudflareClient } from "../../lib/cf-client.js";
 
 export interface HealthMailbox {
@@ -70,7 +70,7 @@ export function cloudflareMailboxTargets(
 ): HealthProbeTargetItem[] {
   const unique = new Map<string, HealthProbeTargetItem>();
   for (const target of targets) {
-    if (target.provider !== "cloudflare") continue;
+    if (!targetHasProvider(target, "cloudflare")) continue;
     if (target.type !== "tcp" && target.type !== "http") continue;
     const key = originProbeKey(target);
     if (unique.has(key)) continue;

apps/api/src/services/service-config-service.ts

@@ -2,6 +2,8 @@ import type { Db } from "@cfdm/db";
 import { repos } from "@cfdm/db";
 import type {
   DnsRecord,
+  HealthCheckAggregate,
+  HealthCheckProvider,
   HealthCheckScope,
   HealthCheckType,
   IpHealthState,
@@ -51,7 +53,9 @@ export interface ServiceDomainInput {
   health_check_interval_sec?: number;
   health_check_timeout_ms?: number;
   health_check_verify_tls?: boolean;
-  health_check_provider?: "local" | "cloudflare";
+  health_check_provider?: HealthCheckProvider;
+  health_check_providers?: HealthCheckProvider[];
+  health_check_aggregate?: HealthCheckAggregate;
 }
 
 export interface ToggleRequest {
@@ -72,7 +76,9 @@ export interface ServiceGroupBody {
   health_check_interval_sec?: number;
   health_check_timeout_ms?: number;
   health_check_verify_tls?: boolean;
-  health_check_provider?: "local" | "cloudflare";
+  health_check_provider?: HealthCheckProvider;
+  health_check_providers?: HealthCheckProvider[];
+  health_check_aggregate?: HealthCheckAggregate;
 }
 
 export interface UpdateServiceGroupBody {
@@ -89,7 +95,9 @@ export interface UpdateServiceGroupBody {
   health_check_interval_sec?: number;
   health_check_timeout_ms?: number;
   health_check_verify_tls?: boolean;
-  health_check_provider?: "local" | "cloudflare";
+  health_check_provider?: HealthCheckProvider;
+  health_check_providers?: HealthCheckProvider[];
+  health_check_aggregate?: HealthCheckAggregate;
 }
 
 export interface UpdateServiceConfigRequest {
@@ -296,6 +304,10 @@ async function buildView(db: Db, serviceId: number): Promise<ServiceView> {
       health_check_timeout_ms: binding.health_check_timeout_ms,
       health_check_verify_tls: binding.health_check_verify_tls,
       health_check_provider: binding.health_check_provider ?? "local",
+      health_check_providers: binding.health_check_providers ?? [
+        binding.health_check_provider ?? "local",
+      ],
+      health_check_aggregate: binding.health_check_aggregate ?? "majority",
       sync_status: aggregateSyncStatus(statuses),
     };
   });
@@ -1164,7 +1176,9 @@ export async function updateConfig(
         input.health_check_interval_sec !== undefined ||
         input.health_check_timeout_ms !== undefined ||
         input.health_check_verify_tls !== undefined ||
-        input.health_check_provider !== undefined
+        input.health_check_provider !== undefined ||
+        input.health_check_providers !== undefined ||
+        input.health_check_aggregate !== undefined
       ) {
         repos.updateBindingLbConfig(db, binding.id, {
           lb_mode: input.lb_mode,
@@ -1177,6 +1191,8 @@ export async function updateConfig(
           health_check_timeout_ms: input.health_check_timeout_ms,
           health_check_verify_tls: input.health_check_verify_tls,
           health_check_provider: input.health_check_provider,
+          health_check_providers: input.health_check_providers,
+          health_check_aggregate: input.health_check_aggregate,
         });
       }
 
@@ -1281,6 +1297,8 @@ export async function createGroup(
       health_check_timeout_ms: body.health_check_timeout_ms,
       health_check_verify_tls: body.health_check_verify_tls,
       health_check_provider: body.health_check_provider,
+      health_check_providers: body.health_check_providers,
+      health_check_aggregate: body.health_check_aggregate,
     },
   );
   fireEnsureHealthWorker(db, cf, DEFAULT_HEALTH_FALLBACKS);
@@ -1320,6 +1338,8 @@ export async function updateGroup(
       health_check_timeout_ms: body.health_check_timeout_ms,
       health_check_verify_tls: body.health_check_verify_tls,
       health_check_provider: body.health_check_provider,
+      health_check_providers: body.health_check_providers,
+      health_check_aggregate: body.health_check_aggregate,
     },
   );
   if (!domain && group.enabled) {

apps/api/test/health-globalping.test.ts

@@ -0,0 +1,273 @@
+import { describe, expect, it } from "vitest";
+import { buildApp } from "../src/app.js";
+import { loadConfig } from "../src/config.js";
+import { repos, type Db } from "@cfdm/db";
+import * as healthCheckService from "../src/services/health-check-service.js";
+import {
+  buildMeasurementBody,
+  summarizeMeasurement,
+} from "../src/lib/globalping-client.js";
+import { aggregateHealthOk } from "@cfdm/shared";
+import type { HealthCheckTarget } from "@cfdm/shared";
+
+const thresholds = {
+  degradedFailures: 1,
+  downFailures: 2,
+  latencyWarnMs: 1000,
+  successRecoveries: 2,
+};
+
+function tcpTarget(overrides?: Partial<HealthCheckTarget>): HealthCheckTarget {
+  return {
+    scope: "binding",
+    ref_id: 1,
+    ip: "203.0.113.10",
+    hostname: "panel.example.com",
+    type: "tcp",
+    port: 443,
+    path: null,
+    expected_status: null,
+    timeout_ms: 400,
+    verify_tls: false,
+    provider: "globalping",
+    providers: ["globalping"],
+    aggregate: "majority",
+    ...overrides,
+  };
+}
+
+async function seedBinding(
+  db: Db,
+  opts: {
+    ip: string;
+    providers: Array<"local" | "cloudflare" | "globalping">;
+    aggregate?: "any" | "all" | "majority";
+    port?: number;
+  },
+) {
+  const domain = repos.createDomain(db, null, "example.com", "zone-1");
+  const service = repos.createService(db, "Panel", "panel");
+  repos.setServiceEnabled(db, service.id, true);
+  repos.replaceServiceIps(db, service.id, [opts.ip]);
+  const binding = repos.insertBinding(db, domain.id, service.id, "panel", null);
+  repos.replaceBindingIpsWithMeta(db, binding.id, [
+    { ip: opts.ip, weight: 1, priority: 1 },
+  ]);
+  repos.updateBindingLbConfig(db, binding.id, {
+    health_check_enabled: true,
+    health_check_type: "tcp",
+    health_check_port: opts.port ?? 1,
+    health_check_timeout_ms: 400,
+    health_check_providers: opts.providers,
+    health_check_aggregate: opts.aggregate ?? "majority",
+  });
+  return { service, binding, domain };
+}
+
+function mockFetch(handler: (url: string, init?: RequestInit) => Response): typeof fetch {
+  return (async (input: RequestInfo | URL, init?: RequestInit) => {
+    const url = typeof input === "string" ? input : input instanceof URL ? input.href : input.url;
+    return handler(url, init);
+  }) as typeof fetch;
+}
+
+describe("aggregateHealthOk", () => {
+  it("any / all / majority", () => {
+    expect(aggregateHealthOk([true, false], "any")).toBe(false);
+    expect(aggregateHealthOk([true, false], "all")).toBe(true);
+    expect(aggregateHealthOk([true, false], "majority")).toBe(true);
+    expect(aggregateHealthOk([false, false], "majority")).toBe(false);
+    expect(aggregateHealthOk([true, false, false], "majority")).toBe(false);
+    expect(aggregateHealthOk([true, true, false], "majority")).toBe(true);
+    expect(aggregateHealthOk([true], "majority")).toBe(true);
+  });
+});
+
+describe("globalping mapping", () => {
+  it("maps CFDM TCP to ping+TCP and HTTP to http+host", () => {
+    const tcp = buildMeasurementBody(tcpTarget(), { limit: 3, locations: "World" });
+    expect(tcp.type).toBe("ping");
+    expect(tcp.measurementOptions.protocol).toBe("TCP");
+    expect(tcp.measurementOptions.port).toBe(443);
+    expect(tcp.inProgressUpdates).toBe(false);
+
+    const http = buildMeasurementBody(
+      tcpTarget({ type: "http", port: 443, path: "/health", expected_status: 200 }),
+      { limit: 2, locations: "EU,US" },
+    );
+    expect(http.type).toBe("http");
+    expect(http.locations).toEqual([{ magic: "EU" }, { magic: "US" }]);
+    expect(http.measurementOptions.request).toMatchObject({
+      host: "panel.example.com",
+      path: "/health",
+      method: "GET",
+    });
+  });
+
+  it("summarizes HTTP majority and TCP packet loss", () => {
+    const httpOk = summarizeMeasurement(
+      tcpTarget({ type: "http", expected_status: 200 }),
+      {
+        status: "finished",
+        results: [
+          { probe: { city: "Frankfurt", country: "DE" }, result: { status: "finished", statusCode: 200, timings: { total: 40 } } },
+          { probe: { city: "London", country: "GB" }, result: { status: "finished", statusCode: 200, timings: { total: 50 } } },
+          { probe: { city: "Paris", country: "FR" }, result: { status: "finished", statusCode: 500, timings: { total: 20 } } },
+        ],
+      },
+    );
+    expect(httpOk.ok).toBe(true);
+    expect(httpOk.colo).toBe("Frankfurt, DE");
+
+    const tcpFail = summarizeMeasurement(tcpTarget(), {
+      status: "finished",
+      results: [
+        { result: { status: "finished", stats: { avg: 12, loss: 100 } } },
+        { result: { status: "finished", stats: { avg: 11, loss: 100 } } },
+      ],
+    });
+    expect(tcpFail.ok).toBe(false);
+  });
+});
+
+describe("globalping engine", () => {
+  it("POST 202 + GET finished writes colo from probe city", async () => {
+    const app = await buildApp({
+      config: { ...loadConfig(), staticDir: null },
+      memory: true,
+    });
+    const { binding } = await seedBinding(app.db, {
+      ip: "203.0.113.40",
+      providers: ["globalping"],
+      port: 443,
+    });
+    const fetchImpl = mockFetch((url) => {
+      if (url.endsWith("/v1/measurements")) {
+        return new Response(JSON.stringify({ id: "meas-1" }), { status: 202 });
+      }
+      return new Response(
+        JSON.stringify({
+          id: "meas-1",
+          status: "finished",
+          results: [
+            {
+              probe: { city: "Amsterdam", country: "NL" },
+              result: { status: "finished", stats: { avg: 18, loss: 0 } },
+            },
+            {
+              probe: { city: "Frankfurt", country: "DE" },
+              result: { status: "finished", stats: { avg: 22, loss: 0 } },
+            },
+          ],
+        }),
+        { status: 200 },
+      );
+    });
+    await healthCheckService.runAllChecks(app.db, {
+      thresholds,
+      probeGapMs: 0,
+      globalping: {
+        token: "gp_test",
+        locations: "World",
+        limit: 2,
+        pollIntervalMs: 0,
+        fetchImpl,
+      },
+    });
+    const row = repos.getIpHealthStatusRow(
+      app.db,
+      "binding",
+      binding.id,
+      "203.0.113.40",
+    );
+    expect(row?.status).toBe("up");
+    expect(row?.provider).toBe("globalping");
+    expect(row?.colo).toMatch(/Amsterdam/);
+    await app.close();
+  });
+
+  it("429 fails the source and does not fall back to local", async () => {
+    const app = await buildApp({
+      config: { ...loadConfig(), staticDir: null },
+      memory: true,
+    });
+    const { binding } = await seedBinding(app.db, {
+      ip: "127.0.0.1",
+      providers: ["globalping"],
+      port: 1,
+    });
+    const fetchImpl = mockFetch(() => new Response("rate limited", { status: 429 }));
+    await healthCheckService.runAllChecks(app.db, {
+      thresholds,
+      probeGapMs: 0,
+      globalping: {
+        token: "gp_test",
+        locations: "World",
+        limit: 1,
+        pollIntervalMs: 0,
+        fetchImpl,
+      },
+    });
+    const row = repos.getIpHealthStatusRow(
+      app.db,
+      "binding",
+      binding.id,
+      "127.0.0.1",
+    );
+    expect(row?.last_error).toMatch(/429/i);
+    expect(row?.provider).toBe("globalping");
+    await app.close();
+  });
+
+  it("local+globalping all keeps IP up if Globalping is ok", async () => {
+    const app = await buildApp({
+      config: { ...loadConfig(), staticDir: null },
+      memory: true,
+    });
+    const { binding, service } = await seedBinding(app.db, {
+      ip: "127.0.0.1",
+      providers: ["local", "globalping"],
+      aggregate: "all",
+      port: 1,
+    });
+    const fetchImpl = mockFetch((url) => {
+      if (url.endsWith("/v1/measurements")) {
+        return new Response(JSON.stringify({ id: "meas-2" }), { status: 202 });
+      }
+      return new Response(
+        JSON.stringify({
+          status: "finished",
+          results: [
+            { probe: { city: "Vienna", country: "AT" }, result: { status: "finished", stats: { avg: 9, loss: 0 } } },
+          ],
+        }),
+        { status: 200 },
+      );
+    });
+    await healthCheckService.runAllChecks(app.db, {
+      thresholds,
+      probeGapMs: 0,
+      globalping: {
+        token: "gp_test",
+        locations: "World",
+        limit: 1,
+        pollIntervalMs: 0,
+        fetchImpl,
+      },
+    });
+    const row = repos.getIpHealthStatusRow(
+      app.db,
+      "binding",
+      binding.id,
+      "127.0.0.1",
+    );
+    expect(row?.status).toBe("up");
+    expect(row?.provider).toBe("aggregate");
+    const logs = repos.listHealthProbeLogForService(app.db, service.id);
+    expect(logs.map((row) => row.provider).sort()).toEqual([
+      "globalping",
+      "local",
+    ]);
+    await app.close();
+  });
+});

apps/api/test/settings-health.test.ts

@@ -164,4 +164,51 @@ describe("settings health engine", () => {
     expect(body.healthWorkerToken).toBeUndefined();
     await app.close();
   });
+
+  it("GET exposes Globalping flags without the token; PATCH persists locations/limit", async () => {
+    const app = await buildApp({
+      config: { ...loadConfig(), staticDir: null },
+      memory: true,
+    });
+    const headers = await authHeaders(app);
+    const initial = await app.inject({
+      method: "GET",
+      url: "/api/v1/settings",
+      headers,
+    });
+    expect(initial.statusCode).toBe(200);
+    const before = initial.json() as {
+      globalpingTokenSet?: boolean;
+      globalpingLocations?: string;
+      globalpingLimit?: number;
+      globalpingToken?: string;
+    };
+    expect(before.globalpingTokenSet).toBe(false);
+    expect(before.globalpingLocations).toBe("World");
+    expect(before.globalpingLimit).toBe(3);
+    expect(before.globalpingToken).toBeUndefined();
+
+    const patched = await app.inject({
+      method: "PATCH",
+      url: "/api/v1/settings",
+      headers,
+      payload: {
+        globalpingToken: "gp_secret",
+        globalpingLocations: "EU,US",
+        globalpingLimit: 5,
+      },
+    });
+    expect(patched.statusCode).toBe(200);
+    const body = patched.json() as {
+      globalpingTokenSet: boolean;
+      globalpingLocations: string;
+      globalpingLimit: number;
+      globalpingToken?: string;
+    };
+    expect(body.globalpingTokenSet).toBe(true);
+    expect(body.globalpingLocations).toBe("EU,US");
+    expect(body.globalpingLimit).toBe(5);
+    expect(body.globalpingToken).toBeUndefined();
+    await app.close();
+  });
 });

apps/web/src/components/health-check-config-fields.tsx

@@ -17,16 +17,22 @@ import {
   SelectValue,
 } from '@cfdm/ui/components/select'
 import { Switch } from '@cfdm/ui/components/switch'
-import { Button } from '@cfdm/ui/components/button'
-import { ButtonGroup } from '@cfdm/ui/components/button-group'
 import { FieldGroup } from '@cfdm/ui/components/field'
+import { ToggleGroup, ToggleGroupItem } from '@cfdm/ui/components/toggle-group'
 import { Link } from '@tanstack/react-router'
 import { Alert, AlertDescription, AlertTitle } from '@/components/reui/alert'
 import { cn } from '@cfdm/ui/lib/utils'
+import {
+  HealthAggregateTiles,
+  HealthSourceTiles,
+  type HealthAggregate,
+  type HealthProvider,
+} from '@/components/reui-kit/health-source-tiles'
+import { uniqueHealthProviders } from '@cfdm/shared'
 
 export type LbMode = 'round_robin' | 'failover' | 'weighted'
 export type HealthCheckType = 'tcp' | 'http'
-export type HealthProvider = 'local' | 'cloudflare'
+export type { HealthProvider, HealthAggregate }
 
 export interface HealthCheckConfig {
   enabled: boolean
@@ -38,6 +44,8 @@ export interface HealthCheckConfig {
   timeout_ms: number
   verify_tls: boolean
   provider: HealthProvider
+  providers: HealthProvider[]
+  aggregate: HealthAggregate
   method?: string | null
   retries?: number
   consecutive_fails?: number
@@ -54,62 +62,6 @@ const defaultLbModeOptions = [
   { value: 'weighted', label: 'Weighted (веса)' },
 ]
 
-const healthCheckTypes = [
-  { value: 'tcp', label: 'TCP connect' },
-  { value: 'http', label: 'HTTP' },
-] as const
-
-const cloudflareTypes = [
-  { value: 'tcp', label: 'TCP' },
-  { value: 'http', label: 'HTTP' },
-] as const
-
-export function HealthProviderToggle({
-  value,
-  onChange,
-  id,
-}: {
-  value: HealthProvider
-  onChange: (next: HealthProvider) => void
-  id?: string
-}) {
-  const provider = value || 'local'
-  return (
-    <ButtonGroup className="w-full" id={id}>
-      <Button
-        type="button"
-        size="sm"
-        className="flex-1"
-        variant={provider === 'local' ? 'secondary' : 'outline'}
-        aria-pressed={provider === 'local'}
-        onClick={() => onChange('local')}
-      >
-        Local
-      </Button>
-      <Button
-        type="button"
-        size="sm"
-        className="flex-1"
-        variant={provider === 'cloudflare' ? 'secondary' : 'outline'}
-        aria-pressed={provider === 'cloudflare'}
-        onClick={() => onChange('cloudflare')}
-      >
-        Cloudflare
-      </Button>
-    </ButtonGroup>
-  )
-}
-
-interface HealthCheckConfigFieldsProps {
-  value: LbAndHealthConfig
-  onChange: (next: LbAndHealthConfig) => void
-  lbModeLabel?: string
-  lbModeOptions?: { value: string; label: string }[]
-  idPrefix?: string
-  showLbMode?: boolean
-  className?: string
-}
-
 function CompactNumberField({
   id,
   value,
@@ -151,13 +103,29 @@ export function HealthCheckConfigFields({
   idPrefix = 'health',
   showLbMode = true,
   className,
-}: HealthCheckConfigFieldsProps) {
+}: {
+  value: LbAndHealthConfig
+  onChange: (next: LbAndHealthConfig) => void
+  lbModeLabel?: string
+  lbModeOptions?: { value: string; label: string }[]
+  idPrefix?: string
+  showLbMode?: boolean
+  className?: string
+}) {
   function patch(next: Partial<LbAndHealthConfig>) {
     onChange({ ...value, ...next })
   }
 
+  const providers =
+    value.providers?.length > 0
+      ? uniqueHealthProviders(value.providers)
+      : uniqueHealthProviders([value.provider ?? 'local'])
+  const aggregate = value.aggregate ?? 'majority'
   const isHttp = value.type === 'http'
   const rowClass = 'gap-3 px-0 py-3'
+  const hasCloudflare = providers.includes('cloudflare')
+  const hasGlobalping = providers.includes('globalping')
+  const hasLocal = providers.includes('local')
 
   return (
     <FieldGroup className={cn('gap-0', className)}>
@@ -190,23 +158,25 @@ export function HealthCheckConfigFields({
 
       <SettingRow
         title="Провайдер health-check"
-        description="Откуда идёт проба: API CFDM или Cloudflare Worker (edge)"
+        description="Кто пробирует цель. Можно выбрать несколько источников."
         labelFor={`${idPrefix}-provider`}
         compact
+        stacked
         className={rowClass}
       >
-        <HealthProviderToggle
-          id={`${idPrefix}-provider`}
-          value={value.provider ?? 'local'}
-          onChange={(provider) =>
+        <HealthSourceTiles
+          value={providers}
+          onChange={(next) =>
             patch({
-              provider,
-              enabled: provider === 'cloudflare' ? true : value.enabled,
+              providers: next,
+              provider: next[0] ?? 'local',
+              enabled: next.includes('cloudflare') ? true : value.enabled,
             })
           }
         />
       </SettingRow>
-      {value.provider === 'cloudflare' ? (
+
+      {hasCloudflare ? (
         <Alert>
           <AlertTitle>Cloudflare Worker</AlertTitle>
           <AlertDescription>
@@ -216,10 +186,24 @@ export function HealthCheckConfigFields({
             <Link to="/settings/health" className="text-foreground underline">
               Настройках → Health-check
             </Link>
-            . Если Worker не создан, цель не пробируется как Local.
+            . Если Worker не создан, этот источник не пробируется как Local.
           </AlertDescription>
         </Alert>
-      ) : (
+      ) : null}
+      {hasGlobalping ? (
+        <Alert>
+          <AlertTitle>Globalping</AlertTitle>
+          <AlertDescription>
+            Пробы из сети globalping.io (TCP ping / HTTP). Токен, локации и лимит —
+            в{' '}
+            <Link to="/settings/health" className="text-foreground underline">
+              Настройках → Health-check
+            </Link>
+            . Без токена или при 429 этот источник = fail, без fallback на Local.
+          </AlertDescription>
+        </Alert>
+      ) : null}
+      {hasLocal ? (
         <Alert>
           <AlertTitle>Local health-check</AlertTitle>
           <AlertDescription>
@@ -230,7 +214,22 @@ export function HealthCheckConfigFields({
             . Интервал в карточке не используется.
           </AlertDescription>
         </Alert>
-      )}
+      ) : null}
+
+      {providers.length > 1 ? (
+        <SettingRow
+          title="Агрегация"
+          description="Как свести результаты источников в один статус IP для failover"
+          compact
+          stacked
+          className={rowClass}
+        >
+          <HealthAggregateTiles
+            value={aggregate}
+            onChange={(next) => patch({ aggregate: next })}
+          />
+        </SettingRow>
+      ) : null}
 
       <SettingRow
         title="Health-check"
@@ -259,25 +258,25 @@ export function HealthCheckConfigFields({
         <div className="flex flex-col gap-3 pt-1 pb-1">
           <div className="grid grid-cols-2 gap-3">
             <FormFieldSimple label="Тип" htmlFor={`${idPrefix}-type`}>
-              <Select
-                modal={false}
-                value={value.type}
-                onValueChange={(v) => patch({ type: (v ?? 'tcp') as HealthCheckType })}
+              <ToggleGroup
+                id={`${idPrefix}-type`}
+                variant="outline"
+                className="w-full"
+                value={[value.type]}
+                onValueChange={(next) => {
+                  const picked = next[0]
+                  if (picked === 'tcp' || picked === 'http') {
+                    patch({ type: picked })
+                  }
+                }}
               >
-                <SelectTrigger id={`${idPrefix}-type`} className="w-full">
-                  <SelectValue placeholder="Тип" />
-                </SelectTrigger>
-                <SelectContent>
-                  {(value.provider === 'cloudflare'
-                    ? cloudflareTypes
-                    : healthCheckTypes
-                  ).map((item) => (
-                    <SelectItem key={item.value} value={item.value}>
-                      {item.label}
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
+                <ToggleGroupItem value="tcp" className="flex-1">
+                  TCP
+                </ToggleGroupItem>
+                <ToggleGroupItem value="http" className="flex-1">
+                  HTTP
+                </ToggleGroupItem>
+              </ToggleGroup>
             </FormFieldSimple>
 
             <FormFieldSimple label="Порт" htmlFor={`${idPrefix}-port`}>

apps/web/src/components/reui-kit/health-source-tiles.tsx

@@ -0,0 +1,202 @@
+import type { KeyboardEvent, ReactNode } from 'react'
+import { CheckIcon, GlobeIcon, ServerIcon, CloudIcon, LayersIcon, ShieldAlertIcon, ScaleIcon } from 'lucide-react'
+
+import { Frame, FramePanel } from '@/components/reui/frame'
+import { IconTile } from '@/components/reui/icon-tile'
+import { cn } from '@cfdm/ui/lib/utils'
+import type { HealthCheckAggregate, HealthCheckProvider } from '@cfdm/shared'
+
+export type HealthProvider = HealthCheckProvider
+export type HealthAggregate = HealthCheckAggregate
+
+const DEFAULT_ICON_CLASS = 'text-muted-foreground [&_svg]:text-current'
+
+const PROVIDER_ITEMS: Array<{
+  id: HealthProvider
+  title: string
+  description: string
+  icon: ReactNode
+  iconClassName: string
+}> = [
+  {
+    id: 'local',
+    title: 'Local',
+    description: 'TCP/HTTP с сервера API',
+    icon: <ServerIcon />,
+    iconClassName: 'text-info [&_svg]:text-current',
+  },
+  {
+    id: 'cloudflare',
+    title: 'Cloudflare',
+    description: 'Worker на edge, KV mailbox',
+    icon: <CloudIcon />,
+    iconClassName: 'text-warning [&_svg]:text-current',
+  },
+  {
+    id: 'globalping',
+    title: 'Globalping',
+    description: 'Пробы из сети globalping.io',
+    icon: <GlobeIcon />,
+    iconClassName: 'text-success [&_svg]:text-current',
+  },
+]
+
+const AGGREGATE_ITEMS: Array<{
+  id: HealthAggregate
+  title: string
+  description: string
+  icon: ReactNode
+}> = [
+  {
+    id: 'any',
+    title: 'Any',
+    description: 'Down, если хотя бы один источник Down',
+    icon: <ShieldAlertIcon />,
+  },
+  {
+    id: 'all',
+    title: 'All',
+    description: 'Down, только если все выбранные Down',
+    icon: <LayersIcon />,
+  },
+  {
+    id: 'majority',
+    title: 'Majority',
+    description: 'Down по большинству (2 → оба, 3 → ≥2)',
+    icon: <ScaleIcon />,
+  },
+]
+
+function handleTileKeyDown(onActivate: () => void, event: KeyboardEvent<HTMLDivElement>) {
+  if (event.key === 'Enter' || event.key === ' ') {
+    event.preventDefault()
+    onActivate()
+  }
+}
+
+function TilePanel({
+  selected,
+  title,
+  description,
+  icon,
+  iconClassName,
+  role,
+  onActivate,
+}: {
+  selected: boolean
+  title: string
+  description: string
+  icon: ReactNode
+  iconClassName?: string
+  role: 'checkbox' | 'radio'
+  onActivate: () => void
+}) {
+  return (
+    <FramePanel
+      role={role}
+      aria-checked={selected}
+      aria-pressed={selected}
+      tabIndex={0}
+      className={cn(
+        'relative isolate flex h-full cursor-pointer flex-col p-3 transition-colors',
+        'hover:bg-muted/40 focus-visible:ring-ring focus-visible:ring-2 focus-visible:outline-none',
+        selected && 'ring-ring ring-1',
+      )}
+      onClick={onActivate}
+      onKeyDown={(event) => handleTileKeyDown(onActivate, event)}
+    >
+      <div className="relative z-10 flex h-full items-start gap-3">
+        <IconTile
+          variant="elevated"
+          aria-hidden="true"
+          className={cn('size-10.5', iconClassName ?? DEFAULT_ICON_CLASS)}
+        >
+          {icon}
+        </IconTile>
+        <div className="flex min-w-0 flex-1 flex-col gap-0.5">
+          <div className="flex items-start justify-between gap-2">
+            <span className="text-foreground text-sm font-medium">{title}</span>
+            {selected ? (
+              <CheckIcon className="text-foreground size-4 shrink-0" aria-hidden />
+            ) : null}
+          </div>
+          <p className="text-muted-foreground text-xs leading-relaxed">{description}</p>
+        </div>
+      </div>
+    </FramePanel>
+  )
+}
+
+/**
+ * Мультивыбор источников проб (Local / Cloudflare / Globalping).
+ * Preview: https://reui.io/preview/base/card-12
+ * Docs: https://reui.io/docs/components/base/frame · https://reui.io/docs/components/base/icon-tile
+ */
+export function HealthSourceTiles({
+  value,
+  onChange,
+}: {
+  value: HealthProvider[]
+  onChange: (next: HealthProvider[]) => void
+}) {
+  const selected = value.length > 0 ? value : (['local'] as HealthProvider[])
+
+  function toggle(id: HealthProvider) {
+    if (selected.includes(id)) {
+      if (selected.length === 1) return
+      onChange(selected.filter((item) => item !== id))
+      return
+    }
+    onChange([...selected, id])
+  }
+
+  return (
+    <Frame dense spacing="sm" className="@container w-full">
+      <div className="grid grid-cols-1 gap-2 sm:grid-cols-3">
+        {PROVIDER_ITEMS.map((item) => (
+          <TilePanel
+            key={item.id}
+            selected={selected.includes(item.id)}
+            title={item.title}
+            description={item.description}
+            icon={item.icon}
+            iconClassName={item.iconClassName}
+            role="checkbox"
+            onActivate={() => toggle(item.id)}
+          />
+        ))}
+      </div>
+    </Frame>
+  )
+}
+
+/**
+ * Правило агрегации (ровно одно): any / all / majority.
+ * Preview: https://reui.io/preview/base/card-12 · https://reui.io/preview/base/settings-5
+ */
+export function HealthAggregateTiles({
+  value,
+  onChange,
+}: {
+  value: HealthAggregate
+  onChange: (next: HealthAggregate) => void
+}) {
+  const selected = value || 'majority'
+  return (
+    <Frame dense spacing="sm" className="@container w-full">
+      <div className="grid grid-cols-1 gap-2 sm:grid-cols-3">
+        {AGGREGATE_ITEMS.map((item) => (
+          <TilePanel
+            key={item.id}
+            selected={selected === item.id}
+            title={item.title}
+            description={item.description}
+            icon={item.icon}
+            role="radio"
+            onActivate={() => onChange(item.id)}
+          />
+        ))}
+      </div>
+    </Frame>
+  )
+}

apps/web/src/components/reui-kit/index.ts

@@ -18,3 +18,9 @@ export { OpsDashboard } from './ops-dashboard'
 export { KanbanBoard, KanbanBoardSkeleton, type KanbanBoardProps, type KanbanColumnConfig } from './kanban-board'
 export { DetailPanel, type DetailMetricCard } from './detail-panel'
 export { SettingsShell, type SettingsTabConfig } from './settings-shell'
+export {
+  HealthSourceTiles,
+  HealthAggregateTiles,
+  type HealthProvider,
+  type HealthAggregate,
+} from './health-source-tiles'

apps/web/src/components/service-edit-sheet.tsx

@@ -8,6 +8,8 @@ import {
   type LbAndHealthConfig,
   type LbMode,
   type HealthCheckType,
+  type HealthProvider,
+  type HealthAggregate,
 } from '@/components/health-check-config-fields'
 import type {
   CreateServiceWithConfigInput,
@@ -53,7 +55,9 @@ interface BindingHealthConfig {
   interval_sec: number
   timeout_ms: number
   verify_tls: boolean
-  provider: 'local' | 'cloudflare'
+  provider: HealthProvider
+  providers: HealthProvider[]
+  aggregate: HealthAggregate
 }
 
 export interface ServiceBindingDraft {
@@ -77,6 +81,8 @@ const defaultHealth: BindingHealthConfig = {
   timeout_ms: 3000,
   verify_tls: false,
   provider: 'local',
+  providers: ['local'],
+  aggregate: 'majority',
 }
 
 interface ServiceEditSheetProps {
@@ -110,7 +116,12 @@ function toBindingDrafts(service: ServiceView): ServiceBindingDraft[] {
       interval_sec: binding.health_check_interval_sec,
       timeout_ms: binding.health_check_timeout_ms,
       verify_tls: binding.health_check_verify_tls ?? false,
-      provider: binding.health_check_provider === 'cloudflare' ? 'cloudflare' : 'local',
+      provider: binding.health_check_provider ?? 'local',
+      providers:
+        binding.health_check_providers?.length > 0
+          ? binding.health_check_providers
+          : [binding.health_check_provider ?? 'local'],
+      aggregate: binding.health_check_aggregate ?? 'majority',
     },
     target_ip_weights: binding.target_ip_weights ?? {},
     target_ip_priorities: binding.target_ip_priorities ?? {},
@@ -139,6 +150,8 @@ function buildDomainsPayload(bindings: ServiceBindingDraft[]) {
             health_check_timeout_ms: binding.health.timeout_ms,
             health_check_verify_tls: binding.health.verify_tls,
             health_check_provider: binding.health.provider,
+            health_check_providers: binding.health.providers,
+            health_check_aggregate: binding.health.aggregate,
           }
         : {
             fqdn: binding.fqdn.trim(),
@@ -155,6 +168,8 @@ function buildDomainsPayload(bindings: ServiceBindingDraft[]) {
             health_check_timeout_ms: binding.health.timeout_ms,
             health_check_verify_tls: binding.health.verify_tls,
             health_check_provider: binding.health.provider,
+            health_check_providers: binding.health.providers,
+            health_check_aggregate: binding.health.aggregate,
           },
     )
 }
@@ -334,6 +349,8 @@ export function ServiceEditSheet({
       timeout_ms: next.timeout_ms,
       verify_tls: next.verify_tls,
       provider: next.provider,
+      providers: next.providers,
+      aggregate: next.aggregate,
     }
   }
 

apps/web/src/lib/schemas.ts

@@ -36,7 +36,9 @@ export const serviceGroupSchema = z.object({
   health_check_interval_sec: z.number().default(30),
   health_check_timeout_ms: z.number().default(3000),
   health_check_verify_tls: z.coerce.boolean().default(false),
-  health_check_provider: z.enum(['local', 'cloudflare']).catch('local'),
+  health_check_provider: z.enum(['local', 'cloudflare', 'globalping']).catch('local'),
+  health_check_providers: z.array(z.enum(['local', 'cloudflare', 'globalping'])).min(1).catch(['local']),
+  health_check_aggregate: z.enum(['any', 'all', 'majority']).catch('majority'),
   created_at: z.string(),
   updated_at: z.string(),
 })
@@ -77,7 +79,9 @@ export const serviceDomainBindingSchema = z
     health_check_interval_sec: z.number().default(30),
     health_check_timeout_ms: z.number().default(3000),
     health_check_verify_tls: z.coerce.boolean().default(false),
-    health_check_provider: z.enum(['local', 'cloudflare']).catch('local'),
+    health_check_provider: z.enum(['local', 'cloudflare', 'globalping']).catch('local'),
+    health_check_providers: z.array(z.enum(['local', 'cloudflare', 'globalping'])).min(1).catch(['local']),
+    health_check_aggregate: z.enum(['any', 'all', 'majority']).catch('majority'),
     sync_status: z.string().nullable().default(null),
   })
   .transform((binding) => ({
@@ -102,7 +106,7 @@ export const serviceIpHealthSchema = z.object({
   latency_ms: z.number().nullable(),
   last_checked_at: z.string().nullable().optional(),
   last_error: z.string().nullable().optional(),
-  provider: z.enum(['local', 'cloudflare']).optional(),
+  provider: z.enum(['local', 'cloudflare', 'globalping', 'aggregate']).optional(),
   colo: z.string().nullable().optional(),
 })
 
@@ -111,7 +115,7 @@ export const healthProbeLogSchema = z.object({
   scope: z.string(),
   ref_id: z.number(),
   ip: z.string(),
-  provider: z.enum(['local', 'cloudflare']),
+  provider: z.enum(['local', 'cloudflare', 'globalping']),
   status: z.enum(['up', 'down', 'degraded', 'unknown']),
   ok: z.coerce.boolean(),
   latency_ms: z.number().nullable(),
@@ -188,7 +192,9 @@ export const serviceBindingSchema = z
     health_check_interval_sec: z.number().default(30),
     health_check_timeout_ms: z.number().default(3000),
     health_check_verify_tls: z.coerce.boolean().default(false),
-    health_check_provider: z.enum(['local', 'cloudflare']).catch('local'),
+    health_check_provider: z.enum(['local', 'cloudflare', 'globalping']).catch('local'),
+    health_check_providers: z.array(z.enum(['local', 'cloudflare', 'globalping'])).min(1).catch(['local']),
+    health_check_aggregate: z.enum(['any', 'all', 'majority']).catch('majority'),
     sync_status: z.string().nullable().default(null),
     created_at: z.string(),
     updated_at: z.string(),
@@ -273,7 +279,9 @@ const healthCheckConfigFields = {
   health_check_interval_sec: z.number().int().min(5).max(3600).optional(),
   health_check_timeout_ms: z.number().int().min(100).max(30000).optional(),
   health_check_verify_tls: z.boolean().optional(),
-  health_check_provider: z.enum(['local', 'cloudflare']).optional(),
+  health_check_provider: z.enum(['local', 'cloudflare', 'globalping']).optional(),
+  health_check_providers: z.array(z.enum(['local', 'cloudflare', 'globalping'])).min(1).optional(),
+  health_check_aggregate: z.enum(['any', 'all', 'majority']).optional(),
 }
 
 const serviceDomainInputSchema = z

apps/web/src/routes/_auth/settings/health.tsx

@@ -5,7 +5,7 @@ import { useForm, Controller } from 'react-hook-form'
 import { zodResolver } from '@hookform/resolvers/zod'
 import { z } from 'zod'
 import { toast } from 'sonner'
-import { HeartPulseIcon } from 'lucide-react'
+import { HeartPulseIcon, GlobeIcon } from 'lucide-react'
 
 import { api } from '@/lib/api-client'
 import { SettingRow } from '@/components/setting-row'
@@ -47,7 +47,14 @@ const formSchema = z.object({
   }
 })
 
+const globalpingSchema = z.object({
+  globalpingToken: z.string().optional(),
+  globalpingLocations: z.string().trim().min(1).max(200),
+  globalpingLimit: z.number().int().min(1).max(10),
+})
+
 type FormValues = z.infer<typeof formSchema>
+type GlobalpingValues = z.infer<typeof globalpingSchema>
 type HealthWorkerStatus = 'missing' | 'ready' | 'error'
 
 type SettingsResponse = FormValues & {
@@ -58,6 +65,9 @@ type SettingsResponse = FormValues & {
   healthWorkerDeployedAt?: string | null
   healthWorkerLastIngestAt?: string | null
   healthWorkerKvNamespaceId?: string
+  globalpingTokenSet?: boolean
+  globalpingLocations?: string
+  globalpingLimit?: number
 }
 
 export const Route = createFileRoute('/_auth/settings/health')({
@@ -140,6 +150,15 @@ function HealthSettingsPage() {
     },
   })
 
+  const gpForm = useForm<GlobalpingValues>({
+    resolver: zodResolver(globalpingSchema),
+    defaultValues: {
+      globalpingToken: '',
+      globalpingLocations: 'World',
+      globalpingLimit: 3,
+    },
+  })
+
   useEffect(() => {
     if (!data) return
     form.reset({
@@ -149,7 +168,12 @@ function HealthSettingsPage() {
       healthLatencyWarnMs: data.healthLatencyWarnMs,
       healthSuccessRecoveries: data.healthSuccessRecoveries,
     })
-  }, [data, form])
+    gpForm.reset({
+      globalpingToken: '',
+      globalpingLocations: data.globalpingLocations || 'World',
+      globalpingLimit: data.globalpingLimit ?? 3,
+    })
+  }, [data, form, gpForm])
 
   const saveMut = useMutation({
     mutationFn: (values: FormValues) =>
@@ -168,6 +192,27 @@ function HealthSettingsPage() {
       toast.error(e instanceof Error ? e.message : 'Не удалось сохранить'),
   })
 
+  const saveGpMut = useMutation({
+    mutationFn: (values: GlobalpingValues) =>
+      api.patch<SettingsResponse>('/api/v1/settings', {
+        globalpingLocations: values.globalpingLocations,
+        globalpingLimit: values.globalpingLimit,
+        ...(values.globalpingToken?.trim()
+          ? { globalpingToken: values.globalpingToken.trim() }
+          : {}),
+      }),
+    onSuccess: () => {
+      void queryClient.invalidateQueries({ queryKey: ['app-settings'] })
+      toast.success('Настройки Globalping сохранены')
+      gpForm.reset({
+        ...gpForm.getValues(),
+        globalpingToken: '',
+      })
+    },
+    onError: (e: unknown) =>
+      toast.error(e instanceof Error ? e.message : 'Не удалось сохранить'),
+  })
+
   const ensureMut = useMutation({
     mutationFn: () =>
       api.post<SettingsResponse>('/api/v1/settings/health/worker/ensure'),
@@ -180,6 +225,7 @@ function HealthSettingsPage() {
   })
 
   return (
+    <div className="flex w-full flex-col gap-4">
     <form
       className="flex w-full flex-col gap-4"
       onSubmit={(event) =>
@@ -193,8 +239,8 @@ function HealthSettingsPage() {
             Local health-check
           </FrameTitle>
           <FrameDescription>
-            Расписание и пороги движка — общие для Local и Cloudflare Worker.
-            Тип/порт/path задаются в карточке сервиса.
+            Расписание и пороги движка — общие для Local, Cloudflare Worker и Globalping.
+            Тип/порт/path и правило агрегации задаются в карточке сервиса.
           </FrameDescription>
         </FrameHeader>
         <FramePanel className="p-0">
@@ -416,5 +462,127 @@ function HealthSettingsPage() {
         </FramePanel>
       </Frame>
     </form>
+
+      <form
+        className="flex w-full flex-col gap-4"
+        onSubmit={(event) =>
+          void gpForm.handleSubmit((values) => saveGpMut.mutate(values))(event)
+        }
+      >
+        <Frame dense spacing="sm" className="w-full">
+          <FrameHeader>
+            <FrameTitle className="flex items-center gap-2">
+              <GlobeIcon className="size-4" aria-hidden />
+              Globalping
+              <Badge
+                variant={data?.globalpingTokenSet ? 'success-light' : 'outline'}
+                size="sm"
+              >
+                {data?.globalpingTokenSet ? 'Токен задан' : 'Нет токена'}
+              </Badge>
+            </FrameTitle>
+            <FrameDescription>
+              Пробы из сети globalping.io. Poll ≥ 500 мс.{' '}
+              <a
+                href="https://reui.io/preview/base/settings-16"
+                className="underline"
+                target="_blank"
+                rel="noreferrer"
+              >
+                settings-16
+              </a>
+              .
+            </FrameDescription>
+          </FrameHeader>
+          <FramePanel className="p-0">
+            <div className="flex flex-col gap-3 p-4">
+              <Alert>
+                <AlertTitle>Лимиты и credits</AlertTitle>
+                <AlertDescription>
+                  Без токена — 250 tests/hour, с токеном — 500 +{' '}
+                  <a
+                    href="https://globalping.io/credits"
+                    className="underline"
+                    target="_blank"
+                    rel="noreferrer"
+                  >
+                    credits
+                  </a>
+                  . Токен: dash.globalping.io/tokens. Один measurement на
+                  уникальный IP/порт за тик cron. При десятках IP следите за
+                  hourly credits.
+                </AlertDescription>
+              </Alert>
+            </div>
+            <FieldGroup className="gap-0">
+              <SettingRow
+                title="Токен"
+                description={
+                  data?.globalpingTokenSet
+                    ? 'Оставьте пустым, чтобы не менять сохранённый токен.'
+                    : 'Authorization: Bearer. Без токена источник Globalping = fail.'
+                }
+                labelFor="gp-token"
+                stacked
+              >
+                <Input
+                  id="gp-token"
+                  type="password"
+                  autoComplete="off"
+                  placeholder={data?.globalpingTokenSet ? '••••••••' : 'gp_…'}
+                  disabled={isLoading || saveGpMut.isPending}
+                  {...gpForm.register('globalpingToken')}
+                />
+              </SettingRow>
+              <SettingRow
+                title="Локации"
+                description="Magic CSV, например World или EU,US. Default World."
+                labelFor="gp-locations"
+                stacked
+              >
+                <Input
+                  id="gp-locations"
+                  spellCheck={false}
+                  autoComplete="off"
+                  disabled={isLoading || saveGpMut.isPending}
+                  {...gpForm.register('globalpingLocations')}
+                />
+              </SettingRow>
+              <SettingRow
+                title="Проб в measurement"
+                description="limit 1–10. Default 3."
+                labelFor="gp-limit"
+                compact
+                last
+              >
+                <Controller
+                  control={gpForm.control}
+                  name="globalpingLimit"
+                  render={({ field }) => (
+                    <CompactNumberInput
+                      id="gp-limit"
+                      value={field.value}
+                      min={1}
+                      max={10}
+                      disabled={isLoading || saveGpMut.isPending}
+                      onValueChange={field.onChange}
+                    />
+                  )}
+                />
+              </SettingRow>
+            </FieldGroup>
+            <FrameFooter className="flex flex-row justify-end">
+              <LoadingButton
+                type="submit"
+                isLoading={saveGpMut.isPending}
+                disabled={isLoading || !gpForm.formState.isDirty}
+              >
+                Сохранить
+              </LoadingButton>
+            </FrameFooter>
+          </FramePanel>
+        </Frame>
+      </form>
+    </div>
   )
 }