Merge pull request #3834 from colinjtsen2010/feat/domain-monitoring
feat: add domain registration expiry monitoring
This commit is contained in:
13 files changed
+465
-30
No files matched your search
@@ -11,12 +11,14 @@ interface MonitorStatBoxesProps {
|
||||
monitor?: Monitor;
|
||||
monitorStats: MonitorStats | null;
|
||||
certificateExpiry?: string;
|
||||
domainExpiry?: string;
|
||||
}
|
||||
|
||||
export const MonitorStatBoxes = ({
|
||||
monitor,
|
||||
monitorStats,
|
||||
certificateExpiry,
|
||||
domainExpiry,
|
||||
}: MonitorStatBoxesProps) => {
|
||||
const theme = useTheme();
|
||||
const { t } = useTranslation();
|
||||
@@ -66,10 +68,16 @@ export const MonitorStatBoxes = ({
|
||||
/>
|
||||
|
||||
{monitor?.type === "http" && (
|
||||
<StatBox
|
||||
title={t("pages.common.monitors.statBoxes.certificateExpiry")}
|
||||
subtitle={certificateExpiry || "N/A"}
|
||||
/>
|
||||
<>
|
||||
<StatBox
|
||||
title={t("pages.common.monitors.statBoxes.certificateExpiry")}
|
||||
subtitle={certificateExpiry || "N/A"}
|
||||
/>
|
||||
<StatBox
|
||||
title={t("pages.common.monitors.statBoxes.domainExpiry")}
|
||||
subtitle={domainExpiry || "N/A"}
|
||||
/>
|
||||
</>
|
||||
)}
|
||||
</Stack>
|
||||
);
|
||||
|
||||
@@ -38,6 +38,11 @@ interface CertificateResponse {
|
||||
certificateDate: string;
|
||||
}
|
||||
|
||||
interface DomainResponse {
|
||||
domain: string;
|
||||
expiryDate: string;
|
||||
}
|
||||
|
||||
const UptimeDetailsPage = () => {
|
||||
const theme = useTheme();
|
||||
const isAdmin = useIsAdmin();
|
||||
@@ -102,6 +107,29 @@ const UptimeDetailsPage = () => {
|
||||
);
|
||||
}, [certificateData, uiTimezone]);
|
||||
|
||||
// Domain expiry fetch - only for HTTP monitors
|
||||
const domainUrl = useMemo(() => {
|
||||
if (!monitorId || monitor?.type !== "http") {
|
||||
return null;
|
||||
}
|
||||
return `/monitors/domain/${monitorId}`;
|
||||
}, [monitorId, monitor?.type]);
|
||||
|
||||
const { data: domainData } = useGet<DomainResponse>(
|
||||
domainUrl,
|
||||
{},
|
||||
{ revalidateOnFocus: false }
|
||||
);
|
||||
|
||||
const domainExpiry = useMemo(() => {
|
||||
if (!domainData?.expiryDate) {
|
||||
return undefined;
|
||||
}
|
||||
return (
|
||||
formatDateWithTz(domainData.expiryDate, certificateDateFormat, uiTimezone) ?? "N/A"
|
||||
);
|
||||
}, [domainData, uiTimezone]);
|
||||
|
||||
const checksUrl = useMemo(() => {
|
||||
if (!monitorId || !monitor?.type) {
|
||||
return null;
|
||||
@@ -193,6 +221,7 @@ const UptimeDetailsPage = () => {
|
||||
monitor={monitor}
|
||||
monitorStats={monitorStats}
|
||||
certificateExpiry={certificateExpiry}
|
||||
domainExpiry={domainExpiry}
|
||||
/>
|
||||
<HeaderTimeRange
|
||||
isLoading={monitorIsLoading || checksIsLoading}
|
||||
|
||||
@@ -475,6 +475,7 @@
|
||||
"statBoxes": {
|
||||
"activeFor": "Active for",
|
||||
"certificateExpiry": "Certificate expiry",
|
||||
"domainExpiry": "Domain expiry",
|
||||
"lastCheck": "Last check",
|
||||
"lastResponseTime": "Last response time",
|
||||
"serviceIsDown": "Service is down"
|
||||
|
||||
@@ -443,6 +443,7 @@
|
||||
"statBoxes": {
|
||||
"activeFor": "已活跃",
|
||||
"certificateExpiry": "证书到期",
|
||||
"domainExpiry": "域名到期",
|
||||
"lastCheck": "上次检查",
|
||||
"lastResponseTime": "上次响应时间",
|
||||
"serviceIsDown": "服务已停止"
|
||||
|
||||
Reference in new issue
Block a user