Compare commits
7
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7938d2f707 | ||
|
|
994e79e118 | ||
|
|
87b0f1a894 | ||
|
|
ba4e04a224 | ||
|
|
4c59780ff0 | ||
|
|
1457389ae7 | ||
|
|
153be28799 |
No files matched your search
@@ -386,7 +386,8 @@ function applyAggregatedStatus(
|
|||||||
{ colo, provider: statusProvider },
|
{ colo, provider: statusProvider },
|
||||||
);
|
);
|
||||||
const matchedNode = repos.findNodeByIp(db, target.ip);
|
const matchedNode = repos.findNodeByIp(db, target.ip);
|
||||||
if (matchedNode && matchedNode.enabled) {
|
// Binding-scope only: group apply must not clobber node with its own fetch failed.
|
||||||
|
if (matchedNode && matchedNode.enabled && target.scope === "binding") {
|
||||||
repos.updateNode(db, matchedNode.id, {
|
repos.updateNode(db, matchedNode.id, {
|
||||||
health_status: node,
|
health_status: node,
|
||||||
consecutive_failures: failures,
|
consecutive_failures: failures,
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ import * as domainService from "./domain-service.js";
|
|||||||
import { syncServiceToVpsTracker } from "./vps-tracker-sync.js";
|
import { syncServiceToVpsTracker } from "./vps-tracker-sync.js";
|
||||||
import { fireEnsureHealthWorker, DEFAULT_HEALTH_FALLBACKS } from "./health/health-worker-deploy.js";
|
import { fireEnsureHealthWorker, DEFAULT_HEALTH_FALLBACKS } from "./health/health-worker-deploy.js";
|
||||||
import {
|
import {
|
||||||
|
isHealthy,
|
||||||
selectActiveIpsByMode,
|
selectActiveIpsByMode,
|
||||||
withBindingLock,
|
withBindingLock,
|
||||||
type LbIpRow,
|
type LbIpRow,
|
||||||
|
|||||||
@@ -291,6 +291,77 @@ describe("health-check state derivation via runAllChecks", () => {
|
|||||||
expect(targets[0]?.ip).toBe("2.59.161.102");
|
expect(targets[0]?.ip).toBe("2.59.161.102");
|
||||||
expect(targets[0]?.hostname).toBe("s.rkns.top");
|
expect(targets[0]?.hostname).toBe("s.rkns.top");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("does not mark node unhealthy when binding majority is OK and group local fails", async () => {
|
||||||
|
const { createMemoryDb, repos, runMigrations } = await import("@cfdm/db");
|
||||||
|
const { db, sqlite } = createMemoryDb();
|
||||||
|
runMigrations(sqlite);
|
||||||
|
|
||||||
|
const tcp = await startTcpServer();
|
||||||
|
try {
|
||||||
|
const domain = repos.createDomain(db, null, "example.com", "zone-id");
|
||||||
|
const group = repos.createServiceGroup(
|
||||||
|
db,
|
||||||
|
"VPN",
|
||||||
|
"vpn",
|
||||||
|
null,
|
||||||
|
"vpn.example.com",
|
||||||
|
{
|
||||||
|
health_check_enabled: true,
|
||||||
|
health_check_type: "http",
|
||||||
|
health_check_port: 1,
|
||||||
|
health_check_timeout_ms: 200,
|
||||||
|
health_check_path: "/",
|
||||||
|
},
|
||||||
|
);
|
||||||
|
const service = repos.createService(db, "Svc", "svc");
|
||||||
|
repos.setServiceGroup(db, service.id, group.id);
|
||||||
|
repos.setServiceEnabled(db, service.id, true);
|
||||||
|
const binding = repos.insertBinding(db, domain.id, service.id, "@", null);
|
||||||
|
repos.updateBindingLbConfig(db, binding.id, {
|
||||||
|
health_check_enabled: true,
|
||||||
|
health_check_type: "tcp",
|
||||||
|
health_check_port: tcp.port,
|
||||||
|
health_check_timeout_ms: 500,
|
||||||
|
});
|
||||||
|
repos.replaceBindingIpsWithMeta(db, binding.id, [
|
||||||
|
{ ip: "127.0.0.1", weight: 1, priority: 1 },
|
||||||
|
]);
|
||||||
|
const node = repos.findNodeByIp(db, "127.0.0.1");
|
||||||
|
expect(node).not.toBeNull();
|
||||||
|
|
||||||
|
await healthCheckService.runAllChecks(db, {
|
||||||
|
probeGapMs: 0,
|
||||||
|
thresholds: {
|
||||||
|
degradedFailures: 1,
|
||||||
|
downFailures: 1,
|
||||||
|
latencyWarnMs: 1000,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const bindingHealth = repos.getIpHealthStatusRow(
|
||||||
|
db,
|
||||||
|
"binding",
|
||||||
|
binding.id,
|
||||||
|
"127.0.0.1",
|
||||||
|
);
|
||||||
|
const groupHealth = repos.getIpHealthStatusRow(
|
||||||
|
db,
|
||||||
|
"group",
|
||||||
|
group.id,
|
||||||
|
"127.0.0.1",
|
||||||
|
);
|
||||||
|
const after = repos.getNode(db, node!.id);
|
||||||
|
|
||||||
|
expect(bindingHealth?.status).toBe("up");
|
||||||
|
expect(groupHealth?.status).toBe("down");
|
||||||
|
expect(after.health_status).toBe("healthy");
|
||||||
|
expect(after.consecutive_failures).toBe(0);
|
||||||
|
expect(after.last_failure_reason).toBeNull();
|
||||||
|
} finally {
|
||||||
|
await new Promise<void>((resolve) => tcp.server.close(() => resolve()));
|
||||||
|
}
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("CNAME health mapped onto service IPs", () => {
|
describe("CNAME health mapped onto service IPs", () => {
|
||||||
|
|||||||
@@ -78,4 +78,53 @@ describe("service bindings prune", () => {
|
|||||||
expect(bindings).toHaveLength(2);
|
expect(bindings).toHaveLength(2);
|
||||||
expect(bindings.map((b) => b.hostname).sort()).toEqual(["api", "www"]);
|
expect(bindings.map((b) => b.hostname).sort()).toEqual(["api", "www"]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("updateConfig with extra FQDN per IP does not throw when group health-check is on", async () => {
|
||||||
|
const db = setupDb();
|
||||||
|
const cf = mockCf();
|
||||||
|
const health = {
|
||||||
|
health_check_enabled: true,
|
||||||
|
health_check_type: "tcp" as const,
|
||||||
|
health_check_port: 443,
|
||||||
|
health_check_providers: ["local", "cloudflare", "globalping"] as const,
|
||||||
|
health_check_aggregate: "majority" as const,
|
||||||
|
};
|
||||||
|
|
||||||
|
repos.createDomain(db, null, "example.com", "cf-zone-example");
|
||||||
|
const group = repos.createServiceGroup(
|
||||||
|
db,
|
||||||
|
"VPN",
|
||||||
|
"vpn",
|
||||||
|
null,
|
||||||
|
"vpn.example.com",
|
||||||
|
{ ...health },
|
||||||
|
);
|
||||||
|
const service = repos.createService(db, "GT", "gt");
|
||||||
|
repos.setServiceGroup(db, service.id, group.id);
|
||||||
|
repos.setServiceEnabled(db, service.id, true);
|
||||||
|
|
||||||
|
const view = await updateConfig(db, cf, service.id, {
|
||||||
|
ips: ["93.115.203.183", "130.49.213.153"],
|
||||||
|
domains: [
|
||||||
|
{
|
||||||
|
fqdn: "gt.example.com",
|
||||||
|
target_ips: ["93.115.203.183", "130.49.213.153"],
|
||||||
|
...health,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
fqdn: "rutg.example.com",
|
||||||
|
target_ips: ["93.115.203.183"],
|
||||||
|
...health,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
fqdn: "nsgt.example.com",
|
||||||
|
target_ips: ["130.49.213.153"],
|
||||||
|
...health,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(view.domains).toHaveLength(3);
|
||||||
|
expect(view.ips.sort()).toEqual(["130.49.213.153", "93.115.203.183"]);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
@@ -1,40 +1,116 @@
|
|||||||
|
import { ShieldCheckIcon } from 'lucide-react'
|
||||||
|
|
||||||
import {
|
import {
|
||||||
Timeline,
|
Timeline,
|
||||||
TimelineContent,
|
TimelineContent,
|
||||||
|
TimelineDate,
|
||||||
TimelineHeader,
|
TimelineHeader,
|
||||||
TimelineIndicator,
|
TimelineIndicator,
|
||||||
TimelineItem,
|
TimelineItem,
|
||||||
TimelineSeparator,
|
TimelineSeparator,
|
||||||
TimelineTitle,
|
TimelineTitle,
|
||||||
} from '@/components/reui/timeline'
|
} from '@/components/reui/timeline'
|
||||||
|
import { HealthCheckBadge } from '@/components/health-check-badge'
|
||||||
|
import { EmptyState } from '@/components/empty-state'
|
||||||
|
import { formatDate, formatRelative, sqliteUtcToIso } from '@/lib/format'
|
||||||
|
import type { FailoverEvent } from '@/lib/failover-events'
|
||||||
|
import { cn } from '@cfdm/ui/lib/utils'
|
||||||
|
import type { ComponentProps } from 'react'
|
||||||
|
|
||||||
export interface FailoverEvent {
|
type HealthBadgeStatus = ComponentProps<typeof HealthCheckBadge>['status']
|
||||||
id: string
|
|
||||||
title: string
|
function failStreakLabel(count: number): string {
|
||||||
detail: string
|
const mod10 = count % 10
|
||||||
|
const mod100 = count % 100
|
||||||
|
if (mod10 === 1 && mod100 !== 11) return `${count} ошибка подряд`
|
||||||
|
if (mod10 >= 2 && mod10 <= 4 && (mod100 < 12 || mod100 > 14)) {
|
||||||
|
return `${count} ошибки подряд`
|
||||||
|
}
|
||||||
|
return `${count} ошибок подряд`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function indicatorClass(status: string): string {
|
||||||
|
if (status === 'checking') {
|
||||||
|
return 'border-warning bg-warning/15 group-data-completed/timeline-item:border-warning'
|
||||||
|
}
|
||||||
|
return 'border-destructive bg-destructive/15 group-data-completed/timeline-item:border-destructive'
|
||||||
|
}
|
||||||
|
|
||||||
|
function separatorClass(status: string): string {
|
||||||
|
if (status === 'checking') return 'bg-warning/25'
|
||||||
|
return 'bg-destructive/25'
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Failover как sibling «Смены статуса»: ReUI Timeline + Badge, не степпер.
|
||||||
|
* 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/timeline
|
||||||
|
* Docs: https://reui.io/docs/components/base/badge
|
||||||
|
*/
|
||||||
export function FailoverTimeline({ events }: { events: FailoverEvent[] }) {
|
export function FailoverTimeline({ events }: { events: FailoverEvent[] }) {
|
||||||
if (events.length === 0) {
|
if (events.length === 0) {
|
||||||
return (
|
return (
|
||||||
<p className="text-muted-foreground text-sm">
|
<EmptyState
|
||||||
Событий failover пока нет.
|
icon={ShieldCheckIcon}
|
||||||
</p>
|
title="Пул в DNS на месте"
|
||||||
|
description="Standby и last-resort не красные — только down, снятые с A-записей"
|
||||||
|
stackedIcon={false}
|
||||||
|
centered={false}
|
||||||
|
/>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Timeline defaultValue={events.length} className="w-full">
|
<Timeline defaultValue={0} className="gap-0">
|
||||||
{events.map((event, index) => (
|
{events.map((event, index) => {
|
||||||
<TimelineItem key={event.id} step={index + 1}>
|
const checkedIso = event.lastCheckAt
|
||||||
<TimelineSeparator />
|
? (sqliteUtcToIso(event.lastCheckAt) ?? event.lastCheckAt)
|
||||||
<TimelineIndicator />
|
: null
|
||||||
<TimelineHeader>
|
const isChecking = event.status === 'checking'
|
||||||
<TimelineTitle>{event.title}</TimelineTitle>
|
|
||||||
</TimelineHeader>
|
return (
|
||||||
<TimelineContent>{event.detail}</TimelineContent>
|
<TimelineItem key={event.id} step={index + 1}>
|
||||||
</TimelineItem>
|
<TimelineSeparator className={separatorClass(event.status)} />
|
||||||
))}
|
<TimelineIndicator className={indicatorClass(event.status)} />
|
||||||
|
<TimelineHeader>
|
||||||
|
<TimelineTitle className="flex flex-wrap items-center gap-2">
|
||||||
|
<span className="font-mono text-sm">{event.address}</span>
|
||||||
|
<HealthCheckBadge
|
||||||
|
status={event.status as HealthBadgeStatus}
|
||||||
|
lastError={event.lastFailureReason}
|
||||||
|
lastCheckedAt={checkedIso}
|
||||||
|
size="xs"
|
||||||
|
/>
|
||||||
|
</TimelineTitle>
|
||||||
|
<TimelineDate>
|
||||||
|
{event.consecutiveFailures > 0
|
||||||
|
? failStreakLabel(event.consecutiveFailures)
|
||||||
|
: null}
|
||||||
|
{checkedIso
|
||||||
|
? `${event.consecutiveFailures > 0 ? ' · ' : ''}${formatRelative(checkedIso)} · ${formatDate(checkedIso)}`
|
||||||
|
: null}
|
||||||
|
</TimelineDate>
|
||||||
|
</TimelineHeader>
|
||||||
|
<TimelineContent className="flex flex-col gap-2">
|
||||||
|
<p className="text-foreground text-sm">
|
||||||
|
{isChecking
|
||||||
|
? 'Снята с DNS, идёт восстановление'
|
||||||
|
: 'Снята с DNS — в A-записях этого адреса нет'}
|
||||||
|
</p>
|
||||||
|
{event.lastFailureReason ? (
|
||||||
|
<code
|
||||||
|
className={cn(
|
||||||
|
'bg-muted block overflow-x-auto rounded-md px-2 py-1.5 font-mono text-xs',
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
{event.lastFailureReason}
|
||||||
|
</code>
|
||||||
|
) : null}
|
||||||
|
</TimelineContent>
|
||||||
|
</TimelineItem>
|
||||||
|
)
|
||||||
|
})}
|
||||||
</Timeline>
|
</Timeline>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
export { UptimeChart, type UptimeProbe, type UptimePeriodKey, probeUptimePercent, lastProbeLatency } from './uptime-chart'
|
export { UptimeChart, type UptimeProbe, type UptimePeriodKey, probeUptimePercent, lastProbeLatency } from './uptime-chart'
|
||||||
export { ServiceHealthMonitor } from './service-health-monitor'
|
export { ServiceHealthMonitor } from './service-health-monitor'
|
||||||
|
export { ServiceFailoverPanel } from './service-failover-panel'
|
||||||
export { applyFiltersToData, getActiveFilters, renderSingleSelectedLabel } from './filter-utils'
|
export { applyFiltersToData, getActiveFilters, renderSingleSelectedLabel } from './filter-utils'
|
||||||
export { CertStatusChart, GroupDomainsChart } from './dashboard-analytics'
|
export { CertStatusChart, GroupDomainsChart } from './dashboard-analytics'
|
||||||
export { ResourcePage, type ResourcePageProps, type ResourcePageTab } from './resource-page'
|
export { ResourcePage, type ResourcePageProps, type ResourcePageTab } from './resource-page'
|
||||||
@@ -28,3 +29,4 @@ export {
|
|||||||
type HealthProvider,
|
type HealthProvider,
|
||||||
type HealthAggregate,
|
type HealthAggregate,
|
||||||
} from './health-source-tiles'
|
} from './health-source-tiles'
|
||||||
|
export { ServiceAddressBlock } from './service-address-block'
|
||||||
@@ -0,0 +1,319 @@
|
|||||||
|
import { useState, type KeyboardEvent, type ReactNode } from 'react'
|
||||||
|
import { ServerIcon, Trash2Icon } from 'lucide-react'
|
||||||
|
|
||||||
|
import { EmptyState } from '@/components/empty-state'
|
||||||
|
import { isValidIpv4 } from '@/components/tagged-input'
|
||||||
|
import { Badge } from '@/components/reui/badge'
|
||||||
|
import {
|
||||||
|
Frame,
|
||||||
|
FrameDescription,
|
||||||
|
FrameHeader,
|
||||||
|
FramePanel,
|
||||||
|
FrameTitle,
|
||||||
|
} from '@/components/reui/frame'
|
||||||
|
import { IconTile } from '@/components/reui/icon-tile'
|
||||||
|
import { parseFqdn } from '@/lib/parse-fqdn'
|
||||||
|
import {
|
||||||
|
addAddressNode,
|
||||||
|
addCommonFqdn,
|
||||||
|
addressHasFqdn,
|
||||||
|
removeAddressNode,
|
||||||
|
removeCommonFqdn,
|
||||||
|
updateCommonFqdn,
|
||||||
|
type AddressBlockState,
|
||||||
|
} from '@/lib/service-address'
|
||||||
|
import { Button } from '@cfdm/ui/components/button'
|
||||||
|
import { Field, FieldLabel } from '@cfdm/ui/components/field'
|
||||||
|
import {
|
||||||
|
InputGroup,
|
||||||
|
InputGroupAddon,
|
||||||
|
InputGroupButton,
|
||||||
|
InputGroupInput,
|
||||||
|
} from '@cfdm/ui/components/input-group'
|
||||||
|
import {
|
||||||
|
Item,
|
||||||
|
ItemActions,
|
||||||
|
ItemContent,
|
||||||
|
ItemGroup,
|
||||||
|
ItemMedia,
|
||||||
|
ItemTitle,
|
||||||
|
} from '@cfdm/ui/components/item'
|
||||||
|
|
||||||
|
function ZoneAddon({
|
||||||
|
fqdn,
|
||||||
|
zoneHints,
|
||||||
|
trailing,
|
||||||
|
}: {
|
||||||
|
fqdn: string
|
||||||
|
zoneHints: string[]
|
||||||
|
trailing?: ReactNode
|
||||||
|
}) {
|
||||||
|
const parsed = parseFqdn(fqdn, zoneHints)
|
||||||
|
if (!parsed && !fqdn.trim() && !trailing) return null
|
||||||
|
return (
|
||||||
|
<InputGroupAddon align="inline-end">
|
||||||
|
{parsed ? (
|
||||||
|
<Badge variant="outline" size="xs" className="font-mono">
|
||||||
|
{parsed.zoneName}
|
||||||
|
</Badge>
|
||||||
|
) : fqdn.trim() ? (
|
||||||
|
<Badge variant="warning-light" size="xs">
|
||||||
|
зона не найдена
|
||||||
|
</Badge>
|
||||||
|
) : null}
|
||||||
|
{trailing}
|
||||||
|
</InputGroupAddon>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Единый блок адресов сервиса: список общих FQDN на весь пул + IP с доп. доменом.
|
||||||
|
* Preview: https://reui.io/preview/base/settings-3
|
||||||
|
* Preview: https://reui.io/preview/base/list-9
|
||||||
|
* Preview: https://reui.io/preview/base/form-7
|
||||||
|
* Docs: https://reui.io/docs/components/base/frame
|
||||||
|
* Docs: https://reui.io/docs/components/base/icon-tile
|
||||||
|
* Docs: https://reui.io/docs/components/base/badge
|
||||||
|
*/
|
||||||
|
export function ServiceAddressBlock({
|
||||||
|
value,
|
||||||
|
onChange,
|
||||||
|
zoneHints,
|
||||||
|
}: {
|
||||||
|
value: AddressBlockState
|
||||||
|
onChange: (next: AddressBlockState) => void
|
||||||
|
zoneHints: string[]
|
||||||
|
}) {
|
||||||
|
const [pendingIp, setPendingIp] = useState('')
|
||||||
|
const [ipInvalid, setIpInvalid] = useState(false)
|
||||||
|
const [pendingFqdn, setPendingFqdn] = useState('')
|
||||||
|
const [fqdnInvalid, setFqdnInvalid] = useState(false)
|
||||||
|
|
||||||
|
const pool = value.nodes.map((node) => node.ip)
|
||||||
|
const pendingIpTrimmed = pendingIp.trim()
|
||||||
|
const pendingFqdnTrimmed = pendingFqdn.trim()
|
||||||
|
const pendingIpInvalid =
|
||||||
|
ipInvalid && pendingIpTrimmed.length > 0 && !isValidIpv4(pendingIpTrimmed)
|
||||||
|
const pendingFqdnInvalid =
|
||||||
|
fqdnInvalid && pendingFqdnTrimmed.length > 0
|
||||||
|
|
||||||
|
function tryAddFqdn(raw: string) {
|
||||||
|
const trimmed = raw.trim()
|
||||||
|
if (!trimmed) {
|
||||||
|
setFqdnInvalid(false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (addressHasFqdn(value, trimmed)) {
|
||||||
|
setFqdnInvalid(true)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
onChange(addCommonFqdn(value, trimmed))
|
||||||
|
setPendingFqdn('')
|
||||||
|
setFqdnInvalid(false)
|
||||||
|
}
|
||||||
|
|
||||||
|
function tryAddIp(raw: string) {
|
||||||
|
const trimmed = raw.trim()
|
||||||
|
if (!trimmed) {
|
||||||
|
setIpInvalid(false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (!isValidIpv4(trimmed) || pool.includes(trimmed)) {
|
||||||
|
setIpInvalid(true)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
onChange(addAddressNode(value, trimmed))
|
||||||
|
setPendingIp('')
|
||||||
|
setIpInvalid(false)
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleFqdnKeyDown(event: KeyboardEvent<HTMLInputElement>) {
|
||||||
|
if (event.key === 'Enter') {
|
||||||
|
event.preventDefault()
|
||||||
|
tryAddFqdn(pendingFqdn)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleIpKeyDown(event: KeyboardEvent<HTMLInputElement>) {
|
||||||
|
if (event.key === 'Enter') {
|
||||||
|
event.preventDefault()
|
||||||
|
tryAddIp(pendingIp)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleNodeFqdn(ip: string, extraFqdn: string) {
|
||||||
|
onChange({
|
||||||
|
...value,
|
||||||
|
nodes: value.nodes.map((node) =>
|
||||||
|
node.ip === ip ? { ...node, extraFqdn } : node,
|
||||||
|
),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Frame stacked dense spacing="sm" className="w-full min-w-0">
|
||||||
|
<FramePanel fit className="flex flex-col gap-3">
|
||||||
|
<FrameHeader className="px-0 pt-0">
|
||||||
|
<FrameTitle>Адреса</FrameTitle>
|
||||||
|
<FrameDescription>
|
||||||
|
Общие FQDN — на весь пул · у IP свой доп. домен
|
||||||
|
</FrameDescription>
|
||||||
|
</FrameHeader>
|
||||||
|
<Field>
|
||||||
|
<FieldLabel htmlFor="service-common-fqdn-add">Общие домены (FQDN)</FieldLabel>
|
||||||
|
<div className="flex w-full flex-col gap-2">
|
||||||
|
{value.commonFqdns.map((fqdn, index) => (
|
||||||
|
<InputGroup key={`common-fqdn-${index}`}>
|
||||||
|
<InputGroupInput
|
||||||
|
id={`service-common-fqdn-${index}`}
|
||||||
|
className="font-mono"
|
||||||
|
value={fqdn}
|
||||||
|
placeholder={zoneHints[0] ? `gw.${zoneHints[0]}` : 'gw.ivx.su'}
|
||||||
|
onChange={(event) =>
|
||||||
|
onChange(updateCommonFqdn(value, index, event.target.value))
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
<ZoneAddon
|
||||||
|
fqdn={fqdn}
|
||||||
|
zoneHints={zoneHints}
|
||||||
|
trailing={
|
||||||
|
<InputGroupButton
|
||||||
|
size="icon-xs"
|
||||||
|
aria-label={`Удалить ${fqdn || 'FQDN'}`}
|
||||||
|
onClick={() => onChange(removeCommonFqdn(value, index))}
|
||||||
|
>
|
||||||
|
<Trash2Icon />
|
||||||
|
</InputGroupButton>
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</InputGroup>
|
||||||
|
))}
|
||||||
|
<InputGroup>
|
||||||
|
<InputGroupInput
|
||||||
|
id="service-common-fqdn-add"
|
||||||
|
className="font-mono"
|
||||||
|
value={pendingFqdn}
|
||||||
|
placeholder={zoneHints[0] ? `gw.${zoneHints[0]}` : 'gw.ivx.su'}
|
||||||
|
aria-invalid={pendingFqdnInvalid || undefined}
|
||||||
|
onChange={(event) => {
|
||||||
|
setPendingFqdn(event.target.value)
|
||||||
|
setFqdnInvalid(false)
|
||||||
|
}}
|
||||||
|
onKeyDown={handleFqdnKeyDown}
|
||||||
|
onBlur={() => tryAddFqdn(pendingFqdn)}
|
||||||
|
/>
|
||||||
|
<ZoneAddon
|
||||||
|
fqdn={pendingFqdn}
|
||||||
|
zoneHints={zoneHints}
|
||||||
|
trailing={
|
||||||
|
<InputGroupButton size="sm" onClick={() => tryAddFqdn(pendingFqdn)}>
|
||||||
|
Добавить
|
||||||
|
</InputGroupButton>
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</InputGroup>
|
||||||
|
</div>
|
||||||
|
</Field>
|
||||||
|
</FramePanel>
|
||||||
|
|
||||||
|
<FramePanel fit className="flex flex-col gap-3">
|
||||||
|
<FrameHeader className="px-0 pt-0">
|
||||||
|
<FrameTitle>IP-адреса</FrameTitle>
|
||||||
|
</FrameHeader>
|
||||||
|
{value.nodes.length === 0 ? (
|
||||||
|
<EmptyState
|
||||||
|
icon={ServerIcon}
|
||||||
|
title="Добавьте IP пула"
|
||||||
|
description="IPv4 сервиса. Для каждого адреса можно указать доп. FQDN."
|
||||||
|
stackedIcon={false}
|
||||||
|
centered={false}
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<ItemGroup className="gap-2">
|
||||||
|
{value.nodes.map((node) => {
|
||||||
|
return (
|
||||||
|
<Item
|
||||||
|
key={node.ip}
|
||||||
|
variant="outline"
|
||||||
|
size="sm"
|
||||||
|
className="items-stretch"
|
||||||
|
>
|
||||||
|
<ItemMedia>
|
||||||
|
<IconTile
|
||||||
|
variant="elevated"
|
||||||
|
size="xs"
|
||||||
|
className="text-info"
|
||||||
|
aria-hidden="true"
|
||||||
|
>
|
||||||
|
<ServerIcon />
|
||||||
|
</IconTile>
|
||||||
|
</ItemMedia>
|
||||||
|
<ItemContent className="flex min-w-0 flex-col gap-2">
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<ItemTitle className="font-mono">{node.ip}</ItemTitle>
|
||||||
|
<ItemActions className="ml-auto shrink-0">
|
||||||
|
<Button
|
||||||
|
type="button"
|
||||||
|
variant="ghost"
|
||||||
|
size="icon-sm"
|
||||||
|
aria-label={`Удалить ${node.ip}`}
|
||||||
|
onClick={() => onChange(removeAddressNode(value, node.ip))}
|
||||||
|
>
|
||||||
|
<Trash2Icon />
|
||||||
|
</Button>
|
||||||
|
</ItemActions>
|
||||||
|
</div>
|
||||||
|
<Field className="gap-1.5">
|
||||||
|
<FieldLabel
|
||||||
|
htmlFor={`service-ip-extra-${node.ip}`}
|
||||||
|
className="text-muted-foreground text-xs"
|
||||||
|
>
|
||||||
|
Доп. FQDN
|
||||||
|
</FieldLabel>
|
||||||
|
<InputGroup>
|
||||||
|
<InputGroupInput
|
||||||
|
id={`service-ip-extra-${node.ip}`}
|
||||||
|
className="font-mono"
|
||||||
|
value={node.extraFqdn}
|
||||||
|
placeholder={
|
||||||
|
zoneHints[0]
|
||||||
|
? `необязательно · spb.${zoneHints[0]}`
|
||||||
|
: 'необязательно · spb.example.com'
|
||||||
|
}
|
||||||
|
onChange={(event) =>
|
||||||
|
handleNodeFqdn(node.ip, event.target.value)
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
<ZoneAddon fqdn={node.extraFqdn} zoneHints={zoneHints} />
|
||||||
|
</InputGroup>
|
||||||
|
</Field>
|
||||||
|
</ItemContent>
|
||||||
|
</Item>
|
||||||
|
)
|
||||||
|
})}
|
||||||
|
</ItemGroup>
|
||||||
|
)}
|
||||||
|
<InputGroup>
|
||||||
|
<InputGroupInput
|
||||||
|
id="service-pool-ip-add"
|
||||||
|
className="font-mono"
|
||||||
|
value={pendingIp}
|
||||||
|
placeholder="192.168.1.1"
|
||||||
|
aria-invalid={pendingIpInvalid || undefined}
|
||||||
|
onChange={(event) => {
|
||||||
|
setPendingIp(event.target.value)
|
||||||
|
setIpInvalid(false)
|
||||||
|
}}
|
||||||
|
onKeyDown={handleIpKeyDown}
|
||||||
|
onBlur={() => tryAddIp(pendingIp)}
|
||||||
|
/>
|
||||||
|
<InputGroupAddon align="inline-end">
|
||||||
|
<InputGroupButton size="sm" onClick={() => tryAddIp(pendingIp)}>
|
||||||
|
Добавить
|
||||||
|
</InputGroupButton>
|
||||||
|
</InputGroupAddon>
|
||||||
|
</InputGroup>
|
||||||
|
</FramePanel>
|
||||||
|
</Frame>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,85 @@
|
|||||||
|
import { UnplugIcon } from 'lucide-react'
|
||||||
|
|
||||||
|
import { FailoverTimeline } from '@/components/failover-timeline'
|
||||||
|
import {
|
||||||
|
toFailoverEvents,
|
||||||
|
type FailoverHealthInput,
|
||||||
|
} from '@/lib/failover-events'
|
||||||
|
import { Badge } from '@/components/reui/badge'
|
||||||
|
import {
|
||||||
|
Frame,
|
||||||
|
FrameDescription,
|
||||||
|
FrameHeader,
|
||||||
|
FramePanel,
|
||||||
|
FrameTitle,
|
||||||
|
} from '@/components/reui/frame'
|
||||||
|
import {
|
||||||
|
Alert,
|
||||||
|
AlertDescription,
|
||||||
|
AlertTitle,
|
||||||
|
} from '@/components/reui/alert'
|
||||||
|
|
||||||
|
function failoverCountLabel(count: number): string {
|
||||||
|
const mod10 = count % 10
|
||||||
|
const mod100 = count % 100
|
||||||
|
if (mod10 === 1 && mod100 !== 11) return `${count} нода вне пула`
|
||||||
|
if (mod10 >= 2 && mod10 <= 4 && (mod100 < 12 || mod100 > 14)) {
|
||||||
|
return `${count} ноды вне пула`
|
||||||
|
}
|
||||||
|
return `${count} нод вне пула`
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Failover — sibling ServiceHealthMonitor: Frame stacked + Alert + Timeline.
|
||||||
|
* 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
|
||||||
|
* Docs: https://reui.io/docs/components/base/timeline
|
||||||
|
* Docs: https://reui.io/docs/components/base/badge
|
||||||
|
* Docs: https://reui.io/docs/components/base/alert
|
||||||
|
*/
|
||||||
|
export function ServiceFailoverPanel({
|
||||||
|
ipHealth,
|
||||||
|
activeAddresses,
|
||||||
|
}: {
|
||||||
|
ipHealth: readonly FailoverHealthInput[]
|
||||||
|
activeAddresses: readonly string[]
|
||||||
|
}) {
|
||||||
|
const events = toFailoverEvents(ipHealth, activeAddresses)
|
||||||
|
|
||||||
|
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
|
||||||
|
{events.length > 0 ? (
|
||||||
|
<Badge variant="destructive-light" size="xs" radius="full">
|
||||||
|
{events.length}
|
||||||
|
</Badge>
|
||||||
|
) : (
|
||||||
|
<Badge variant="success-light" size="xs" radius="full">
|
||||||
|
OK
|
||||||
|
</Badge>
|
||||||
|
)}
|
||||||
|
</FrameTitle>
|
||||||
|
<FrameDescription>
|
||||||
|
Только down из IP Health вне DNS-пула · как таблица активов
|
||||||
|
</FrameDescription>
|
||||||
|
</FrameHeader>
|
||||||
|
|
||||||
|
{events.length > 0 ? (
|
||||||
|
<Alert variant="destructive">
|
||||||
|
<UnplugIcon aria-hidden="true" />
|
||||||
|
<AlertTitle>{failoverCountLabel(events.length)}</AlertTitle>
|
||||||
|
<AlertDescription>
|
||||||
|
Эти IP сняты с A-записей
|
||||||
|
</AlertDescription>
|
||||||
|
</Alert>
|
||||||
|
) : null}
|
||||||
|
|
||||||
|
<FailoverTimeline events={events} />
|
||||||
|
</FramePanel>
|
||||||
|
</Frame>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
import { useId, useMemo, useState } from 'react'
|
import { useId, useMemo, useState } from 'react'
|
||||||
import { ActivityIcon, InfoIcon, TrendingDownIcon, TrendingUpIcon } from 'lucide-react'
|
import { ActivityIcon, InfoIcon, TrendingDownIcon, TrendingUpIcon } from 'lucide-react'
|
||||||
import { Area, ComposedChart, Line, XAxis } from 'recharts'
|
import { Area, ComposedChart, Line, XAxis, YAxis } from 'recharts'
|
||||||
|
|
||||||
import { EmptyState } from '@/components/empty-state'
|
import { EmptyState } from '@/components/empty-state'
|
||||||
import { Badge } from '@/components/reui/badge'
|
import { Badge } from '@/components/reui/badge'
|
||||||
@@ -226,14 +226,14 @@ export function UptimeChart({
|
|||||||
}: UptimeChartProps) {
|
}: UptimeChartProps) {
|
||||||
const gradientId = useId().replace(/:/g, '')
|
const gradientId = useId().replace(/:/g, '')
|
||||||
const [internalPeriod, setInternalPeriod] = useState<UptimePeriodKey>('5D')
|
const [internalPeriod, setInternalPeriod] = useState<UptimePeriodKey>('5D')
|
||||||
const [pinnedIndex, setPinnedIndex] = useState<number | undefined>()
|
const [hovered, setHovered] = useState<AlignedChartPoint | null>(null)
|
||||||
const period = periodProp ?? internalPeriod
|
const period = periodProp ?? internalPeriod
|
||||||
const days = UPTIME_PERIODS.find((entry) => entry.key === period)?.days ?? 5
|
const days = UPTIME_PERIODS.find((entry) => entry.key === period)?.days ?? 5
|
||||||
|
|
||||||
function handlePeriodChange(next: UptimePeriodKey) {
|
function handlePeriodChange(next: UptimePeriodKey) {
|
||||||
onPeriodChange?.(next)
|
onPeriodChange?.(next)
|
||||||
if (periodProp == null) setInternalPeriod(next)
|
if (periodProp == null) setInternalPeriod(next)
|
||||||
setPinnedIndex(undefined)
|
setHovered(null)
|
||||||
}
|
}
|
||||||
|
|
||||||
const { points, keys } = useMemo(
|
const { points, keys } = useMemo(
|
||||||
@@ -246,9 +246,25 @@ export function UptimeChart({
|
|||||||
const tileClass = lastOk ? 'text-success' : 'text-destructive'
|
const tileClass = lastOk ? 'text-success' : 'text-destructive'
|
||||||
const single = keys.length <= 1
|
const single = keys.length <= 1
|
||||||
const areaKey = keys[0] ?? 'local'
|
const areaKey = keys[0] ?? 'local'
|
||||||
|
const hoverPings = hovered
|
||||||
|
? keys.map((key) => {
|
||||||
|
const ok = hovered[`${key}Ok`]
|
||||||
|
const label = chartConfig[key].label
|
||||||
|
return `${label} ${formatPing(hovered[key], ok)}`
|
||||||
|
})
|
||||||
|
: []
|
||||||
|
|
||||||
|
function syncHover(state: {
|
||||||
|
activeTooltipIndex?: unknown
|
||||||
|
activeIndex?: unknown
|
||||||
|
}) {
|
||||||
|
const index = Number(state.activeTooltipIndex ?? state.activeIndex)
|
||||||
|
if (!Number.isFinite(index)) return
|
||||||
|
setHovered(points[index] ?? null)
|
||||||
|
}
|
||||||
|
|
||||||
const panel = (
|
const panel = (
|
||||||
<FramePanel className="flex flex-col gap-6">
|
<FramePanel className="flex flex-col gap-6 overflow-visible">
|
||||||
{hideHeader ? null : (
|
{hideHeader ? null : (
|
||||||
<div className="border-border flex items-center justify-between gap-2 border-b border-dashed pb-4">
|
<div className="border-border flex items-center justify-between gap-2 border-b border-dashed pb-4">
|
||||||
<div className="flex items-center gap-2.5">
|
<div className="flex items-center gap-2.5">
|
||||||
@@ -316,22 +332,33 @@ export function UptimeChart({
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{hoverPings.length > 0 ? (
|
||||||
|
<p className="text-muted-foreground min-h-4 min-w-0 text-xs tabular-nums">
|
||||||
|
<span className="text-foreground font-medium">Пинг</span>
|
||||||
|
{' · '}
|
||||||
|
{formatDate(hovered?.at)}
|
||||||
|
{' · '}
|
||||||
|
{hoverPings.join(' · ')}
|
||||||
|
</p>
|
||||||
|
) : (
|
||||||
|
<p className="text-muted-foreground min-h-4 text-xs">
|
||||||
|
Наведите на точку графика
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
|
||||||
<div className="h-40 w-full overflow-visible">
|
<div className="h-40 w-full overflow-visible">
|
||||||
<ChartContainer
|
<ChartContainer
|
||||||
config={chartConfig}
|
config={chartConfig}
|
||||||
className="h-full w-full overflow-visible rounded-b-xl"
|
className="[&_.recharts-tooltip-wrapper]:z-50 [&_.recharts-wrapper]:overflow-visible h-full w-full overflow-visible rounded-b-xl"
|
||||||
initialDimension={{ width: 320, height: 160 }}
|
initialDimension={{ width: 320, height: 160 }}
|
||||||
>
|
>
|
||||||
<ComposedChart
|
<ComposedChart
|
||||||
data={points}
|
data={points}
|
||||||
margin={{ top: 16, left: 8, right: 8, bottom: 4 }}
|
margin={{ top: 24, left: 8, right: 8, bottom: 8 }}
|
||||||
accessibilityLayer
|
accessibilityLayer
|
||||||
onClick={(state) => {
|
onMouseMove={syncHover}
|
||||||
const index = state.activeTooltipIndex ?? state.activeIndex
|
onMouseLeave={() => setHovered(null)}
|
||||||
if (index == null) return
|
onClick={syncHover}
|
||||||
const next = Number(index)
|
|
||||||
if (Number.isFinite(next)) setPinnedIndex(next)
|
|
||||||
}}
|
|
||||||
>
|
>
|
||||||
<defs>
|
<defs>
|
||||||
<linearGradient id={gradientId} x1="0" y1="0" x2="0" y2="1">
|
<linearGradient id={gradientId} x1="0" y1="0" x2="0" y2="1">
|
||||||
@@ -347,13 +374,14 @@ export function UptimeChart({
|
|||||||
/>
|
/>
|
||||||
</linearGradient>
|
</linearGradient>
|
||||||
</defs>
|
</defs>
|
||||||
<XAxis dataKey="period" hide />
|
<XAxis dataKey="at" hide />
|
||||||
|
<YAxis hide domain={['auto', 'auto']} />
|
||||||
<ChartTooltip
|
<ChartTooltip
|
||||||
key={pinnedIndex ?? 'hover'}
|
|
||||||
cursor={{ stroke: 'var(--border)', strokeDasharray: '4 4' }}
|
cursor={{ stroke: 'var(--border)', strokeDasharray: '4 4' }}
|
||||||
filterNull={false}
|
filterNull={false}
|
||||||
defaultIndex={pinnedIndex}
|
shared
|
||||||
active={pinnedIndex != null ? true : undefined}
|
isAnimationActive={false}
|
||||||
|
allowEscapeViewBox={{ x: true, y: true }}
|
||||||
wrapperStyle={{ zIndex: 50, pointerEvents: 'none' }}
|
wrapperStyle={{ zIndex: 50, pointerEvents: 'none' }}
|
||||||
content={
|
content={
|
||||||
<ChartTooltipContent
|
<ChartTooltipContent
|
||||||
@@ -393,6 +421,7 @@ export function UptimeChart({
|
|||||||
strokeWidth={2}
|
strokeWidth={2}
|
||||||
connectNulls={false}
|
connectNulls={false}
|
||||||
isAnimationActive={false}
|
isAnimationActive={false}
|
||||||
|
dot={{ r: 3, strokeWidth: 1, stroke: 'var(--background)' }}
|
||||||
activeDot={{
|
activeDot={{
|
||||||
r: 6,
|
r: 6,
|
||||||
stroke: 'var(--background)',
|
stroke: 'var(--background)',
|
||||||
|
|||||||
@@ -1,15 +1,10 @@
|
|||||||
import { useEffect, useMemo, useState } from 'react'
|
import { useEffect, useMemo, useState } from 'react'
|
||||||
import { PlusIcon, Trash2Icon } from 'lucide-react'
|
import { Trash2Icon } from 'lucide-react'
|
||||||
import { ConfirmDialog } from '@/components/confirm-dialog'
|
import { ConfirmDialog } from '@/components/confirm-dialog'
|
||||||
import { TaggedInput, isValidIpv4 } from '@/components/tagged-input'
|
import { ServiceAddressBlock } from '@/components/reui-kit/service-address-block'
|
||||||
import { ServiceBindingIpInput } from '@/components/service-binding-ip-input'
|
|
||||||
import {
|
import {
|
||||||
HealthCheckConfigFields,
|
HealthCheckConfigFields,
|
||||||
type LbAndHealthConfig,
|
type LbAndHealthConfig,
|
||||||
type LbMode,
|
|
||||||
type HealthCheckType,
|
|
||||||
type HealthProvider,
|
|
||||||
type HealthAggregate,
|
|
||||||
} from '@/components/health-check-config-fields'
|
} from '@/components/health-check-config-fields'
|
||||||
import type {
|
import type {
|
||||||
CreateServiceWithConfigInput,
|
CreateServiceWithConfigInput,
|
||||||
@@ -18,9 +13,16 @@ import type {
|
|||||||
ServiceView,
|
ServiceView,
|
||||||
UpdateServiceConfigInput,
|
UpdateServiceConfigInput,
|
||||||
} from '@/lib/schemas'
|
} from '@/lib/schemas'
|
||||||
import { parseHealthProviders } from '@cfdm/shared'
|
import {
|
||||||
import { bindingToFqdn, parseFqdn } from '@/lib/parse-fqdn'
|
DEFAULT_BINDING_HEALTH,
|
||||||
import { Badge } from '@/components/reui/badge'
|
emptyAddressBlock,
|
||||||
|
hydrateAddressBlock,
|
||||||
|
toBindingDrafts,
|
||||||
|
toDomainsPayload,
|
||||||
|
type AddressBlockState,
|
||||||
|
type BindingHealthConfig,
|
||||||
|
type ServiceBindingDraft,
|
||||||
|
} from '@/lib/service-address'
|
||||||
import { toast } from 'sonner'
|
import { toast } from 'sonner'
|
||||||
import {
|
import {
|
||||||
Sheet,
|
Sheet,
|
||||||
@@ -30,14 +32,8 @@ import {
|
|||||||
SheetHeader,
|
SheetHeader,
|
||||||
SheetTitle,
|
SheetTitle,
|
||||||
} from '@cfdm/ui/components/sheet'
|
} from '@cfdm/ui/components/sheet'
|
||||||
import { Button } from '@cfdm/ui/components/button'
|
|
||||||
import { Field, FieldGroup, FieldLabel } from '@cfdm/ui/components/field'
|
import { Field, FieldGroup, FieldLabel } from '@cfdm/ui/components/field'
|
||||||
import { Input } from '@cfdm/ui/components/input'
|
import { Input } from '@cfdm/ui/components/input'
|
||||||
import {
|
|
||||||
Item,
|
|
||||||
ItemContent,
|
|
||||||
ItemGroup,
|
|
||||||
} from '@cfdm/ui/components/item'
|
|
||||||
import { LoadingButton } from '@/components/loading-button'
|
import { LoadingButton } from '@/components/loading-button'
|
||||||
import {
|
import {
|
||||||
Select,
|
Select,
|
||||||
@@ -47,44 +43,7 @@ import {
|
|||||||
SelectValue,
|
SelectValue,
|
||||||
} from '@cfdm/ui/components/select'
|
} from '@cfdm/ui/components/select'
|
||||||
|
|
||||||
interface BindingHealthConfig {
|
export type { ServiceBindingDraft }
|
||||||
enabled: boolean
|
|
||||||
type: HealthCheckType
|
|
||||||
port: number | null
|
|
||||||
path: string | null
|
|
||||||
expected_status: number | null
|
|
||||||
interval_sec: number
|
|
||||||
timeout_ms: number
|
|
||||||
verify_tls: boolean
|
|
||||||
provider: HealthProvider
|
|
||||||
providers: HealthProvider[]
|
|
||||||
aggregate: HealthAggregate
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface ServiceBindingDraft {
|
|
||||||
fqdn: string
|
|
||||||
record_type: 'A' | 'CNAME'
|
|
||||||
target_ips: string[]
|
|
||||||
target_cname: string
|
|
||||||
lb_mode: LbMode
|
|
||||||
health: BindingHealthConfig
|
|
||||||
target_ip_weights: Record<string, number>
|
|
||||||
target_ip_priorities: Record<string, number>
|
|
||||||
}
|
|
||||||
|
|
||||||
const defaultHealth: BindingHealthConfig = {
|
|
||||||
enabled: false,
|
|
||||||
type: 'tcp',
|
|
||||||
port: null,
|
|
||||||
path: null,
|
|
||||||
expected_status: null,
|
|
||||||
interval_sec: 30,
|
|
||||||
timeout_ms: 3000,
|
|
||||||
verify_tls: false,
|
|
||||||
provider: 'local',
|
|
||||||
providers: ['local'],
|
|
||||||
aggregate: 'majority',
|
|
||||||
}
|
|
||||||
|
|
||||||
interface ServiceEditSheetProps {
|
interface ServiceEditSheetProps {
|
||||||
mode: 'create' | 'edit'
|
mode: 'create' | 'edit'
|
||||||
@@ -101,104 +60,19 @@ interface ServiceEditSheetProps {
|
|||||||
onDelete?: (id: number) => void
|
onDelete?: (id: number) => void
|
||||||
}
|
}
|
||||||
|
|
||||||
function toBindingDrafts(service: ServiceView): ServiceBindingDraft[] {
|
function healthFromConfig(next: LbAndHealthConfig): BindingHealthConfig {
|
||||||
return (service.domains ?? []).map((binding) => ({
|
|
||||||
fqdn: bindingToFqdn(binding),
|
|
||||||
record_type: binding.record_type ?? (binding.target_cname ? 'CNAME' : 'A'),
|
|
||||||
target_ips: binding.target_ips ?? [],
|
|
||||||
target_cname: binding.target_cname ?? '',
|
|
||||||
lb_mode: binding.lb_mode,
|
|
||||||
health: {
|
|
||||||
enabled: Boolean(binding.health_check_enabled),
|
|
||||||
type: binding.health_check_type === 'http' ? 'http' : 'tcp',
|
|
||||||
port: binding.health_check_port,
|
|
||||||
path: binding.health_check_path,
|
|
||||||
expected_status: binding.health_check_expected_status,
|
|
||||||
interval_sec: binding.health_check_interval_sec,
|
|
||||||
timeout_ms: binding.health_check_timeout_ms,
|
|
||||||
verify_tls: Boolean(binding.health_check_verify_tls),
|
|
||||||
provider: binding.health_check_provider ?? 'local',
|
|
||||||
providers: parseHealthProviders(
|
|
||||||
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 ?? {},
|
|
||||||
}))
|
|
||||||
}
|
|
||||||
|
|
||||||
function buildDomainsPayload(bindings: ServiceBindingDraft[]) {
|
|
||||||
return bindings
|
|
||||||
.filter((binding) => {
|
|
||||||
if (!binding.fqdn.trim()) return false
|
|
||||||
if (binding.record_type === 'CNAME') return Boolean(binding.target_cname.trim())
|
|
||||||
return binding.target_ips.length > 0
|
|
||||||
})
|
|
||||||
.map((binding) =>
|
|
||||||
binding.record_type === 'CNAME'
|
|
||||||
? {
|
|
||||||
fqdn: binding.fqdn.trim(),
|
|
||||||
target_cname: binding.target_cname.trim(),
|
|
||||||
lb_mode: binding.lb_mode,
|
|
||||||
health_check_enabled: binding.health.enabled,
|
|
||||||
health_check_type: binding.health.type,
|
|
||||||
health_check_port: binding.health.port,
|
|
||||||
health_check_path: binding.health.path,
|
|
||||||
health_check_expected_status: binding.health.expected_status,
|
|
||||||
health_check_interval_sec: binding.health.interval_sec,
|
|
||||||
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(),
|
|
||||||
target_ips: binding.target_ips,
|
|
||||||
target_ip_weights: binding.target_ip_weights,
|
|
||||||
target_ip_priorities: binding.target_ip_priorities,
|
|
||||||
lb_mode: binding.lb_mode,
|
|
||||||
health_check_enabled: binding.health.enabled,
|
|
||||||
health_check_type: binding.health.type,
|
|
||||||
health_check_port: binding.health.port,
|
|
||||||
health_check_path: binding.health.path,
|
|
||||||
health_check_expected_status: binding.health.expected_status,
|
|
||||||
health_check_interval_sec: binding.health.interval_sec,
|
|
||||||
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,
|
|
||||||
},
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
function emptyBindingDraft(fqdn = ''): ServiceBindingDraft {
|
|
||||||
return {
|
return {
|
||||||
fqdn,
|
enabled: next.enabled,
|
||||||
record_type: 'A',
|
type: next.type,
|
||||||
target_ips: [],
|
port: next.port,
|
||||||
target_cname: '',
|
path: next.path,
|
||||||
lb_mode: 'round_robin',
|
expected_status: next.expected_status,
|
||||||
health: { ...defaultHealth },
|
interval_sec: next.interval_sec,
|
||||||
target_ip_weights: {},
|
timeout_ms: next.timeout_ms,
|
||||||
target_ip_priorities: {},
|
verify_tls: next.verify_tls,
|
||||||
}
|
provider: next.provider,
|
||||||
}
|
providers: next.providers,
|
||||||
|
aggregate: next.aggregate,
|
||||||
function withPoolIps(draft: ServiceBindingDraft, pool: string[]): ServiceBindingDraft {
|
|
||||||
if (draft.record_type !== 'A' || draft.target_ips.length > 0 || pool.length === 0) {
|
|
||||||
return draft
|
|
||||||
}
|
|
||||||
return {
|
|
||||||
...draft,
|
|
||||||
target_ips: pool,
|
|
||||||
target_ip_weights: Object.fromEntries(pool.map((ip) => [ip, draft.target_ip_weights[ip] ?? 1])),
|
|
||||||
target_ip_priorities: Object.fromEntries(
|
|
||||||
pool.map((ip) => [ip, draft.target_ip_priorities[ip] ?? 1]),
|
|
||||||
),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -219,9 +93,11 @@ export function ServiceEditSheet({
|
|||||||
const [name, setName] = useState('')
|
const [name, setName] = useState('')
|
||||||
const [slug, setSlug] = useState('')
|
const [slug, setSlug] = useState('')
|
||||||
const [serviceGroupId, setServiceGroupId] = useState('none')
|
const [serviceGroupId, setServiceGroupId] = useState('none')
|
||||||
const [ips, setIps] = useState<string[]>([])
|
const [address, setAddress] = useState<AddressBlockState>(() => emptyAddressBlock())
|
||||||
const [commonFqdn, setCommonFqdn] = useState('')
|
const [health, setHealth] = useState<BindingHealthConfig>(() => ({
|
||||||
const [bindings, setBindings] = useState<ServiceBindingDraft[]>([])
|
...DEFAULT_BINDING_HEALTH,
|
||||||
|
}))
|
||||||
|
const [lbMode, setLbMode] = useState<LbAndHealthConfig['lb_mode']>('round_robin')
|
||||||
const [lbWeight, setLbWeight] = useState(1)
|
const [lbWeight, setLbWeight] = useState(1)
|
||||||
const [lbPriority, setLbPriority] = useState(1)
|
const [lbPriority, setLbPriority] = useState(1)
|
||||||
|
|
||||||
@@ -243,10 +119,10 @@ export function ServiceEditSheet({
|
|||||||
setServiceGroupId(
|
setServiceGroupId(
|
||||||
service.service_group_id != null ? String(service.service_group_id) : 'none',
|
service.service_group_id != null ? String(service.service_group_id) : 'none',
|
||||||
)
|
)
|
||||||
setIps(service.ips ?? [])
|
|
||||||
const drafts = toBindingDrafts(service)
|
const drafts = toBindingDrafts(service)
|
||||||
setBindings(drafts)
|
setAddress(hydrateAddressBlock(drafts, service.ips ?? []))
|
||||||
setCommonFqdn(drafts[0]?.fqdn ?? '')
|
setHealth(drafts[0]?.health ?? { ...DEFAULT_BINDING_HEALTH })
|
||||||
|
setLbMode(drafts[0]?.lb_mode ?? service.lb_mode ?? 'round_robin')
|
||||||
setLbWeight(service.lb_weight ?? 1)
|
setLbWeight(service.lb_weight ?? 1)
|
||||||
setLbPriority(service.lb_priority ?? 1)
|
setLbPriority(service.lb_priority ?? 1)
|
||||||
return
|
return
|
||||||
@@ -257,9 +133,9 @@ export function ServiceEditSheet({
|
|||||||
setServiceGroupId(
|
setServiceGroupId(
|
||||||
defaultGroupId != null ? String(defaultGroupId) : 'none',
|
defaultGroupId != null ? String(defaultGroupId) : 'none',
|
||||||
)
|
)
|
||||||
setIps([])
|
setAddress(emptyAddressBlock())
|
||||||
setCommonFqdn('')
|
setHealth({ ...DEFAULT_BINDING_HEALTH })
|
||||||
setBindings([])
|
setLbMode('round_robin')
|
||||||
setLbWeight(1)
|
setLbWeight(1)
|
||||||
setLbPriority(1)
|
setLbPriority(1)
|
||||||
}
|
}
|
||||||
@@ -270,136 +146,27 @@ export function ServiceEditSheet({
|
|||||||
[knownDomains],
|
[knownDomains],
|
||||||
)
|
)
|
||||||
|
|
||||||
const extraBindings = bindings.slice(1)
|
|
||||||
|
|
||||||
function handleCommonFqdnChange(value: string) {
|
|
||||||
setCommonFqdn(value)
|
|
||||||
setBindings((current) => {
|
|
||||||
if (current.length === 0) return current
|
|
||||||
return current.map((item, i) => (i === 0 ? { ...item, fqdn: value } : item))
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function handleAddExtraBinding() {
|
|
||||||
setBindings((current) => {
|
|
||||||
const extra = withPoolIps(emptyBindingDraft(), ips)
|
|
||||||
if (current.length === 0) {
|
|
||||||
return [emptyBindingDraft(commonFqdn), extra]
|
|
||||||
}
|
|
||||||
return [...current, extra]
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function handleRemoveExtraBinding(extraIndex: number) {
|
|
||||||
const index = extraIndex + 1
|
|
||||||
setBindings((current) => current.filter((_, i) => i !== index))
|
|
||||||
}
|
|
||||||
|
|
||||||
function handleFqdnChange(index: number, fqdn: string) {
|
|
||||||
setBindings((current) =>
|
|
||||||
current.map((item, i) => (i === index ? { ...item, fqdn } : item)),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
function handleRecordTypeChange(index: number, recordType: 'A' | 'CNAME') {
|
|
||||||
setBindings((current) =>
|
|
||||||
current.map((item, i) =>
|
|
||||||
i === index
|
|
||||||
? {
|
|
||||||
...item,
|
|
||||||
record_type: recordType,
|
|
||||||
target_ips: recordType === 'A' ? item.target_ips : [],
|
|
||||||
target_cname: recordType === 'CNAME' ? item.target_cname : '',
|
|
||||||
}
|
|
||||||
: item,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
function handleCnameChange(index: number, value: string) {
|
|
||||||
setBindings((current) =>
|
|
||||||
current.map((item, i) => (i === index ? { ...item, target_cname: value } : item)),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
function handleIpsChange(index: number, targetIps: string[]) {
|
|
||||||
setBindings((current) =>
|
|
||||||
current.map((item, i) =>
|
|
||||||
i === index
|
|
||||||
? {
|
|
||||||
...item,
|
|
||||||
target_ips: targetIps,
|
|
||||||
target_ip_weights: Object.fromEntries(
|
|
||||||
targetIps.map((ip) => [ip, item.target_ip_weights[ip] ?? 1]),
|
|
||||||
),
|
|
||||||
target_ip_priorities: Object.fromEntries(
|
|
||||||
targetIps.map((ip) => [ip, item.target_ip_priorities[ip] ?? 1]),
|
|
||||||
),
|
|
||||||
}
|
|
||||||
: item,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
function healthFromConfig(next: LbAndHealthConfig): BindingHealthConfig {
|
|
||||||
return {
|
|
||||||
enabled: next.enabled,
|
|
||||||
type: next.type,
|
|
||||||
port: next.port,
|
|
||||||
path: next.path,
|
|
||||||
expected_status: next.expected_status,
|
|
||||||
interval_sec: next.interval_sec,
|
|
||||||
timeout_ms: next.timeout_ms,
|
|
||||||
verify_tls: next.verify_tls,
|
|
||||||
provider: next.provider,
|
|
||||||
providers: next.providers,
|
|
||||||
aggregate: next.aggregate,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function handlePrimaryHealthChange(next: LbAndHealthConfig) {
|
function handlePrimaryHealthChange(next: LbAndHealthConfig) {
|
||||||
const health = healthFromConfig(next)
|
setLbMode(next.lb_mode)
|
||||||
setBindings((current) => {
|
setHealth(healthFromConfig(next))
|
||||||
if (current.length === 0) {
|
|
||||||
return [
|
|
||||||
{
|
|
||||||
...withPoolIps(emptyBindingDraft(commonFqdn), ips),
|
|
||||||
lb_mode: next.lb_mode,
|
|
||||||
health,
|
|
||||||
},
|
|
||||||
]
|
|
||||||
}
|
|
||||||
return current.map((item, index) =>
|
|
||||||
index === 0 ? { ...item, lb_mode: next.lb_mode, health } : item,
|
|
||||||
)
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const primaryHealthValue: LbAndHealthConfig = {
|
const primaryHealthValue: LbAndHealthConfig = {
|
||||||
lb_mode: bindings[0]?.lb_mode ?? 'round_robin',
|
lb_mode: lbMode,
|
||||||
...(bindings[0]?.health ?? defaultHealth),
|
...health,
|
||||||
}
|
}
|
||||||
|
|
||||||
function resolveServiceGroupId(): number | null {
|
function resolveServiceGroupId(): number | null {
|
||||||
return serviceGroupId === 'none' ? null : Number(serviceGroupId)
|
return serviceGroupId === 'none' ? null : Number(serviceGroupId)
|
||||||
}
|
}
|
||||||
|
|
||||||
function syncCommonDomain(current: ServiceBindingDraft[]): ServiceBindingDraft[] {
|
|
||||||
const trimmed = commonFqdn.trim()
|
|
||||||
if (!trimmed) return current
|
|
||||||
if (current.length === 0) {
|
|
||||||
return [withPoolIps(emptyBindingDraft(trimmed), ips)]
|
|
||||||
}
|
|
||||||
return current.map((item, index) => {
|
|
||||||
if (index !== 0) return item
|
|
||||||
return withPoolIps({ ...item, fqdn: trimmed }, ips)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function handleSubmit() {
|
function handleSubmit() {
|
||||||
const syncedBindings = syncCommonDomain(bindings)
|
const ips = address.nodes.map((node) => node.ip)
|
||||||
const domains = buildDomainsPayload(syncedBindings)
|
const domains = toDomainsPayload(address, {
|
||||||
const normalizedFqdns = domains.map((d) => d.fqdn.trim().toLowerCase())
|
lb_mode: lbMode,
|
||||||
|
health,
|
||||||
|
})
|
||||||
|
const normalizedFqdns = domains.map((item) => item.fqdn.trim().toLowerCase())
|
||||||
const hasDuplicateFqdn =
|
const hasDuplicateFqdn =
|
||||||
new Set(normalizedFqdns).size !== normalizedFqdns.length
|
new Set(normalizedFqdns).size !== normalizedFqdns.length
|
||||||
if (hasDuplicateFqdn) {
|
if (hasDuplicateFqdn) {
|
||||||
@@ -443,6 +210,7 @@ export function ServiceEditSheet({
|
|||||||
const canSubmit = isCreate
|
const canSubmit = isCreate
|
||||||
? name.trim().length > 0 && slug.trim().length > 0
|
? name.trim().length > 0 && slug.trim().length > 0
|
||||||
: Boolean(service)
|
: Boolean(service)
|
||||||
|
const addressResetKey = `${mode}-${service?.id ?? 'new'}-${open ? 'open' : 'closed'}`
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Sheet open={open} onOpenChange={onOpenChange}>
|
<Sheet open={open} onOpenChange={onOpenChange}>
|
||||||
@@ -450,8 +218,8 @@ export function ServiceEditSheet({
|
|||||||
<SheetHeader className="shrink-0 border-b pb-4">
|
<SheetHeader className="shrink-0 border-b pb-4">
|
||||||
<SheetTitle>{isCreate ? 'Новый сервис' : 'Редактирование сервиса'}</SheetTitle>
|
<SheetTitle>{isCreate ? 'Новый сервис' : 'Редактирование сервиса'}</SheetTitle>
|
||||||
<SheetDescription>
|
<SheetDescription>
|
||||||
Общий домен и IP задаются у сервиса. Дополнительные FQDN — ниже, зона
|
Общие FQDN на весь пул IP. У каждого адреса можно указать свой доп.
|
||||||
определяется автоматически.
|
FQDN.
|
||||||
</SheetDescription>
|
</SheetDescription>
|
||||||
</SheetHeader>
|
</SheetHeader>
|
||||||
|
|
||||||
@@ -498,33 +266,16 @@ export function ServiceEditSheet({
|
|||||||
</SelectContent>
|
</SelectContent>
|
||||||
</Select>
|
</Select>
|
||||||
</Field>
|
</Field>
|
||||||
<Field>
|
|
||||||
<FieldLabel htmlFor="edit-service-common-domain">
|
|
||||||
Общий домен (FQDN)
|
|
||||||
</FieldLabel>
|
|
||||||
<Input
|
|
||||||
id="edit-service-common-domain"
|
|
||||||
className="font-mono"
|
|
||||||
value={commonFqdn}
|
|
||||||
placeholder={
|
|
||||||
zoneHints[0] ? `gw.${zoneHints[0]}` : 'gw.ivx.su'
|
|
||||||
}
|
|
||||||
onChange={(e) => handleCommonFqdnChange(e.target.value)}
|
|
||||||
/>
|
|
||||||
</Field>
|
|
||||||
<Field>
|
|
||||||
<FieldLabel htmlFor="edit-service-ips">IP-адреса сервиса</FieldLabel>
|
|
||||||
<TaggedInput
|
|
||||||
id="edit-service-ips"
|
|
||||||
value={ips}
|
|
||||||
onChange={setIps}
|
|
||||||
placeholder="192.168.1.1"
|
|
||||||
validate={isValidIpv4}
|
|
||||||
/>
|
|
||||||
</Field>
|
|
||||||
</FieldGroup>
|
</FieldGroup>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
<ServiceAddressBlock
|
||||||
|
key={addressResetKey}
|
||||||
|
value={address}
|
||||||
|
onChange={setAddress}
|
||||||
|
zoneHints={zoneHints}
|
||||||
|
/>
|
||||||
|
|
||||||
<section className="flex flex-col gap-3">
|
<section className="flex flex-col gap-3">
|
||||||
<h3 className="text-sm font-medium">Health check</h3>
|
<h3 className="text-sm font-medium">Health check</h3>
|
||||||
<HealthCheckConfigFields
|
<HealthCheckConfigFields
|
||||||
@@ -533,127 +284,6 @@ export function ServiceEditSheet({
|
|||||||
onChange={handlePrimaryHealthChange}
|
onChange={handlePrimaryHealthChange}
|
||||||
/>
|
/>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section className="flex flex-col gap-3">
|
|
||||||
<div className="flex items-center justify-between gap-2">
|
|
||||||
<h3 className="text-sm font-medium">Доп. FQDN</h3>
|
|
||||||
<Button
|
|
||||||
type="button"
|
|
||||||
variant="outline"
|
|
||||||
size="sm"
|
|
||||||
onClick={handleAddExtraBinding}
|
|
||||||
>
|
|
||||||
<PlusIcon data-icon="inline-start" />
|
|
||||||
Добавить
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
{extraBindings.length === 0 ? (
|
|
||||||
<p className="text-muted-foreground text-sm">
|
|
||||||
Нет дополнительных FQDN
|
|
||||||
</p>
|
|
||||||
) : (
|
|
||||||
<ItemGroup className="gap-2">
|
|
||||||
{extraBindings.map((binding, extraIndex) => {
|
|
||||||
const index = extraIndex + 1
|
|
||||||
const parsedZone = parseFqdn(binding.fqdn, zoneHints)
|
|
||||||
return (
|
|
||||||
<Item
|
|
||||||
key={`extra-binding-${index}`}
|
|
||||||
variant="outline"
|
|
||||||
size="sm"
|
|
||||||
className="items-stretch"
|
|
||||||
>
|
|
||||||
<ItemContent className="flex w-full min-w-0 flex-col gap-2">
|
|
||||||
<div className="flex items-center gap-2">
|
|
||||||
{parsedZone ? (
|
|
||||||
<Badge variant="outline" size="xs" className="font-mono">
|
|
||||||
{parsedZone.zoneName}
|
|
||||||
</Badge>
|
|
||||||
) : binding.fqdn.trim() ? (
|
|
||||||
<Badge variant="warning-light" size="xs">
|
|
||||||
зона не найдена
|
|
||||||
</Badge>
|
|
||||||
) : (
|
|
||||||
<span className="text-muted-foreground text-xs">
|
|
||||||
FQDN
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
<Button
|
|
||||||
type="button"
|
|
||||||
variant="ghost"
|
|
||||||
size="icon-sm"
|
|
||||||
className="ml-auto shrink-0"
|
|
||||||
aria-label="Удалить FQDN"
|
|
||||||
onClick={() => handleRemoveExtraBinding(extraIndex)}
|
|
||||||
>
|
|
||||||
<Trash2Icon />
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
<div className="grid grid-cols-1 gap-2 sm:grid-cols-[minmax(0,1fr)_7.5rem]">
|
|
||||||
<Input
|
|
||||||
id={`extra-fqdn-${index}`}
|
|
||||||
className="font-mono"
|
|
||||||
value={binding.fqdn}
|
|
||||||
onChange={(event) =>
|
|
||||||
handleFqdnChange(index, event.target.value)
|
|
||||||
}
|
|
||||||
placeholder={
|
|
||||||
zoneHints[0]
|
|
||||||
? `api.${zoneHints[0]}`
|
|
||||||
: 'api.ivx.su'
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
<Select
|
|
||||||
items={[
|
|
||||||
{ label: 'A (IP)', value: 'A' },
|
|
||||||
{ label: 'CNAME', value: 'CNAME' },
|
|
||||||
]}
|
|
||||||
value={binding.record_type}
|
|
||||||
onValueChange={(value) =>
|
|
||||||
handleRecordTypeChange(
|
|
||||||
index,
|
|
||||||
(value ?? 'A') as 'A' | 'CNAME',
|
|
||||||
)
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<SelectTrigger
|
|
||||||
id={`extra-type-${index}`}
|
|
||||||
className="w-full"
|
|
||||||
>
|
|
||||||
<SelectValue />
|
|
||||||
</SelectTrigger>
|
|
||||||
<SelectContent>
|
|
||||||
<SelectItem value="A">A (IP)</SelectItem>
|
|
||||||
<SelectItem value="CNAME">CNAME</SelectItem>
|
|
||||||
</SelectContent>
|
|
||||||
</Select>
|
|
||||||
</div>
|
|
||||||
{binding.record_type === 'CNAME' ? (
|
|
||||||
<Input
|
|
||||||
id={`extra-cname-${index}`}
|
|
||||||
value={binding.target_cname}
|
|
||||||
placeholder="mmsk.rkns.top"
|
|
||||||
onChange={(event) =>
|
|
||||||
handleCnameChange(index, event.target.value)
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
) : (
|
|
||||||
<ServiceBindingIpInput
|
|
||||||
id={`extra-ip-${index}`}
|
|
||||||
value={binding.target_ips}
|
|
||||||
pool={ips}
|
|
||||||
onChange={(targetIps) =>
|
|
||||||
handleIpsChange(index, targetIps)
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</ItemContent>
|
|
||||||
</Item>
|
|
||||||
)
|
|
||||||
})}
|
|
||||||
</ItemGroup>
|
|
||||||
)}
|
|
||||||
</section>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<SheetFooter className="shrink-0 flex flex-row flex-wrap gap-2 border-t pt-4">
|
<SheetFooter className="shrink-0 flex flex-row flex-wrap gap-2 border-t pt-4">
|
||||||
|
|||||||
@@ -0,0 +1,105 @@
|
|||||||
|
import { describe, expect, it } from 'vitest'
|
||||||
|
|
||||||
|
import {
|
||||||
|
isFailoverEventStatus,
|
||||||
|
toFailoverEvents,
|
||||||
|
type FailoverHealthInput,
|
||||||
|
} from '@/lib/failover-events'
|
||||||
|
|
||||||
|
function row(
|
||||||
|
overrides: Partial<FailoverHealthInput> & Pick<FailoverHealthInput, 'ip'>,
|
||||||
|
): FailoverHealthInput {
|
||||||
|
return {
|
||||||
|
status: 'up',
|
||||||
|
consecutive_failures: 0,
|
||||||
|
last_error: null,
|
||||||
|
last_checked_at: null,
|
||||||
|
...overrides,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('toFailoverEvents', () => {
|
||||||
|
it('инцидент только при binding down, не при unhealthy ноды', () => {
|
||||||
|
expect(isFailoverEventStatus('down')).toBe(true)
|
||||||
|
expect(isFailoverEventStatus('up')).toBe(false)
|
||||||
|
expect(isFailoverEventStatus('degraded')).toBe(false)
|
||||||
|
expect(isFailoverEventStatus('unknown')).toBe(false)
|
||||||
|
expect(isFailoverEventStatus('unhealthy')).toBe(false)
|
||||||
|
})
|
||||||
|
|
||||||
|
it('без DNS-пула ничего не показывает — нельзя врать про вывод', () => {
|
||||||
|
const events = toFailoverEvents([
|
||||||
|
row({
|
||||||
|
ip: '130.49.213.153',
|
||||||
|
status: 'down',
|
||||||
|
consecutive_failures: 9,
|
||||||
|
last_error: 'fetch failed',
|
||||||
|
}),
|
||||||
|
])
|
||||||
|
expect(events).toEqual([])
|
||||||
|
})
|
||||||
|
|
||||||
|
it('OK вне пула не инцидент (standby)', () => {
|
||||||
|
const events = toFailoverEvents(
|
||||||
|
[
|
||||||
|
row({ ip: '10.0.0.1', status: 'up' }),
|
||||||
|
row({ ip: '130.49.213.153', status: 'up' }),
|
||||||
|
],
|
||||||
|
['10.0.0.1'],
|
||||||
|
)
|
||||||
|
expect(events).toEqual([])
|
||||||
|
})
|
||||||
|
|
||||||
|
it('unknown и degraded вне пула не инцидент', () => {
|
||||||
|
const events = toFailoverEvents(
|
||||||
|
[
|
||||||
|
row({ ip: '10.0.0.1', status: 'up' }),
|
||||||
|
row({ ip: '10.0.0.2', status: 'unknown' }),
|
||||||
|
row({ ip: '10.0.0.3', status: 'degraded' }),
|
||||||
|
],
|
||||||
|
['10.0.0.1'],
|
||||||
|
)
|
||||||
|
expect(events).toEqual([])
|
||||||
|
})
|
||||||
|
|
||||||
|
it('down в DNS-пуле не инцидент (last-resort / ещё в A-записи)', () => {
|
||||||
|
const events = toFailoverEvents(
|
||||||
|
[
|
||||||
|
row({
|
||||||
|
ip: '130.49.213.153',
|
||||||
|
status: 'down',
|
||||||
|
consecutive_failures: 9,
|
||||||
|
last_error: 'fetch failed',
|
||||||
|
}),
|
||||||
|
row({ ip: '10.0.0.3', status: 'down' }),
|
||||||
|
],
|
||||||
|
['130.49.213.153', '10.0.0.2'],
|
||||||
|
)
|
||||||
|
expect(events.map((event) => event.address)).toEqual(['10.0.0.3'])
|
||||||
|
})
|
||||||
|
|
||||||
|
it('down без A-записи — реальный вывод из пула', () => {
|
||||||
|
const events = toFailoverEvents(
|
||||||
|
[
|
||||||
|
row({
|
||||||
|
ip: '130.49.213.153',
|
||||||
|
status: 'down',
|
||||||
|
consecutive_failures: 9,
|
||||||
|
last_error: 'fetch failed',
|
||||||
|
last_checked_at: '2026-08-20 07:00:00',
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
['10.0.0.1'],
|
||||||
|
)
|
||||||
|
expect(events).toEqual([
|
||||||
|
{
|
||||||
|
id: '130.49.213.153',
|
||||||
|
address: '130.49.213.153',
|
||||||
|
status: 'down',
|
||||||
|
consecutiveFailures: 9,
|
||||||
|
lastFailureReason: 'fetch failed',
|
||||||
|
lastCheckAt: '2026-08-20 07:00:00',
|
||||||
|
},
|
||||||
|
])
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
export interface FailoverEvent {
|
||||||
|
id: string
|
||||||
|
address: string
|
||||||
|
status: string
|
||||||
|
consecutiveFailures: number
|
||||||
|
lastFailureReason: string | null
|
||||||
|
lastCheckAt?: string | null
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Binding IP health — тот же контур, что таблица активов. */
|
||||||
|
export interface FailoverHealthInput {
|
||||||
|
ip: string
|
||||||
|
status: string
|
||||||
|
consecutive_failures?: number
|
||||||
|
last_error?: string | null
|
||||||
|
last_checked_at?: string | null
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Инцидент только при down. up / degraded / unknown — не вывод из пула. */
|
||||||
|
export function isFailoverEventStatus(status: string): boolean {
|
||||||
|
return status === 'down'
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Инцидент failover = binding health down и адреса нет в DNS-пуле.
|
||||||
|
* OK / unknown / degraded вне пула — standby, не инцидент.
|
||||||
|
* Down в activeAddresses (last-resort) — не «снята с DNS».
|
||||||
|
*/
|
||||||
|
export function toFailoverEvents(
|
||||||
|
ipHealth: readonly FailoverHealthInput[],
|
||||||
|
activeAddresses: readonly string[] = [],
|
||||||
|
): FailoverEvent[] {
|
||||||
|
const pool = new Set(activeAddresses)
|
||||||
|
if (pool.size === 0) return []
|
||||||
|
|
||||||
|
return ipHealth
|
||||||
|
.filter((row) => isFailoverEventStatus(row.status) && !pool.has(row.ip))
|
||||||
|
.map((row) => ({
|
||||||
|
id: row.ip,
|
||||||
|
address: row.ip,
|
||||||
|
status: row.status,
|
||||||
|
consecutiveFailures: row.consecutive_failures ?? 0,
|
||||||
|
lastFailureReason: row.last_error ?? null,
|
||||||
|
lastCheckAt: row.last_checked_at ?? null,
|
||||||
|
}))
|
||||||
|
}
|
||||||
@@ -0,0 +1,193 @@
|
|||||||
|
import { describe, expect, it } from 'vitest'
|
||||||
|
|
||||||
|
import {
|
||||||
|
DEFAULT_BINDING_HEALTH,
|
||||||
|
addAddressNode,
|
||||||
|
addCommonFqdn,
|
||||||
|
emptyAddressBlock,
|
||||||
|
emptyBindingDraft,
|
||||||
|
hydrateAddressBlock,
|
||||||
|
removeAddressNode,
|
||||||
|
toAddressBindings,
|
||||||
|
toDomainsPayload,
|
||||||
|
type ServiceBindingDraft,
|
||||||
|
} from '@/lib/service-address'
|
||||||
|
|
||||||
|
const primaryMeta = {
|
||||||
|
lb_mode: 'round_robin' as const,
|
||||||
|
health: { ...DEFAULT_BINDING_HEALTH, enabled: true },
|
||||||
|
}
|
||||||
|
|
||||||
|
function aRecord(
|
||||||
|
fqdn: string,
|
||||||
|
target_ips: string[],
|
||||||
|
overrides: Partial<ServiceBindingDraft> = {},
|
||||||
|
): ServiceBindingDraft {
|
||||||
|
return {
|
||||||
|
...emptyBindingDraft(fqdn),
|
||||||
|
record_type: 'A',
|
||||||
|
target_ips,
|
||||||
|
target_ip_weights: Object.fromEntries(target_ips.map((ip) => [ip, 1])),
|
||||||
|
target_ip_priorities: Object.fromEntries(target_ips.map((ip) => [ip, 1])),
|
||||||
|
...overrides,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('hydrateAddressBlock', () => {
|
||||||
|
it('схлопывает extra A с одним IP пула в extraFqdn узла (MSK Macloud)', () => {
|
||||||
|
const drafts = [
|
||||||
|
aRecord('rutg.rkns.top', ['93.115.203.183', '185.244.181.61']),
|
||||||
|
aRecord('msk.rutg.rkns.top', ['93.115.203.183']),
|
||||||
|
]
|
||||||
|
|
||||||
|
const state = hydrateAddressBlock(drafts, ['93.115.203.183', '185.244.181.61'])
|
||||||
|
|
||||||
|
expect(state.commonFqdns).toEqual(['rutg.rkns.top'])
|
||||||
|
expect(state.nodes).toEqual([
|
||||||
|
{ ip: '93.115.203.183', extraFqdn: 'msk.rutg.rkns.top' },
|
||||||
|
{ ip: '185.244.181.61', extraFqdn: '' },
|
||||||
|
])
|
||||||
|
expect(state.preservedBindings).toEqual([])
|
||||||
|
})
|
||||||
|
|
||||||
|
it('кладёт A на весь пул в commonFqdns, CNAME — в preserved', () => {
|
||||||
|
const cname: ServiceBindingDraft = {
|
||||||
|
...emptyBindingDraft('alias.rkns.top'),
|
||||||
|
record_type: 'CNAME',
|
||||||
|
target_cname: 'rutg.rkns.top',
|
||||||
|
}
|
||||||
|
const drafts = [
|
||||||
|
aRecord('rutg.rkns.top', ['1.1.1.1', '2.2.2.2']),
|
||||||
|
aRecord('both.rkns.top', ['1.1.1.1', '2.2.2.2']),
|
||||||
|
cname,
|
||||||
|
]
|
||||||
|
|
||||||
|
const state = hydrateAddressBlock(drafts, ['1.1.1.1', '2.2.2.2'])
|
||||||
|
|
||||||
|
expect(state.commonFqdns).toEqual(['rutg.rkns.top', 'both.rkns.top'])
|
||||||
|
expect(state.nodes.every((node) => node.extraFqdn === '')).toBe(true)
|
||||||
|
expect(state.preservedBindings.map((item) => item.fqdn)).toEqual(['alias.rkns.top'])
|
||||||
|
})
|
||||||
|
|
||||||
|
it('кладёт extra A с IP вне пула в preservedBindings', () => {
|
||||||
|
const drafts = [
|
||||||
|
aRecord('gw.example.com', ['10.0.0.1']),
|
||||||
|
aRecord('edge.example.com', ['8.8.8.8']),
|
||||||
|
]
|
||||||
|
|
||||||
|
const state = hydrateAddressBlock(drafts, ['10.0.0.1'])
|
||||||
|
|
||||||
|
expect(state.nodes).toEqual([{ ip: '10.0.0.1', extraFqdn: '' }])
|
||||||
|
expect(state.commonFqdns).toEqual(['gw.example.com'])
|
||||||
|
expect(state.preservedBindings).toHaveLength(1)
|
||||||
|
expect(state.preservedBindings[0]?.fqdn).toBe('edge.example.com')
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe('toDomainsPayload', () => {
|
||||||
|
it('собирает каждый common на весь пул и extra binding на один IP', () => {
|
||||||
|
const drafts = [
|
||||||
|
aRecord('rutg.rkns.top', ['93.115.203.183', '185.244.181.61']),
|
||||||
|
aRecord('msk.rutg.rkns.top', ['93.115.203.183']),
|
||||||
|
]
|
||||||
|
const state = hydrateAddressBlock(drafts, ['93.115.203.183', '185.244.181.61'])
|
||||||
|
const payload = toDomainsPayload(state, primaryMeta)
|
||||||
|
|
||||||
|
expect(payload).toEqual([
|
||||||
|
expect.objectContaining({
|
||||||
|
fqdn: 'rutg.rkns.top',
|
||||||
|
target_ips: ['93.115.203.183', '185.244.181.61'],
|
||||||
|
health_check_enabled: true,
|
||||||
|
}),
|
||||||
|
expect.objectContaining({
|
||||||
|
fqdn: 'msk.rutg.rkns.top',
|
||||||
|
target_ips: ['93.115.203.183'],
|
||||||
|
health_check_enabled: true,
|
||||||
|
}),
|
||||||
|
])
|
||||||
|
})
|
||||||
|
|
||||||
|
it('круг hydrate → payload → hydrate сохраняет два common и extra FQDN', () => {
|
||||||
|
const drafts = [
|
||||||
|
aRecord('gt.rkns.top', ['93.115.203.183', '185.244.181.61']),
|
||||||
|
aRecord('msk.rkns.top', ['93.115.203.183', '185.244.181.61']),
|
||||||
|
aRecord('nsgt.rkns.top', ['93.115.203.183']),
|
||||||
|
]
|
||||||
|
const first = hydrateAddressBlock(drafts, ['93.115.203.183', '185.244.181.61'])
|
||||||
|
expect(first.commonFqdns).toEqual(['gt.rkns.top', 'msk.rkns.top'])
|
||||||
|
const rebound = toAddressBindings(first, primaryMeta)
|
||||||
|
const second = hydrateAddressBlock(rebound, rebound[0]?.target_ips ?? [])
|
||||||
|
|
||||||
|
expect(second.commonFqdns).toEqual(first.commonFqdns)
|
||||||
|
expect(second.nodes).toEqual(first.nodes)
|
||||||
|
expect(second.preservedBindings).toEqual([])
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe('removeAddressNode', () => {
|
||||||
|
it('удаляет extra FQDN узла и IP из preserved A-bindings', () => {
|
||||||
|
const state = hydrateAddressBlock(
|
||||||
|
[
|
||||||
|
aRecord('gw.example.com', ['10.0.0.1', '10.0.0.2']),
|
||||||
|
aRecord('msk.example.com', ['10.0.0.1']),
|
||||||
|
aRecord('edge.example.com', ['9.9.9.9', '10.0.0.1']),
|
||||||
|
],
|
||||||
|
['10.0.0.1', '10.0.0.2'],
|
||||||
|
)
|
||||||
|
|
||||||
|
const next = removeAddressNode(state, '10.0.0.1')
|
||||||
|
|
||||||
|
expect(next.nodes).toEqual([{ ip: '10.0.0.2', extraFqdn: '' }])
|
||||||
|
expect(next.preservedBindings).toHaveLength(1)
|
||||||
|
expect(next.preservedBindings[0]?.target_ips).toEqual(['9.9.9.9'])
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe('addAddressNode / addCommonFqdn', () => {
|
||||||
|
it('не добавляет дубликат IP', () => {
|
||||||
|
const withIp = addAddressNode(
|
||||||
|
{ ...emptyAddressBlock(), nodes: [{ ip: '1.1.1.1', extraFqdn: '' }] },
|
||||||
|
'1.1.1.1',
|
||||||
|
)
|
||||||
|
expect(withIp.nodes).toHaveLength(1)
|
||||||
|
})
|
||||||
|
|
||||||
|
it('не добавляет дубликат common FQDN', () => {
|
||||||
|
const state = addCommonFqdn(
|
||||||
|
{ ...emptyAddressBlock(), commonFqdns: ['gt.rkns.top'] },
|
||||||
|
'GT.rkns.top',
|
||||||
|
)
|
||||||
|
expect(state.commonFqdns).toEqual(['gt.rkns.top'])
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe('CNAME / preservedBindings', () => {
|
||||||
|
it('сохраняет CNAME в preserved при круге hydrate → payload', () => {
|
||||||
|
const cname: ServiceBindingDraft = {
|
||||||
|
...emptyBindingDraft('alias.rkns.top'),
|
||||||
|
record_type: 'CNAME',
|
||||||
|
target_cname: 'rutg.rkns.top',
|
||||||
|
}
|
||||||
|
const drafts = [
|
||||||
|
aRecord('rutg.rkns.top', ['1.1.1.1', '2.2.2.2']),
|
||||||
|
aRecord('msk.rkns.top', ['1.1.1.1']),
|
||||||
|
cname,
|
||||||
|
]
|
||||||
|
const state = hydrateAddressBlock(drafts, ['1.1.1.1', '2.2.2.2'])
|
||||||
|
expect(state.nodes[0]?.extraFqdn).toBe('msk.rkns.top')
|
||||||
|
expect(state.preservedBindings).toHaveLength(1)
|
||||||
|
|
||||||
|
const payload = toDomainsPayload(state, primaryMeta)
|
||||||
|
expect(payload.map((item) => item.fqdn)).toEqual([
|
||||||
|
'rutg.rkns.top',
|
||||||
|
'msk.rkns.top',
|
||||||
|
'alias.rkns.top',
|
||||||
|
])
|
||||||
|
expect(payload[2]).toEqual(
|
||||||
|
expect.objectContaining({
|
||||||
|
fqdn: 'alias.rkns.top',
|
||||||
|
target_cname: 'rutg.rkns.top',
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -0,0 +1,380 @@
|
|||||||
|
import { parseHealthProviders } from '@cfdm/shared'
|
||||||
|
import type { HealthCheckAggregate, HealthCheckProvider } from '@cfdm/shared'
|
||||||
|
import { bindingToFqdn } from '@/lib/parse-fqdn'
|
||||||
|
import type { ServiceView } from '@/lib/schemas'
|
||||||
|
|
||||||
|
export type AddressLbMode = 'round_robin' | 'failover' | 'weighted'
|
||||||
|
export type AddressHealthCheckType = 'tcp' | 'http'
|
||||||
|
|
||||||
|
export interface BindingHealthConfig {
|
||||||
|
enabled: boolean
|
||||||
|
type: AddressHealthCheckType
|
||||||
|
port: number | null
|
||||||
|
path: string | null
|
||||||
|
expected_status: number | null
|
||||||
|
interval_sec: number
|
||||||
|
timeout_ms: number
|
||||||
|
verify_tls: boolean
|
||||||
|
provider: HealthCheckProvider
|
||||||
|
providers: HealthCheckProvider[]
|
||||||
|
aggregate: HealthCheckAggregate
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ServiceBindingDraft {
|
||||||
|
fqdn: string
|
||||||
|
record_type: 'A' | 'CNAME'
|
||||||
|
target_ips: string[]
|
||||||
|
target_cname: string
|
||||||
|
lb_mode: AddressLbMode
|
||||||
|
health: BindingHealthConfig
|
||||||
|
target_ip_weights: Record<string, number>
|
||||||
|
target_ip_priorities: Record<string, number>
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface AddressNode {
|
||||||
|
ip: string
|
||||||
|
extraFqdn: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface AddressBlockState {
|
||||||
|
commonFqdns: string[]
|
||||||
|
nodes: AddressNode[]
|
||||||
|
preservedBindings: ServiceBindingDraft[]
|
||||||
|
target_ip_weights: Record<string, number>
|
||||||
|
target_ip_priorities: Record<string, number>
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface AddressPrimaryMeta {
|
||||||
|
lb_mode: AddressLbMode
|
||||||
|
health: BindingHealthConfig
|
||||||
|
}
|
||||||
|
|
||||||
|
export const DEFAULT_BINDING_HEALTH: BindingHealthConfig = {
|
||||||
|
enabled: false,
|
||||||
|
type: 'tcp',
|
||||||
|
port: null,
|
||||||
|
path: null,
|
||||||
|
expected_status: null,
|
||||||
|
interval_sec: 30,
|
||||||
|
timeout_ms: 3000,
|
||||||
|
verify_tls: false,
|
||||||
|
provider: 'local',
|
||||||
|
providers: ['local'],
|
||||||
|
aggregate: 'majority',
|
||||||
|
}
|
||||||
|
|
||||||
|
export function emptyBindingDraft(fqdn = ''): ServiceBindingDraft {
|
||||||
|
return {
|
||||||
|
fqdn,
|
||||||
|
record_type: 'A',
|
||||||
|
target_ips: [],
|
||||||
|
target_cname: '',
|
||||||
|
lb_mode: 'round_robin',
|
||||||
|
health: { ...DEFAULT_BINDING_HEALTH },
|
||||||
|
target_ip_weights: {},
|
||||||
|
target_ip_priorities: {},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function emptyAddressBlock(): AddressBlockState {
|
||||||
|
return {
|
||||||
|
commonFqdns: [],
|
||||||
|
nodes: [],
|
||||||
|
preservedBindings: [],
|
||||||
|
target_ip_weights: {},
|
||||||
|
target_ip_priorities: {},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function uniqueIps(...lists: string[][]): string[] {
|
||||||
|
const seen = new Set<string>()
|
||||||
|
const out: string[] = []
|
||||||
|
for (const list of lists) {
|
||||||
|
for (const ip of list) {
|
||||||
|
const trimmed = ip.trim()
|
||||||
|
if (!trimmed || seen.has(trimmed)) continue
|
||||||
|
seen.add(trimmed)
|
||||||
|
out.push(trimmed)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
function omitKey(record: Record<string, number>, key: string): Record<string, number> {
|
||||||
|
const next = { ...record }
|
||||||
|
delete next[key]
|
||||||
|
return next
|
||||||
|
}
|
||||||
|
|
||||||
|
function sameIpSet(left: string[], right: string[]): boolean {
|
||||||
|
if (left.length === 0 || left.length !== right.length) return false
|
||||||
|
const set = new Set(left.map((ip) => ip.trim()).filter(Boolean))
|
||||||
|
if (set.size !== left.length) return false
|
||||||
|
return right.every((ip) => set.has(ip.trim()))
|
||||||
|
}
|
||||||
|
|
||||||
|
export function toBindingDrafts(service: ServiceView): ServiceBindingDraft[] {
|
||||||
|
return (service.domains ?? []).map((binding) => ({
|
||||||
|
fqdn: bindingToFqdn(binding),
|
||||||
|
record_type: binding.record_type ?? (binding.target_cname ? 'CNAME' : 'A'),
|
||||||
|
target_ips: binding.target_ips ?? [],
|
||||||
|
target_cname: binding.target_cname ?? '',
|
||||||
|
lb_mode: binding.lb_mode,
|
||||||
|
health: {
|
||||||
|
enabled: Boolean(binding.health_check_enabled),
|
||||||
|
type: binding.health_check_type === 'http' ? 'http' : 'tcp',
|
||||||
|
port: binding.health_check_port,
|
||||||
|
path: binding.health_check_path,
|
||||||
|
expected_status: binding.health_check_expected_status,
|
||||||
|
interval_sec: binding.health_check_interval_sec,
|
||||||
|
timeout_ms: binding.health_check_timeout_ms,
|
||||||
|
verify_tls: Boolean(binding.health_check_verify_tls),
|
||||||
|
provider: binding.health_check_provider ?? 'local',
|
||||||
|
providers: parseHealthProviders(
|
||||||
|
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 ?? {},
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
|
||||||
|
function isFullPoolA(draft: ServiceBindingDraft, pool: string[]): boolean {
|
||||||
|
return draft.record_type === 'A' && sameIpSet(draft.target_ips, pool)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function hydrateAddressBlock(
|
||||||
|
drafts: ServiceBindingDraft[],
|
||||||
|
pool: string[] = [],
|
||||||
|
): AddressBlockState {
|
||||||
|
const multiIpTargets = drafts
|
||||||
|
.filter((draft) => draft.record_type === 'A' && draft.target_ips.length > 1)
|
||||||
|
.map((draft) => draft.target_ips)
|
||||||
|
const allAIps = drafts
|
||||||
|
.filter((draft) => draft.record_type === 'A')
|
||||||
|
.map((draft) => draft.target_ips)
|
||||||
|
const ips =
|
||||||
|
pool.length > 0
|
||||||
|
? uniqueIps(pool)
|
||||||
|
: uniqueIps(...(multiIpTargets.length > 0 ? multiIpTargets : allAIps))
|
||||||
|
const poolSet = new Set(ips)
|
||||||
|
const commonFqdns: string[] = []
|
||||||
|
const claimed = new Set<string>()
|
||||||
|
const extraByIp = new Map<string, string>()
|
||||||
|
const preservedBindings: ServiceBindingDraft[] = []
|
||||||
|
let weights: Record<string, number> = {}
|
||||||
|
let priorities: Record<string, number> = {}
|
||||||
|
|
||||||
|
for (const draft of drafts) {
|
||||||
|
const fqdn = draft.fqdn.trim()
|
||||||
|
if (isFullPoolA(draft, ips)) {
|
||||||
|
if (fqdn) commonFqdns.push(draft.fqdn)
|
||||||
|
if (Object.keys(weights).length === 0) {
|
||||||
|
weights = { ...draft.target_ip_weights }
|
||||||
|
priorities = { ...draft.target_ip_priorities }
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if (draft.record_type === 'A' && draft.target_ips.length === 1) {
|
||||||
|
const ip = draft.target_ips[0]?.trim() ?? ''
|
||||||
|
if (ip && poolSet.has(ip) && fqdn && !claimed.has(ip)) {
|
||||||
|
claimed.add(ip)
|
||||||
|
extraByIp.set(ip, draft.fqdn)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
preservedBindings.push(draft)
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
commonFqdns,
|
||||||
|
nodes: ips.map((ip) => ({
|
||||||
|
ip,
|
||||||
|
extraFqdn: extraByIp.get(ip) ?? '',
|
||||||
|
})),
|
||||||
|
preservedBindings,
|
||||||
|
target_ip_weights: weights,
|
||||||
|
target_ip_priorities: priorities,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function pruneIpFromBindings(
|
||||||
|
bindings: ServiceBindingDraft[],
|
||||||
|
ip: string,
|
||||||
|
): ServiceBindingDraft[] {
|
||||||
|
return bindings.flatMap((binding) => {
|
||||||
|
if (binding.record_type !== 'A') return [binding]
|
||||||
|
if (!binding.target_ips.includes(ip)) return [binding]
|
||||||
|
const target_ips = binding.target_ips.filter((item) => item !== ip)
|
||||||
|
if (target_ips.length === 0) return []
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
...binding,
|
||||||
|
target_ips,
|
||||||
|
target_ip_weights: omitKey(binding.target_ip_weights, ip),
|
||||||
|
target_ip_priorities: omitKey(binding.target_ip_priorities, ip),
|
||||||
|
},
|
||||||
|
]
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export function removeAddressNode(state: AddressBlockState, ip: string): AddressBlockState {
|
||||||
|
return {
|
||||||
|
...state,
|
||||||
|
nodes: state.nodes.filter((node) => node.ip !== ip),
|
||||||
|
preservedBindings: pruneIpFromBindings(state.preservedBindings, ip),
|
||||||
|
target_ip_weights: omitKey(state.target_ip_weights, ip),
|
||||||
|
target_ip_priorities: omitKey(state.target_ip_priorities, ip),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function addAddressNode(state: AddressBlockState, ip: string): AddressBlockState {
|
||||||
|
const trimmed = ip.trim()
|
||||||
|
if (!trimmed || state.nodes.some((node) => node.ip === trimmed)) {
|
||||||
|
return state
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
...state,
|
||||||
|
nodes: [...state.nodes, { ip: trimmed, extraFqdn: '' }],
|
||||||
|
target_ip_weights: { ...state.target_ip_weights, [trimmed]: 1 },
|
||||||
|
target_ip_priorities: { ...state.target_ip_priorities, [trimmed]: 1 },
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function fqdnKey(value: string): string {
|
||||||
|
return value.trim().toLowerCase()
|
||||||
|
}
|
||||||
|
|
||||||
|
export function addressHasFqdn(state: AddressBlockState, fqdn: string): boolean {
|
||||||
|
const key = fqdnKey(fqdn)
|
||||||
|
if (!key) return false
|
||||||
|
if (state.commonFqdns.some((item) => fqdnKey(item) === key)) return true
|
||||||
|
if (state.nodes.some((node) => fqdnKey(node.extraFqdn) === key)) return true
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
export function addCommonFqdn(state: AddressBlockState, fqdn: string): AddressBlockState {
|
||||||
|
const trimmed = fqdn.trim()
|
||||||
|
if (!trimmed || addressHasFqdn(state, trimmed)) return state
|
||||||
|
return { ...state, commonFqdns: [...state.commonFqdns, trimmed] }
|
||||||
|
}
|
||||||
|
|
||||||
|
export function removeCommonFqdn(state: AddressBlockState, index: number): AddressBlockState {
|
||||||
|
return {
|
||||||
|
...state,
|
||||||
|
commonFqdns: state.commonFqdns.filter((_, i) => i !== index),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function updateCommonFqdn(
|
||||||
|
state: AddressBlockState,
|
||||||
|
index: number,
|
||||||
|
fqdn: string,
|
||||||
|
): AddressBlockState {
|
||||||
|
return {
|
||||||
|
...state,
|
||||||
|
commonFqdns: state.commonFqdns.map((item, i) => (i === index ? fqdn : item)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function toAddressBindings(
|
||||||
|
state: AddressBlockState,
|
||||||
|
primary: AddressPrimaryMeta,
|
||||||
|
): ServiceBindingDraft[] {
|
||||||
|
const ips = state.nodes.map((node) => node.ip)
|
||||||
|
const weights = Object.fromEntries(
|
||||||
|
ips.map((ip) => [ip, state.target_ip_weights[ip] ?? 1]),
|
||||||
|
)
|
||||||
|
const priorities = Object.fromEntries(
|
||||||
|
ips.map((ip) => [ip, state.target_ip_priorities[ip] ?? 1]),
|
||||||
|
)
|
||||||
|
|
||||||
|
const drafts: ServiceBindingDraft[] = []
|
||||||
|
for (const raw of state.commonFqdns) {
|
||||||
|
const fqdn = raw.trim()
|
||||||
|
if (!fqdn || ips.length === 0) continue
|
||||||
|
drafts.push({
|
||||||
|
fqdn,
|
||||||
|
record_type: 'A',
|
||||||
|
target_ips: ips,
|
||||||
|
target_cname: '',
|
||||||
|
lb_mode: primary.lb_mode,
|
||||||
|
health: { ...primary.health },
|
||||||
|
target_ip_weights: weights,
|
||||||
|
target_ip_priorities: priorities,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const node of state.nodes) {
|
||||||
|
const extraFqdn = node.extraFqdn.trim()
|
||||||
|
if (!extraFqdn) continue
|
||||||
|
drafts.push({
|
||||||
|
fqdn: extraFqdn,
|
||||||
|
record_type: 'A',
|
||||||
|
target_ips: [node.ip],
|
||||||
|
target_cname: '',
|
||||||
|
lb_mode: primary.lb_mode,
|
||||||
|
health: { ...primary.health },
|
||||||
|
target_ip_weights: { [node.ip]: weights[node.ip] ?? 1 },
|
||||||
|
target_ip_priorities: { [node.ip]: priorities[node.ip] ?? 1 },
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
drafts.push(...state.preservedBindings)
|
||||||
|
return drafts
|
||||||
|
}
|
||||||
|
|
||||||
|
export function buildDomainsPayload(bindings: ServiceBindingDraft[]) {
|
||||||
|
return bindings
|
||||||
|
.filter((binding) => {
|
||||||
|
if (!binding.fqdn.trim()) return false
|
||||||
|
if (binding.record_type === 'CNAME') return Boolean(binding.target_cname.trim())
|
||||||
|
return binding.target_ips.length > 0
|
||||||
|
})
|
||||||
|
.map((binding) =>
|
||||||
|
binding.record_type === 'CNAME'
|
||||||
|
? {
|
||||||
|
fqdn: binding.fqdn.trim(),
|
||||||
|
target_cname: binding.target_cname.trim(),
|
||||||
|
lb_mode: binding.lb_mode,
|
||||||
|
health_check_enabled: binding.health.enabled,
|
||||||
|
health_check_type: binding.health.type,
|
||||||
|
health_check_port: binding.health.port,
|
||||||
|
health_check_path: binding.health.path,
|
||||||
|
health_check_expected_status: binding.health.expected_status,
|
||||||
|
health_check_interval_sec: binding.health.interval_sec,
|
||||||
|
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(),
|
||||||
|
target_ips: binding.target_ips,
|
||||||
|
target_ip_weights: binding.target_ip_weights,
|
||||||
|
target_ip_priorities: binding.target_ip_priorities,
|
||||||
|
lb_mode: binding.lb_mode,
|
||||||
|
health_check_enabled: binding.health.enabled,
|
||||||
|
health_check_type: binding.health.type,
|
||||||
|
health_check_port: binding.health.port,
|
||||||
|
health_check_path: binding.health.path,
|
||||||
|
health_check_expected_status: binding.health.expected_status,
|
||||||
|
health_check_interval_sec: binding.health.interval_sec,
|
||||||
|
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,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function toDomainsPayload(
|
||||||
|
state: AddressBlockState,
|
||||||
|
primary: AddressPrimaryMeta,
|
||||||
|
) {
|
||||||
|
return buildDomainsPayload(toAddressBindings(state, primary))
|
||||||
|
}
|
||||||
@@ -14,7 +14,6 @@ import {
|
|||||||
import { ChangeDomainSheet } from '@/components/change-domain-sheet'
|
import { ChangeDomainSheet } from '@/components/change-domain-sheet'
|
||||||
import { ChangeIpSheet } from '@/components/change-ip-sheet'
|
import { ChangeIpSheet } from '@/components/change-ip-sheet'
|
||||||
import { EmptyState } from '@/components/empty-state'
|
import { EmptyState } from '@/components/empty-state'
|
||||||
import { FailoverTimeline } from '@/components/failover-timeline'
|
|
||||||
import { FormFieldSimple } from '@/components/form-field'
|
import { FormFieldSimple } from '@/components/form-field'
|
||||||
import { FormSheet } from '@/components/form-sheet'
|
import { FormSheet } from '@/components/form-sheet'
|
||||||
import { HealthCheckBadge } from '@/components/health-check-badge'
|
import { HealthCheckBadge } from '@/components/health-check-badge'
|
||||||
@@ -29,15 +28,9 @@ import {
|
|||||||
import { LbModeTile } from '@/components/services/service-unit-card'
|
import { LbModeTile } from '@/components/services/service-unit-card'
|
||||||
import {
|
import {
|
||||||
KpiStatGrid,
|
KpiStatGrid,
|
||||||
|
ServiceFailoverPanel,
|
||||||
ServiceHealthMonitor,
|
ServiceHealthMonitor,
|
||||||
} from '@/components/reui-kit'
|
} from '@/components/reui-kit'
|
||||||
import {
|
|
||||||
Frame,
|
|
||||||
FrameDescription,
|
|
||||||
FrameHeader,
|
|
||||||
FramePanel,
|
|
||||||
FrameTitle,
|
|
||||||
} from '@/components/reui/frame'
|
|
||||||
import { api } from '@/lib/api-client'
|
import { api } from '@/lib/api-client'
|
||||||
import {
|
import {
|
||||||
enabledHealthProviders,
|
enabledHealthProviders,
|
||||||
@@ -84,6 +77,7 @@ interface OverviewPayload {
|
|||||||
priority: number
|
priority: number
|
||||||
consecutive_failures: number
|
consecutive_failures: number
|
||||||
last_failure_reason: string | null
|
last_failure_reason: string | null
|
||||||
|
last_check_at?: string | null
|
||||||
}>
|
}>
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -209,22 +203,6 @@ function ServiceDetailPage() {
|
|||||||
const isError = viewQuery.isError || overviewQuery.isError
|
const isError = viewQuery.isError || overviewQuery.isError
|
||||||
const error = viewQuery.error ?? overviewQuery.error
|
const error = viewQuery.error ?? overviewQuery.error
|
||||||
|
|
||||||
const failoverEvents =
|
|
||||||
(nodes.length > 0 ? nodes : (overview?.nodes ?? []))
|
|
||||||
.filter(
|
|
||||||
(node) =>
|
|
||||||
node.health_status === 'unhealthy' ||
|
|
||||||
node.health_status === 'down' ||
|
|
||||||
node.health_status === 'checking',
|
|
||||||
)
|
|
||||||
.map((node) => ({
|
|
||||||
id: node.address,
|
|
||||||
title: `${node.address}: ${node.health_status}`,
|
|
||||||
detail: node.last_failure_reason
|
|
||||||
? `${node.last_failure_reason} · fail ${node.consecutive_failures}`
|
|
||||||
: `fail ${node.consecutive_failures}`,
|
|
||||||
}))
|
|
||||||
|
|
||||||
const enabledProviders = useMemo(
|
const enabledProviders = useMemo(
|
||||||
() => enabledHealthProviders(service?.domains ?? []),
|
() => enabledHealthProviders(service?.domains ?? []),
|
||||||
[service],
|
[service],
|
||||||
@@ -333,17 +311,10 @@ function ServiceDetailPage() {
|
|||||||
statuses={providerStatuses}
|
statuses={providerStatuses}
|
||||||
isLoading={logQuery.isLoading}
|
isLoading={logQuery.isLoading}
|
||||||
/>
|
/>
|
||||||
<Frame dense spacing="sm" className="min-w-0 w-full">
|
<ServiceFailoverPanel
|
||||||
<FrameHeader>
|
ipHealth={service.ip_health}
|
||||||
<FrameTitle>Failover</FrameTitle>
|
activeAddresses={overview?.active_addresses ?? service.active_ips}
|
||||||
<FrameDescription>
|
/>
|
||||||
Нездоровые ноды и причины последней ошибки
|
|
||||||
</FrameDescription>
|
|
||||||
</FrameHeader>
|
|
||||||
<FramePanel>
|
|
||||||
<FailoverTimeline events={failoverEvents} />
|
|
||||||
</FramePanel>
|
|
||||||
</Frame>
|
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
{service.ips.length === 0 && service.domains.length === 0 ? (
|
{service.ips.length === 0 && service.domains.length === 0 ? (
|
||||||
|
|||||||
Reference in new issue
Block a user