Merge pull request #3954 from bluewave-labs/develop

develop -> master
Merge pull request #3889 from bluewave-labs/develop
2026-09-12 15:06:56 -07:00 · 2026-08-26 12:08:53 -07:00 · 2026-08-26 10:45:29 -07:00 · 2026-07-30 09:39:06 -07:00 · 2026-07-07 10:19:52 -07:00 · 2026-07-02 11:06:47 -07:00
203 changed files with 1270 additions and 7394 deletions
@@ -92,7 +92,7 @@ JWT_SECRET="$(openssl rand -hex 32)" docker compose up -d
 Then open http://localhost:52345. If the app is reached at another origin (domain or LAN IP), set `CLIENT_HOST` accordingly. To build the image yourself, run `docker build -f docker/Dockerfile -t checkmate .` from a checkout. For TLS, put any reverse proxy (Caddy, Traefik, nginx) in front of port 52345.

 There are also 1-click installation options like [Repocloud](https://repocloud.io/details/Checkmate),
-[Pikapods](https://www.pikapods.com/), [Coolify](https://coolify.io/), [Elestio](https://elest.io/open-source/checkmate), [Easypanel](https://easypanel.io/templates/checkmate), [K8s](./charts/helm/checkmate/INSTALLATION.md), [Sive Host](https://sive.host) or [Cloudzy](https://cloudzy.com/marketplace/checkmate). Note that the Helm chart has not yet been migrated to the all-in-one image: it still deploys the legacy `checkmate-client`, `checkmate-backend` and `checkmate-mongo` images, pinned at v3.8.1.
+[Pikapods](https://www.pikapods.com/), [Coolify](https://coolify.io/), [Elestio](https://elest.io/open-source/checkmate), [K8s](./charts/helm/checkmate/INSTALLATION.md), [Sive Host](https://sive.host) or [Cloudzy](https://cloudzy.com/marketplace/checkmate). Note that the Helm chart has not yet been migrated to the all-in-one image: it still deploys the legacy `checkmate-client`, `checkmate-backend` and `checkmate-mongo` images, pinned at v3.8.1.


 ### Configuration
@@ -134,17 +134,14 @@ If you need to monitor internal HTTPS endpoints with certificates from private C

 ### Docker monitors

-A Docker monitor reports on every container running on a host. It can connect to the Docker daemon directly or read container metrics from a Capture agent. Direct monitors use the daemon's ping response for availability and record container state, health, CPU and memory usage, restart count, published ports and mounts. Enabling **Collect container logs** additionally stores the latest 200 log lines per container on every direct check; logs are kept for 7 days.
+A Docker monitor connects to a Docker daemon and reports on every container it runs. The daemon's ping response decides whether the monitor is up or down and its latency is the response time. Each check also records every container's state, health, CPU and memory usage, restart count, published ports and mounts. Enabling **Collect container logs** additionally stores the latest 200 log lines per container on every check; logs are kept for 7 days.

-The **Docker host** field accepts three forms:
+The **Docker host** field accepts two forms:

 | Host | Example | Notes |
 |---|---|---|
 | Local socket | `unix:///var/run/docker.sock` | Also accepts a bare absolute path such as `/var/run/docker.sock`. Use this for the daemon on the same machine Checkmate runs on. |
 | Remote daemon | `tcp://docker.example.com:2376` | Always uses mutual TLS; the port defaults to `2376`. Unencrypted daemons on `2375` are not supported. |
-| Capture agent | `https://capture.example.com/api/v1/metrics/docker` | Enter the full endpoint ending in `/metrics/docker` and its authorization secret. Checkmate requests `all=true` so stopped containers are included. |
-
-Capture-backed monitors normalize Capture's container state, health, CPU, memory, start time and exposed ports into the same Docker pages. Capture does not currently provide restart counts, mounts, published host-port bindings or container logs, so those values are shown as unavailable. Capture also reports a container whose health check is still starting as healthy, so the `starting` health state only appears on direct monitors, and stopped containers carry no CPU or memory metrics.

 **Monitoring the local socket.** The reference Compose file does not mount the socket, so add it and grant the container the host's `docker` group. The image runs as an unprivileged user and cannot read the socket otherwise. Find the group id with `stat -c %g /var/run/docker.sock`, then:

@@ -93,6 +93,7 @@
 			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.7.tgz",
 			"integrity": "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==",
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"@babel/code-frame": "^7.29.7",
 				"@babel/generator": "^7.29.7",
@@ -408,6 +409,7 @@
 		"node_modules/@emotion/react": {
 			"version": "11.14.0",
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"@babel/runtime": "^7.18.3",
 				"@emotion/babel-plugin": "^11.13.5",
@@ -445,6 +447,7 @@
 		"node_modules/@emotion/styled": {
 			"version": "11.14.1",
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"@babel/runtime": "^7.18.3",
 				"@emotion/babel-plugin": "^11.13.5",
@@ -1233,6 +1236,7 @@
 		"node_modules/@mui/material": {
 			"version": "7.3.7",
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"@babel/runtime": "^7.28.4",
 				"@mui/core-downloads-tracker": "^7.3.7",
@@ -1337,6 +1341,7 @@
 		"node_modules/@mui/system": {
 			"version": "7.3.7",
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"@babel/runtime": "^7.28.4",
 				"@mui/private-theming": "^7.3.7",
@@ -2381,6 +2386,7 @@
 			"version": "24.5.2",
 			"devOptional": true,
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"undici-types": "~7.12.0"
 			}
@@ -2396,6 +2402,7 @@
 		"node_modules/@types/react": {
 			"version": "18.3.27",
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"@types/prop-types": "*",
 				"csstype": "^3.2.2"
@@ -2486,6 +2493,7 @@
 			"integrity": "sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==",
 			"dev": true,
 			"license": "BSD-2-Clause",
+			"peer": true,
 			"dependencies": {
 				"@typescript-eslint/scope-manager": "7.18.0",
 				"@typescript-eslint/types": "7.18.0",
@@ -2766,6 +2774,7 @@
 			"version": "8.15.0",
 			"dev": true,
 			"license": "MIT",
+			"peer": true,
 			"bin": {
 				"acorn": "bin/acorn"
 			},
@@ -3122,6 +3131,7 @@
 				}
 			],
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"baseline-browser-mapping": "^2.10.42",
 				"caniuse-lite": "^1.0.30001800",
@@ -3565,7 +3575,8 @@
 		},
 		"node_modules/dayjs": {
 			"version": "1.11.13",
-			"license": "MIT"
+			"license": "MIT",
+			"peer": true
 		},
 		"node_modules/debug": {
 			"version": "4.4.3",
@@ -3964,6 +3975,7 @@
 			"version": "8.57.1",
 			"dev": true,
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"@eslint-community/eslint-utils": "^4.2.0",
 				"@eslint-community/regexpp": "^4.6.1",
@@ -4776,6 +4788,7 @@
 				}
 			],
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"@babel/runtime": "^7.27.6"
 			},
@@ -5587,6 +5600,7 @@
 			"resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-5.19.0.tgz",
 			"integrity": "sha512-REhYUN8gNP3HlcIZS6QU2uy8iovl31cXsrNDkCcqWSQbCkcpdYLczqDz5PVIwNH42UQNyvukjes/RoHPDrOUmQ==",
 			"license": "BSD-3-Clause",
+			"peer": true,
 			"dependencies": {
 				"@mapbox/geojson-rewind": "^0.5.2",
 				"@mapbox/jsonlint-lines-primitives": "^2.0.2",
@@ -6368,6 +6382,7 @@
 		"node_modules/react-dom": {
 			"version": "18.3.1",
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"loose-envify": "^1.1.0",
 				"scheduler": "^0.23.2"
@@ -6379,6 +6394,7 @@
 		"node_modules/react-hook-form": {
 			"version": "7.71.1",
 			"license": "MIT",
+			"peer": true,
 			"engines": {
 				"node": ">=18.0.0"
 			},
@@ -6582,7 +6598,8 @@
 		},
 		"node_modules/redux": {
 			"version": "5.0.1",
-			"license": "MIT"
+			"license": "MIT",
+			"peer": true
 		},
 		"node_modules/redux-persist": {
 			"version": "6.0.0",
@@ -6732,6 +6749,7 @@
 			"resolved": "https://registry.npmjs.org/rollup/-/rollup-4.62.2.tgz",
 			"integrity": "sha512-RFnrW4lhXA3s3eqHDZvN654g8OTjzRfqpIRJYczCGB6HzphckVAi/Qh4tbPUbRuDi7s1Llv8g/NspLkttY3gTA==",
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"@types/estree": "1.0.9"
 			},
@@ -7573,6 +7591,7 @@
 			"version": "5.9.3",
 			"devOptional": true,
 			"license": "Apache-2.0",
+			"peer": true,
 			"bin": {
 				"tsc": "bin/tsc",
 				"tsserver": "bin/tsserver"
@@ -7710,6 +7729,7 @@
 			"resolved": "https://registry.npmjs.org/vite/-/vite-6.4.3.tgz",
 			"integrity": "sha512-NTKlcQjlAK7MlQoyb6LgaqHc8sso/pVyUJYWMws3jg21uTJw/LddqIFPcPqP6PzpgbIcZyKI85sFE4HBrQDA8A==",
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"esbuild": "^0.25.0",
 				"fdir": "^6.4.4",
@@ -8,11 +8,8 @@ import { typographyLevels } from "@/Utils/Theme/Palette";
 import useMediaQuery from "@mui/material/useMediaQuery";
 import { LAYOUT } from "@/Utils/Theme/constants";
 import { formatDuration } from "@/Utils/TimeUtils";
-import { useTranslation } from "react-i18next";
-
 export const MonitorStatus = ({ monitor }: { monitor: Monitor }) => {
 	const theme = useTheme();
-	const { t, i18n } = useTranslation();
 	const isSmall = useMediaQuery(theme.breakpoints.down("md"));

 	if (!monitor) {
@@ -55,12 +52,7 @@ export const MonitorStatus = ({ monitor }: { monitor: Monitor }) => {
 					<>
 						<Dot />
 						<Typography>
-							{t("pages.common.monitors.statBoxes.checkingEvery", {
-								interval: formatDuration(monitor.interval, {
-									long: true,
-									locale: i18n.resolvedLanguage,
-								}),
-							})}
+							Checking every {formatDuration(monitor?.interval, true)}
 						</Typography>
 					</>
 				)}
@@ -5,10 +5,9 @@ import {
 	type FieldValues,
 } from "react-hook-form";
 import { Autocomplete } from "@/Components/inputs";
-import type { AutocompleteProps } from "@mui/material/Autocomplete";

 export interface AutocompleteOption {
-	id: string | number;
+	id: string;
 	name: string;
 }

@@ -17,9 +16,6 @@ interface FormAutocompleteProps<T extends FieldValues, O extends AutocompleteOpt
 	options: O[];
 	fieldLabel?: string;
 	placeholder?: string;
-	filterOptions?: AutocompleteProps<O, false, false, false>["filterOptions"];
-	getOptionDisabled?: AutocompleteProps<O, false, false, false>["getOptionDisabled"];
-	disableClearable?: boolean;
 }

 export const FormAutocompleteField = <
@@ -30,9 +26,6 @@ export const FormAutocompleteField = <
 	options,
 	fieldLabel,
 	placeholder,
-	filterOptions,
-	getOptionDisabled,
-	disableClearable,
 }: FormAutocompleteProps<T, O>) => {
 	const { control } = useFormContext<T>();
 	return (
@@ -46,14 +39,10 @@ export const FormAutocompleteField = <
 					isOptionEqualToValue={(option, value) => option.id === value.id}
 					value={options.find((o) => o.id === field.value) ?? null}
 					onChange={(_: unknown, newValue: O | null) => {
-						if (newValue === null && disableClearable) return;
 						field.onChange(newValue?.id ?? "");
 					}}
 					fieldLabel={fieldLabel}
 					placeholder={placeholder}
-					filterOptions={filterOptions}
-					getOptionDisabled={getOptionDisabled}
-					disableClearable={disableClearable}
 					error={!!fieldState.error}
 					helperText={fieldState.error?.message ?? ""}
 				/>
@@ -21,7 +21,7 @@ export const MonitorStatBoxes = ({
 	domainExpiry,
 }: MonitorStatBoxesProps) => {
 	const theme = useTheme();
-	const { t, i18n } = useTranslation();
+	const { t } = useTranslation();
 	if (!monitorStats || !monitor) {
 		return null;
 	}
@@ -29,16 +29,13 @@ export const MonitorStatBoxes = ({
 	const timeOfLastFailure = monitorStats?.timeOfLastFailure || 0;
 	const timeSinceLastFailure = timeOfLastFailure > 0 ? Date.now() - timeOfLastFailure : 0;

+	// Determine time since last check
 	const timeOfLastCheck = monitorStats?.lastCheckTimestamp || 0;
+	const timeSinceLastCheck = Date.now() - timeOfLastCheck || 0;

 	const streakTime = formatDuration(timeSinceLastFailure);
-	const lastCheckTime = timeOfLastCheck
-		? formatDuration(Date.now() - timeOfLastCheck, {
-				long: true,
-				relative: true,
-				locale: i18n.resolvedLanguage,
-			})
-		: t("common.labels.na");
+
+	const lastCheckTime = formatDuration(timeSinceLastCheck);
 	const isActive =
 		monitor?.status === "up" ||
 		monitor?.status === "paused" ||
@@ -20,18 +20,12 @@ import {
 	Tag,
 	Waypoints,
 	Container,
-	// LayoutDashboard,
 } from "lucide-react";
 export const getMenu = (t: Function) => {
 	return [
 		{
 			group: t("components.sidebar.menu.groups.monitoring"),
 			items: [
-				// {
-				// 	name: t("components.sidebar.menu.dashboard"),
-				// 	path: "dashboard",
-				// 	icon: <Icon icon={LayoutDashboard} />,
-				// },
 				{
 					name: t("components.sidebar.menu.uptime"),
 					path: "uptime",
@@ -1,9 +1,7 @@
-import { dashboardCardKeys, type DashboardCardKey } from "@/Types/Dashboard";
 import { createSlice, type PayloadAction } from "@reduxjs/toolkit";

 type ThemeMode = "light" | "dark";
 type ChartType = "histogram" | "line";
-
 type TableName =
 	| "monitors"
 	| "team"
@@ -37,7 +35,6 @@ interface UIState {
 	language: string;
 	starPromptOpen: boolean;
 	chartType: ChartType;
-	dashboardVisibleCards: DashboardCardKey[];
 }

 const initialMode: ThemeMode = window?.matchMedia?.("(prefers-color-scheme: dark)")
@@ -77,7 +74,6 @@ const initialState: UIState = {
 	language: "en",
 	starPromptOpen: true,
 	chartType: "histogram",
-	dashboardVisibleCards: [...dashboardCardKeys],
 };

 const uiSlice = createSlice({
@@ -121,9 +117,6 @@ const uiSlice = createSlice({
 		setChartType: (state, action: PayloadAction<ChartType>) => {
 			state.chartType = action.payload;
 		},
-		setDashboardVisibleCards: (state, action: PayloadAction<DashboardCardKey[]>) => {
-			state.dashboardVisibleCards = action.payload;
-		},
 	},
 });

@@ -140,5 +133,4 @@ export const {
 	setLanguage,
 	setStarPromptOpen,
 	setChartType,
-	setDashboardVisibleCards,
 } = uiSlice.actions;
@@ -77,7 +77,6 @@ export const getMonitorDefaults = (
 				...base,
 				type: "docker",
 				url: data?.url || "",
-				secret: data?.secret || "",
 				ignoreTlsErrors: data?.ignoreTlsErrors || false,
 				dockerTlsCa: data?.dockerTlsCa || "",
 				dockerTlsCert: data?.dockerTlsCert || "",
@@ -85,8 +84,6 @@ export const getMonitorDefaults = (
 				dockerTlsKey: "",
 				dockerTlsKeySet: data?.dockerTlsKeySet ?? false,
 				dockerLogsEnabled: data?.dockerLogsEnabled ?? false,
-				dockerAlertOnStopped: data?.dockerAlertOnStopped ?? false,
-				dockerAlertOnUnhealthy: data?.dockerAlertOnUnhealthy ?? false,
 			};
 			break;
 		case "game":
@@ -38,7 +38,6 @@ import {
 	PageSpeedStrategies,
 	DnsRecordTypes,
 	MonitorIntervalOptions,
-	MIN_MONITOR_INTERVAL_MS,
 	DefaultMonitorMatchMethod,
 	MonitorMatchMethods,
 	GeoCheckIntervalOptions,
@@ -51,7 +50,6 @@ import type { AppSettingsResponse } from "@/Types/Settings";
 import {
 	stepFieldsFor,
 	monitorStepCount,
-	isCaptureDockerUrl,
 	isDockerTlsUrl,
 	type MonitorFormData,
 } from "@/Validation/monitor";
@@ -60,14 +58,9 @@ import { FormTextField } from "@/Components/inputs/forms/FormTextField";
 import { FormRadioGroup } from "@/Components/inputs/forms/FormRadioGroupField";
 import { FormMultiSelectField } from "@/Components/inputs/forms/FormMultiSelectField";
 import { FormSelectField } from "@/Components/inputs/forms/FormSelectField";
-import {
-	FormAutocompleteField,
-	type AutocompleteOption,
-} from "@/Components/inputs/forms/FormAutoCompleteField";
 import { FormSliderField } from "@/Components/inputs/forms/FormSliderField";
 import { FormSwitchField } from "@/Components/inputs/forms/FormSwitchField";
 import type { ProxyResponse } from "@/Types/Proxy";
-import { formatDuration } from "@/Utils/TimeUtils";

 const httpMethodOptions = HttpMethods.map((method) => ({
 	value: method,
@@ -82,40 +75,6 @@ const maskedInputSx = {
 	"&:not(.Mui-focused) textarea": { WebkitTextSecurity: "disc" },
 };

-interface IntervalOption extends AutocompleteOption {
-	id: number;
-}
-
-const INTERVAL_UNIT_MULTIPLIERS = [1000, 60000, 3600000, 86400000] as const;
-
-const toIntervalOption = (
-	intervalMs: number,
-	locale: string | undefined
-): IntervalOption => ({
-	id: intervalMs,
-	name: formatDuration(intervalMs, { long: true, locale }),
-});
-
-const filterIntervalOptions = (
-	options: IntervalOption[],
-	inputValue: string,
-	locale: string | undefined
-): IntervalOption[] => {
-	const input = inputValue.trim();
-	if (input === "" || options.some((option) => option.name === input)) {
-		return options;
-	}
-
-	const amount = Number(input);
-	if (!Number.isFinite(amount) || amount <= 0) {
-		return [];
-	}
-
-	return INTERVAL_UNIT_MULTIPLIERS.map((multiplier) => amount * multiplier)
-		.filter(Number.isSafeInteger)
-		.map((ms) => toIntervalOption(ms, locale));
-};
-
 interface GeneralSettingsConfig {
 	urlLabel: string;
 	urlPlaceholder: string;
@@ -293,7 +252,7 @@ const getGeneralSettingsConfig = (

 const CreateMonitorPage = () => {
 	const theme = useTheme();
-	const { t, i18n } = useTranslation();
+	const { t } = useTranslation();
 	const { monitorId } = useParams();
 	const location = useLocation();
 	const navigate = useNavigate();
@@ -351,12 +310,10 @@ const CreateMonitorPage = () => {

 	const watchedType = watch("type") as MonitorType;
 	const watchedUrl = watch("url") as string;
-	const isCaptureDocker = watchedType === "docker" && isCaptureDockerUrl(watchedUrl);
 	const watchedMethod = watch("method") as HttpMethod | undefined;
 	const watchedProxyMode = watch("proxyMode") as ProxyMode | undefined;
 	const watchedUseAdvancedMatching = watch("useAdvancedMatching") as boolean;
 	const watchGeoCheckEnabled = watch("geoCheckEnabled") as boolean;
-	const watchedInterval = watch("interval");

 	// Steps without an advanced section drop it, so the last step is the form's.
 	const totalSteps = monitorStepCount(watchedType);
@@ -382,13 +339,6 @@ const CreateMonitorPage = () => {
 		}
 	}, [watchedType, showTypeSelector, reset, clearErrors]);

-	// The logs switch is hidden for Capture hosts, so a value left over from a socket host must not be submitted.
-	useEffect(() => {
-		if (isCaptureDocker) {
-			setValue("dockerLogsEnabled", false);
-		}
-	}, [isCaptureDocker, setValue]);
-
 	const generalSettingsConfig = useMemo(
 		() => getGeneralSettingsConfig(watchedType, t),
 		[watchedType, t]
@@ -521,18 +471,16 @@ const CreateMonitorPage = () => {
 		[t]
 	);

-	const intervalOptions = useMemo(() => {
-		const options = MonitorIntervalOptions.map(({ value }) =>
-			toIntervalOption(value, i18n.resolvedLanguage)
-		);
-		if (
-			typeof watchedInterval === "number" &&
-			!options.some((option) => option.id === watchedInterval)
-		) {
-			options.push(toIntervalOption(watchedInterval, i18n.resolvedLanguage));
-		}
-		return options;
-	}, [watchedInterval, i18n.resolvedLanguage]);
+	const intervalOptions = useMemo(
+		() =>
+			MonitorIntervalOptions.map((option) => ({
+				value: option.value,
+				label: t(
+					`pages.createMonitor.form.frequency.option.frequency.value.${option.labelKey}`
+				),
+			})),
+		[t]
+	);

 	const matchMethodOptions = useMemo(
 		() =>
@@ -617,6 +565,7 @@ const CreateMonitorPage = () => {
 						}
 					/>
 				)}
+
 				{showStep(0) && (
 					<ConfigBox
 						title={t("pages.createMonitor.form.general.title")}
@@ -717,8 +666,8 @@ const CreateMonitorPage = () => {
 									/>
 								)}

-								{/* Capture API secret - used by hardware and Capture-backed Docker monitors */}
-								{(generalSettingsConfig.showSecret || isCaptureDocker) && (
+								{/* Secret field - only for hardware type */}
+								{generalSettingsConfig.showSecret && (
 									<FormTextField
 										name="secret"
 										fieldLabel={t("pages.createMonitor.form.general.option.secret.label")}
@@ -727,12 +676,6 @@ const CreateMonitorPage = () => {
 										)}
 									/>
 								)}
-								{isCaptureDocker && (
-									<FormSwitchField
-										name="ignoreTlsErrors"
-										label={t("pages.createMonitor.form.ignoreTls.option.tls.label")}
-									/>
-								)}
 								{generalSettingsConfig.showDnsServer && (
 									<FormTextField
 										name="dnsServer"
@@ -757,6 +700,7 @@ const CreateMonitorPage = () => {
 						}
 					/>
 				)}
+
 				{showStep(0) && watchedType === "docker" && isDockerTlsUrl(watchedUrl) && (
 					<ConfigBox
 						title={t("pages.createMonitor.form.dockerTls.title")}
@@ -814,26 +758,23 @@ const CreateMonitorPage = () => {
 						}
 					/>
 				)}
+
 				{showStep(1) && (
 					<ConfigBox
 						title={t("pages.createMonitor.form.frequency.title")}
 						subtitle={t("pages.createMonitor.form.frequency.description")}
 						rightContent={
-							<FormAutocompleteField
+							<FormSelectField
 								name="interval"
 								fieldLabel={t(
 									"pages.createMonitor.form.frequency.option.frequency.label"
 								)}
 								options={intervalOptions}
-								filterOptions={(options, { inputValue }) =>
-									filterIntervalOptions(options, inputValue, i18n.resolvedLanguage)
-								}
-								getOptionDisabled={(option) => option.id < MIN_MONITOR_INTERVAL_MS}
-								disableClearable
 							/>
 						}
 					/>
 				)}
+
 				{/* Alert Thresholds - only for hardware type */}
 				{watchedType === "hardware" && showStep(1) && (
 					<ConfigBox
@@ -889,6 +830,7 @@ const CreateMonitorPage = () => {
 						}
 					/>
 				)}
+
 				{showStep(1) && (
 					<ConfigBox
 						title={t("pages.createMonitor.form.incidents.title")}
@@ -915,6 +857,7 @@ const CreateMonitorPage = () => {
 						}
 					/>
 				)}
+
 				{showStep(1) && (
 					<ConfigBox
 						title={t("pages.createMonitor.form.notifications.title")}
@@ -927,6 +870,7 @@ const CreateMonitorPage = () => {
 						}
 					/>
 				)}
+
 				{showStep(1) && (
 					<ConfigBox
 						title={t("pages.createMonitor.form.tags.title")}
@@ -953,7 +897,8 @@ const CreateMonitorPage = () => {
 						}
 					/>
 				)}
-				{showStep(1) && watchedType === "docker" && !isCaptureDocker && (
+
+				{showStep(1) && watchedType === "docker" && (
 					<ConfigBox
 						title={t("pages.createMonitor.form.dockerLogs.title")}
 						subtitle={t("pages.createMonitor.form.dockerLogs.description")}
@@ -965,28 +910,7 @@ const CreateMonitorPage = () => {
 						}
 					/>
 				)}
-				{showStep(1) && watchedType === "docker" && (
-					<ConfigBox
-						title={t("pages.createMonitor.form.dockerAlerts.title")}
-						subtitle={t("pages.createMonitor.form.dockerAlerts.description")}
-						rightContent={
-							<Stack gap={theme.spacing(LAYOUT.MD)}>
-								<FormSwitchField
-									name="dockerAlertOnStopped"
-									label={t(
-										"pages.createMonitor.form.dockerAlerts.option.onStopped.label"
-									)}
-								/>
-								<FormSwitchField
-									name="dockerAlertOnUnhealthy"
-									label={t(
-										"pages.createMonitor.form.dockerAlerts.option.onUnhealthy.label"
-									)}
-								/>
-							</Stack>
-						}
-					/>
-				)}
+
 				{showStep(2) &&
 					(watchedType === "http" ||
 						watchedType === "grpc" ||
@@ -1002,6 +926,7 @@ const CreateMonitorPage = () => {
 							}
 						/>
 					)}
+
 				{showStep(2) && watchedType === "http" && (
 					<ConfigBox
 						title={t("pages.createMonitor.form.advanced.title")}
@@ -1101,6 +1026,7 @@ const CreateMonitorPage = () => {
 						}
 					/>
 				)}
+
 				{showStep(2) && supportsGeoCheck(watchedType) && (
 					<ConfigBox
 						title={t("pages.createMonitor.form.geoChecks.title")}
@@ -1133,6 +1059,7 @@ const CreateMonitorPage = () => {
 						}
 					/>
 				)}
+
 				<Stack
 					direction="row"
 					justifyContent={!isEditMode ? "space-between" : "flex-end"}
@@ -1,54 +0,0 @@
-import Box from "@mui/material/Box";
-import Stack from "@mui/material/Stack";
-import Typography from "@mui/material/Typography";
-import { useTheme } from "@mui/material/styles";
-import { LAYOUT } from "@/Utils/Theme/constants";
-import { typographyLevels } from "@/Utils/Theme/Palette";
-
-interface DashboardCardProps {
-	title: string;
-	topRight?: React.ReactNode;
-	children: React.ReactNode;
-}
-
-export const DashboardCard = ({ title, topRight, children }: DashboardCardProps) => {
-	const theme = useTheme();
-
-	return (
-		<Box
-			bgcolor={theme.palette.background.paper}
-			border={1}
-			borderColor={theme.palette.divider}
-			borderRadius={`${theme.shape.borderRadius}px`}
-			padding={theme.spacing(LAYOUT.MD)}
-			display="flex"
-			flexDirection="column"
-			gap={theme.spacing(LAYOUT.SM)}
-			height="100%"
-			boxSizing="border-box"
-		>
-			<Stack
-				direction="row"
-				alignItems="center"
-				justifyContent="space-between"
-			>
-				<Typography
-					fontSize={typographyLevels.m}
-					fontWeight={500}
-					color={theme.palette.text.primary}
-				>
-					{title}
-				</Typography>
-				{topRight && (
-					<Typography
-						fontSize={typographyLevels.s}
-						color={theme.palette.text.secondary}
-					>
-						{topRight}
-					</Typography>
-				)}
-			</Stack>
-			{children}
-		</Box>
-	);
-};
@@ -1,69 +0,0 @@
-import { useState } from "react";
-import Stack from "@mui/material/Stack";
-import FormControlLabel from "@mui/material/FormControlLabel";
-import { useTranslation } from "react-i18next";
-import { Checkbox, Dialog } from "@/Components/inputs";
-import { type DashboardCardKey, dashboardCardKeys } from "@/Types/Dashboard";
-
-interface EditCardsModalProps {
-	open: boolean;
-	visibleCards: Set<DashboardCardKey>;
-	onClose: () => void;
-	onSave: (visibleCards: Set<DashboardCardKey>) => void;
-}
-
-export const EditCardsModal = ({
-	open,
-	visibleCards,
-	onClose,
-	onSave,
-}: EditCardsModalProps) => {
-	const { t } = useTranslation();
-	const [draft, setDraft] = useState<Set<DashboardCardKey>>(new Set(visibleCards));
-
-	const handleClose = () => {
-		setDraft(new Set(visibleCards));
-		onClose();
-	};
-
-	const handleToggle = (key: DashboardCardKey) => {
-		setDraft((prev) => {
-			const next = new Set(prev);
-			if (next.has(key)) {
-				next.delete(key);
-			} else {
-				next.add(key);
-			}
-			return next;
-		});
-	};
-
-	return (
-		<Dialog
-			open={open}
-			title={t("pages.dashboard.editCardsModal.title")}
-			content={t("pages.dashboard.editCardsModal.description")}
-			onCancel={handleClose}
-			onConfirm={() => onSave(draft)}
-			confirmText={t("pages.dashboard.editCardsModal.done")}
-			maxWidth="xs"
-			fullWidth
-		>
-			<Stack>
-				{dashboardCardKeys.map((key: DashboardCardKey) => (
-					<FormControlLabel
-						key={key}
-						label={t(`pages.dashboard.cards.${key}`)}
-						control={
-							<Checkbox
-								checked={draft.has(key)}
-								disabled={draft.has(key) && draft.size === 1}
-								onChange={() => handleToggle(key)}
-							/>
-						}
-					/>
-				))}
-			</Stack>
-		</Dialog>
-	);
-};
@@ -1,28 +0,0 @@
-import { LAYOUT } from "@/Utils/Theme/constants";
-import Box from "@mui/material/Box";
-import { useTheme } from "@mui/material/styles";
-
-interface ProgressBarProps {
-	fillRatio: number;
-}
-
-export const ProgressBar = ({ fillRatio }: ProgressBarProps) => {
-	const theme = useTheme();
-	const clamped = Math.min(1, Math.max(0, fillRatio));
-
-	return (
-		<Box
-			height={theme.spacing(LAYOUT.XS)}
-			borderRadius={theme.shape.borderRadius}
-			bgcolor={theme.palette.action.disabledBackground}
-			overflow="hidden"
-		>
-			<Box
-				height="100%"
-				width={`${clamped * 100}%`}
-				borderRadius={theme.shape.borderRadius}
-				bgcolor={theme.palette.primary.main}
-			/>
-		</Box>
-	);
-};
@@ -1,42 +0,0 @@
-import Stack from "@mui/material/Stack";
-import Typography from "@mui/material/Typography";
-import { useTheme } from "@mui/material/styles";
-import { typographyLevels } from "@/Utils/Theme/Palette";
-import { SPACING } from "@/Utils/Theme/constants";
-import { ProgressBar } from "@/Pages/Dashboard/components/ProgressBar";
-
-interface BarRowProps {
-	label: string;
-	value: string;
-	fillRatio: number;
-	valueColor?: string;
-}
-
-export const BarRow = ({ label, value, fillRatio, valueColor }: BarRowProps) => {
-	const theme = useTheme();
-
-	return (
-		<Stack gap={theme.spacing(SPACING.LG)}>
-			<Stack
-				direction="row"
-				justifyContent="space-between"
-				alignItems="center"
-			>
-				<Typography
-					fontSize={typographyLevels.m}
-					color={theme.palette.text.primary}
-				>
-					{label}
-				</Typography>
-				<Typography
-					fontSize={typographyLevels.m}
-					color={valueColor ?? theme.palette.primary.main}
-					fontWeight={500}
-				>
-					{value}
-				</Typography>
-			</Stack>
-			<ProgressBar fillRatio={fillRatio} />
-		</Stack>
-	);
-};
@@ -1,58 +0,0 @@
-import Stack from "@mui/material/Stack";
-import Typography from "@mui/material/Typography";
-import { useTheme } from "@mui/material/styles";
-import { DashboardCard } from "@/Pages/Dashboard/components/DashboardCard";
-import { ProgressBar } from "@/Pages/Dashboard/components/ProgressBar";
-import { typographyLevels } from "@/Utils/Theme/Palette";
-import { SPACING } from "@/Utils/Theme/constants";
-import { useTranslation } from "react-i18next";
-import type { MonitorsSummary } from "@/Types/Monitor";
-
-interface MonitorStatusCardProps {
-	summary: MonitorsSummary | null;
-}
-
-export const MonitorStatusCard = ({ summary }: MonitorStatusCardProps) => {
-	const theme = useTheme();
-	const { t } = useTranslation();
-
-	const up = summary?.upMonitors ?? 0;
-	const total = summary?.totalMonitors ?? 0;
-	const ratio = total > 0 ? up / total : 0;
-
-	return (
-		<DashboardCard title={t("pages.dashboard.cards.monitorStatus")}>
-			{total === 0 ? (
-				<Typography
-					fontSize={typographyLevels.m}
-					color={theme.palette.text.disabled}
-				>
-					{t("pages.dashboard.noData")}
-				</Typography>
-			) : (
-				<Stack gap={theme.spacing(SPACING.SM)}>
-					<Stack
-						direction="row"
-						alignItems="baseline"
-						gap={theme.spacing(SPACING.XS)}
-					>
-						<Typography
-							fontSize={typographyLevels.xxl}
-							fontWeight={500}
-							color={theme.palette.text.primary}
-						>
-							{up}
-						</Typography>
-						<Typography
-							fontSize={typographyLevels.m}
-							color={theme.palette.text.secondary}
-						>
-							{t("pages.dashboard.monitorStatus.ofUp", { total })}
-						</Typography>
-					</Stack>
-					<ProgressBar fillRatio={ratio} />
-				</Stack>
-			)}
-		</DashboardCard>
-	);
-};
@@ -1,46 +0,0 @@
-import Stack from "@mui/material/Stack";
-import Typography from "@mui/material/Typography";
-import { DashboardCard } from "@/Pages/Dashboard/components/DashboardCard";
-import { BarRow } from "@/Pages/Dashboard/components/cards/BarRow";
-import { useTranslation } from "react-i18next";
-import { useTheme } from "@mui/material/styles";
-import type { MonitorTypeCount } from "@/Types/Monitor";
-import { getMonitorTypeLabel } from "@/Types/Monitor";
-import { LAYOUT } from "@/Utils/Theme/constants";
-import { typographyLevels } from "@/Utils/Theme/Palette";
-
-interface MonitorsByTypeCardProps {
-	monitorsByType: MonitorTypeCount[];
-}
-
-export const MonitorsByTypeCard = ({ monitorsByType }: MonitorsByTypeCardProps) => {
-	const { t } = useTranslation();
-	const theme = useTheme();
-
-	const maxCount = monitorsByType[0]?.count ?? 1;
-
-	return (
-		<DashboardCard title={t("pages.dashboard.cards.monitorsByType")}>
-			{monitorsByType.length === 0 ? (
-				<Typography
-					fontSize={typographyLevels.m}
-					color={theme.palette.text.disabled}
-				>
-					{t("pages.dashboard.noData")}
-				</Typography>
-			) : (
-				<Stack gap={theme.spacing(LAYOUT.SM)}>
-					{monitorsByType.map(({ type, count }) => (
-						<BarRow
-							key={type}
-							label={getMonitorTypeLabel(type, t)}
-							value={String(count)}
-							fillRatio={count / maxCount}
-							valueColor={theme.palette.text.primary}
-						/>
-					))}
-				</Stack>
-			)}
-		</DashboardCard>
-	);
-};
@@ -1,96 +0,0 @@
-import { Fragment, useMemo, useState, type ReactNode } from "react";
-import Box from "@mui/material/Box";
-import Stack from "@mui/material/Stack";
-import { useTheme } from "@mui/material/styles";
-import { useTranslation } from "react-i18next";
-import { useSelector, useDispatch } from "react-redux";
-
-import { BasePage } from "@/Components/design-elements/BasePage";
-import { Button } from "@/Components/inputs";
-import { LAYOUT } from "@/Utils/Theme/constants";
-import { useMonitorListController } from "@/Hooks/useMonitorListController";
-import { MonitorTypes, type MonitorTypeCount } from "@/Types/Monitor";
-import { setDashboardVisibleCards } from "@/Features/UI/uiSlice";
-import type { RootState, AppDispatch } from "@/store";
-
-import { MonitorStatusCard } from "@/Pages/Dashboard/components/cards/MonitorStatusCard";
-import { MonitorsByTypeCard } from "@/Pages/Dashboard/components/cards/MonitorsByTypeCard";
-import { EditCardsModal } from "@/Pages/Dashboard/components/EditCardsModal";
-import { type DashboardCardKey, dashboardCardKeys } from "@/Types/Dashboard";
-
-const Dashboard = () => {
-	const theme = useTheme();
-	const { t } = useTranslation();
-	const dispatch = useDispatch<AppDispatch>();
-	const [editOpen, setEditOpen] = useState(false);
-	const visibleCardsList = useSelector(
-		(state: RootState) => state.ui.dashboardVisibleCards
-	);
-	const visibleCards = useMemo(() => new Set(visibleCardsList), [visibleCardsList]);
-
-	const { monitors, summary } = useMonitorListController({
-		types: [...MonitorTypes],
-		checksLimit: 1,
-		refreshInterval: 30000,
-		rowsPerPageTable: "monitors",
-		rowsPerPageDefault: 100,
-	});
-
-	const monitorsByType = useMemo<MonitorTypeCount[]>(() => {
-		const countMap = new Map<MonitorTypeCount["type"], number>();
-		(monitors ?? []).forEach((m) =>
-			countMap.set(m.type, (countMap.get(m.type) ?? 0) + 1)
-		);
-		return [...countMap.entries()]
-			.map(([type, count]) => ({ type, count }))
-			.sort((a, b) => b.count - a.count);
-	}, [monitors]);
-
-	const cardComponents: Record<DashboardCardKey, ReactNode> = {
-		monitorStatus: <MonitorStatusCard summary={summary} />,
-		monitorsByType: <MonitorsByTypeCard monitorsByType={monitorsByType} />,
-	};
-
-	return (
-		<BasePage headerKey="dashboard">
-			<Stack gap={theme.spacing(LAYOUT.SM)}>
-				<Stack
-					direction="row"
-					justifyContent="flex-end"
-				>
-					<Button
-						variant="outlined"
-						size="small"
-						onClick={() => setEditOpen(true)}
-					>
-						{t("pages.dashboard.editCards")}
-					</Button>
-				</Stack>
-
-				<Box
-					display="grid"
-					gridTemplateColumns={{ xs: "1fr", md: "1fr 1fr" }}
-					gap={theme.spacing(LAYOUT.MD)}
-				>
-					{dashboardCardKeys
-						.filter((key) => visibleCards.has(key))
-						.map((key) => (
-							<Fragment key={key}>{cardComponents[key]}</Fragment>
-						))}
-				</Box>
-			</Stack>
-
-			<EditCardsModal
-				open={editOpen}
-				visibleCards={visibleCards}
-				onClose={() => setEditOpen(false)}
-				onSave={(next) => {
-					dispatch(setDashboardVisibleCards([...next]));
-					setEditOpen(false);
-				}}
-			/>
-		</BasePage>
-	);
-};
-
-export default Dashboard;
@@ -10,7 +10,6 @@ import type { DockerContainerInfo } from "@/Types/Check";

 // Utils
 import { formatDuration } from "@/Utils/TimeUtils";
-import { PLACEHOLDER } from "@/Utils/FormatUtils";
 import { getDockerPalette } from "@/Utils/MonitorUtils";

 export const DockerContainerStatusBoxes = ({
@@ -24,9 +23,8 @@ export const DockerContainerStatusBoxes = ({
 	if (!container) return null;

 	const { state, restartCount, health } = container;
-	const runningFor = container.startedAt
-		? Date.now() - new Date(container.startedAt).getTime()
-		: undefined;
+	const startedAt = container.startedAt ?? "0";
+	const runningFor = Date.now() - new Date(startedAt).getTime();
 	const palette = getDockerPalette(state);
 	return (
 		<Stack
@@ -41,11 +39,11 @@ export const DockerContainerStatusBoxes = ({
 			/>
 			<StatBox
 				title={t("common.labels.uptime")}
-				subtitle={runningFor === undefined ? PLACEHOLDER : formatDuration(runningFor)}
+				subtitle={formatDuration(runningFor)}
 			/>
 			<StatBox
 				title={t("common.labels.restarts")}
-				subtitle={restartCount === undefined ? PLACEHOLDER : String(restartCount)}
+				subtitle={String(restartCount ?? 0)}
 			/>
 			<StatBox
 				title={t("common.labels.health")}
@@ -13,7 +13,7 @@ import type { Theme } from "@mui/material";
 import type { TFunction } from "i18next";
 import type { DockerContainerStats } from "@/Types/Monitor";
 import { LAYOUT } from "@/Utils/Theme/constants";
-import { formatPercentage, PLACEHOLDER } from "@/Utils/FormatUtils";
+import { formatPercentage } from "@/Utils/FormatUtils";
 import prettyBytes from "pretty-bytes";
 import { BaseBox } from "@/Components/design-elements";
 import { dedupeDockerPorts, getDockerMountLabel } from "@/Utils/MonitorUtils";
@@ -88,17 +88,11 @@ export const TabOverview = ({
 						Ports
 					</Typography>
 					<Stack>
-						{dedupedPorts.length === 0 && <Typography>{PLACEHOLDER}</Typography>}
-						{dedupedPorts.map((port) => {
-							const containerPort = `${port.privatePort}/${port.protocol}`;
-							const label =
-								port.publicPort === undefined
-									? containerPort
-									: `${port.hostIp ?? "0.0.0.0"}:${port.publicPort} -> ${containerPort}`;
+						{dedupedPorts?.map((port) => {
 							return (
-								<Typography key={`${port.hostIp}/${port.publicPort}/${containerPort}`}>
-									{label}
-								</Typography>
+								<Typography
+									key={`${port.publicPort}/${port.privatePort}`}
+								>{`${port.hostIp}:${port.publicPort} -> ${port.privatePort}/${port.protocol}`}</Typography>
 							);
 						})}
 					</Stack>
@@ -117,7 +111,6 @@ export const TabOverview = ({
 						Volumes
 					</Typography>
 					<Stack>
-						{!mounts?.length && <Typography>{PLACEHOLDER}</Typography>}
 						{mounts?.map((mount) => {
 							return (
 								<Typography key={`${mount.source}/${mount.destination}`}>
@@ -12,7 +12,7 @@ import type { Header } from "@/Components/design-elements/Table";
 import type { DockerContainerInfo } from "@/Types/Check";

 // Utils
-import { formatPercentage, PLACEHOLDER } from "@/Utils/FormatUtils";
+import { formatPercentage } from "@/Utils/FormatUtils";

 interface DockerContainersTableProps {
 	monitorId: string | undefined;
@@ -91,7 +91,7 @@ export const DockerContainersTable = ({
 				id: "restarts",
 				content: t("common.labels.restarts"),
 				render: (row) => {
-					return <Typography>{row.restartCount ?? PLACEHOLDER}</Typography>;
+					return <Typography>{row.restartCount}</Typography>;
 				},
 			},
 		];
@@ -19,7 +19,6 @@ const DockerMonitorsPage = () => {
 			controller={c}
 			bulkActions
 			showTypeFilter={false}
-			summaryProps={{ showBreached: true }}
 		>
 			<DockerMonitorsTable
 				monitors={c.monitors || []}
@@ -1,7 +1,7 @@
 import Box from "@mui/material/Box";
 import { DetailGauge } from "@/Components/design-elements";

-import { getPercentage, formatPercentageFromWhole, PLACEHOLDER } from "@/Utils/FormatUtils";
+import { getPercentage, formatPercentageFromWhole } from "@/Utils/FormatUtils";
 import prettyBytes from "pretty-bytes";
 import { useTranslation } from "react-i18next";
 import { useTheme } from "@mui/material";
@@ -11,6 +11,7 @@ interface StatGaugesProps {
 	diagnostics: Diagnostics | null;
 }

+const PLACEHOLDER = "—";

 export const StatGauges = ({ diagnostics }: StatGaugesProps) => {
 	const theme = useTheme();
@@ -6,12 +6,12 @@ import { useTheme } from "@mui/material";
 import { useTranslation } from "react-i18next";
 import type { Diagnostics } from "@/Types/Diagnostics";
 import { formatDuration, formatMs } from "@/Utils/TimeUtils";
-import { PLACEHOLDER } from "@/Utils/FormatUtils";

 interface StatsProps {
 	diagnostics: Diagnostics | null;
 }

+const PLACEHOLDER = "—";

 export const Stats = ({ diagnostics }: StatsProps) => {
 	const { t } = useTranslation();
@@ -8,7 +8,7 @@ import { useTranslation } from "react-i18next";

 const LogsPage = () => {
 	const { t } = useTranslation();
-	const [activeTab, setActiveTab] = useState<number>(0);
+	const [activeTab, setActiveTab] = useState<number>(1);
 	return (
 		<BasePage headerKey="logs">
 			<Tabs
@@ -14,7 +14,6 @@ import {
 import type { StatusPageThemeTokens } from "@/Pages/StatusPage/Status/themes/tokens";
 import { ThemedHeatmap } from "@/Pages/StatusPage/Status/themes/shared/ThemedHeatmap";
 import { ThemedHistogram } from "@/Pages/StatusPage/Status/themes/shared/ThemedHistogram";
-import { IncidentModal } from "@/Pages/StatusPage/Status/themes/shared/IncidentModal";
 import {
 	ThemedInfrastructure,
 	type GaugeFillLevel,
@@ -117,8 +116,6 @@ export const BaseStatusPage = ({
 		[config, tokens, mode]
 	);
 	const [chartMode, setChartMode] = useState<"heatmap" | "histogram">("heatmap");
-	const [selectedMonitorId, setSelectedMonitorId] = useState<string | null>(null);
-	const [selectedDate, setSelectedDate] = useState<string | null>(null);

 	const overall = resolveOverallStatus(monitors, t, config.overallStatusOptions);
 	const logoSrc = statusPage.logo?.data
@@ -309,10 +306,6 @@ export const BaseStatusPage = ({
 										cells={cells}
 										containerSx={styles.heatmap}
 										cellSx={styles.heatmapCell}
-										onCellClick={(date) => {
-											setSelectedMonitorId(monitor.id);
-											setSelectedDate(date);
-										}}
 									/>
 								) : (
 									<ThemedHistogram
@@ -320,10 +313,6 @@ export const BaseStatusPage = ({
 										containerSx={styles.histogram}
 										barSx={styles.bar}
 										statsSx={styles.chartStats}
-										onCellClick={(date) => {
-											setSelectedMonitorId(monitor.id);
-											setSelectedDate(date);
-										}}
 									/>
 								))}
 						</Box>
@@ -344,16 +333,6 @@ export const BaseStatusPage = ({
 					Checkmate
 				</a>
 			</Box>
-			<IncidentModal
-				url={statusPage.url}
-				monitorId={selectedMonitorId}
-				date={selectedDate}
-				timezone={bucketTimezone}
-				onClose={() => {
-					setSelectedMonitorId(null);
-					setSelectedDate(null);
-				}}
-			/>
 		</Box>
 	);
 };
@@ -25,7 +25,6 @@ export interface ChartCell {
 	responseTime: number; // 0 for empty cells
 	tooltip: React.ReactNode | null;
 	ariaLabel: string;
-	date: string | null;
 }

 const DAY_DOWN_THRESHOLD = 0.5;
@@ -62,7 +61,7 @@ export const classifyResponseTime = (
 	return "fast";
 };

-const emptyCell = (key: string, date: string | null = null): ChartCell => ({
+const emptyCell = (key: string): ChartCell => ({
 	key,
 	barKind: "empty",
 	heatKind: "empty",
@@ -71,7 +70,6 @@ const emptyCell = (key: string, date: string | null = null): ChartCell => ({
 	tooltip: null,
 	ariaLabel: "",
 	severity: 0,
-	date,
 });

 const padCells = (cells: ChartCell[], length: number): ChartCell[] => [
@@ -94,7 +92,6 @@ export const checksToCells = (checks: CheckSnapshot[]): ChartCell[] => {
 			tooltip: <ThemedChartTooltip check={check} />,
 			ariaLabel: `${formatMs(check.responseTime)}, ${check.status ? "up" : "down"}`,
 			severity: 0,
-			date: null,
 		})
 	);
 	return padCells(cells, MAX_RECENT_CHECKS);
@@ -111,7 +108,7 @@ export const dailyBucketsToCells = (
 	const enumerated = enumerateDays(days, bucketTimezone);
 	return enumerated.map((date) => {
 		const bucket = byDate.get(date);
-		if (!bucket) return emptyCell(`day-${date}`, date);
+		if (!bucket) return emptyCell(`day-${date}`);
 		const upRatio = bucket.upChecks / bucket.totalChecks;

 		const barKind = classifyDay(bucket, upRatio);
@@ -135,7 +132,6 @@ export const dailyBucketsToCells = (
 				date,
 				uptime: formatPercentage(bucket.upChecks / bucket.totalChecks),
 			}),
-			date,
 		};
 	});
 };
@@ -1,111 +0,0 @@
-import Dialog from "@mui/material/Dialog";
-import DialogTitle from "@mui/material/DialogTitle";
-import DialogContent from "@mui/material/DialogContent";
-import Typography from "@mui/material/Typography";
-import Stack from "@mui/material/Stack";
-import IconButton from "@mui/material/IconButton";
-import { X as XIcon } from "lucide-react";
-import { useTranslation } from "react-i18next";
-import { useGet } from "@/Hooks/UseApi";
-import { useTheme } from "@mui/material";
-import { SPACING } from "@/Utils/Theme/constants";
-import { formatDateWithTz } from "@/Utils/TimeUtils";
-
-import type { Incident } from "@/Types/Incident";
-interface IncidentModalProps {
-	url: string;
-	monitorId: string | null;
-	date: string | null;
-	timezone: string;
-	onClose: () => void;
-}
-
-export const IncidentModal = ({
-	url,
-	monitorId,
-	date,
-	timezone,
-	onClose,
-}: IncidentModalProps) => {
-	const theme = useTheme();
-	const { t } = useTranslation();
-	const open = Boolean(monitorId && date);
-
-	const { data, isLoading, error } = useGet<{ incidents: Incident[] }>(
-		open ? `/status-page/${url}/incidents/${monitorId}?date=${date}` : null,
-		{},
-		{ revalidateOnFocus: false, keepPreviousData: true }
-	);
-
-	return (
-		<Dialog
-			open={open}
-			onClose={onClose}
-			maxWidth="sm"
-			fullWidth
-		>
-			<DialogTitle
-				sx={{ display: "flex", justifyContent: "space-between", alignItems: "center" }}
-			>
-				{t("pages.statusPages.monitorsList.incidents.modalTitle", { date })} ({timezone})
-				<IconButton
-					onClick={onClose}
-					size="small"
-					aria-label="close"
-				>
-					<XIcon size={20} />
-				</IconButton>
-			</DialogTitle>
-			<DialogContent>
-				{isLoading ? (
-					<Typography mt={SPACING.SM}>
-						{t("pages.statusPages.monitorsList.incidents.loading")}
-					</Typography>
-				) : error ? (
-					<Typography
-						mt={SPACING.SM}
-						color={theme.palette.error.main}
-					>
-						{t("pages.statusPages.monitorsList.incidents.errorLoading")}
-					</Typography>
-				) : data?.incidents && data.incidents.length > 0 ? (
-					<Stack
-						gap={SPACING.LG}
-						mt={SPACING.SM}
-					>
-						{data.incidents.map((incident) => (
-							<Stack
-								key={incident.id}
-								p={SPACING.LG}
-								border={1}
-								borderColor="divider"
-								borderRadius={theme.shape.borderRadius}
-							>
-								<Typography
-									variant="subtitle2"
-									fontWeight="bold"
-								>
-									{incident.message ||
-										(incident.statusCode ? `Error ${incident.statusCode}` : "Incident")}
-								</Typography>
-								<Typography
-									variant="body2"
-									color={theme.palette.text.secondary}
-								>
-									{formatDateWithTz(incident.startTime, "h:mm A", timezone)} -{" "}
-									{incident.endTime
-										? formatDateWithTz(incident.endTime, "h:mm A", timezone)
-										: t("pages.statusPages.monitorsList.incidents.ongoing")}
-								</Typography>
-							</Stack>
-						))}
-					</Stack>
-				) : (
-					<Typography mt={SPACING.SM}>
-						{t("pages.statusPages.monitorsList.incidents.noIncidents")}
-					</Typography>
-				)}
-			</DialogContent>
-		</Dialog>
-	);
-};
@@ -2,8 +2,6 @@ import Tooltip from "@mui/material/Tooltip";
 import Box from "@mui/material/Box";
 import type { SxProps, Theme } from "@mui/material/styles";
 import { useTranslation } from "react-i18next";
-import { mergeSx } from "@/Pages/StatusPage/Status/themes/shared/sx";
-
 import type {
 	ChartCell,
 	HeatCellKind,
@@ -13,15 +11,17 @@ interface Props {
 	cells: ChartCell[];
 	containerSx: SxProps<Theme>;
 	cellSx: (kind: HeatCellKind, severity?: number) => SxProps<Theme>;
-	onCellClick?: (date: string) => void;
 }

-export const ThemedHeatmap = ({ cells, containerSx, cellSx, onCellClick }: Props) => {
+export const ThemedHeatmap = ({ cells, containerSx, cellSx }: Props) => {
 	const { t } = useTranslation();

 	return (
 		<Box
-			sx={mergeSx(containerSx, { gridTemplateColumns: `repeat(${cells.length}, 1fr)` })}
+			sx={[
+				...(Array.isArray(containerSx) ? containerSx : [containerSx]),
+				{ gridTemplateColumns: `repeat(${cells.length}, 1fr)` },
+			]}
 			role="img"
 			aria-label={t("pages.statusPages.monitorsList.chart.heatmapAria")}
 		>
@@ -30,15 +30,7 @@ export const ThemedHeatmap = ({ cells, containerSx, cellSx, onCellClick }: Props
 					return (
 						<Box
 							key={cell.key}
-							sx={mergeSx(
-								cellSx("empty"),
-								!!cell.date && !!onCellClick ? { cursor: "pointer" } : undefined
-							)}
-							onClick={() => {
-								if (cell.date && onCellClick) {
-									onCellClick(cell.date);
-								}
-							}}
+							sx={cellSx("empty")}
 						/>
 					);
 				}
@@ -50,16 +42,8 @@ export const ThemedHeatmap = ({ cells, containerSx, cellSx, onCellClick }: Props
 						placement="top"
 					>
 						<Box
-							sx={mergeSx(
-								cellSx(cell.heatKind, cell.severity),
-								!!cell.date && !!onCellClick ? { cursor: "pointer" } : undefined
-							)}
+							sx={cellSx(cell.heatKind, cell.severity)}
 							aria-label={cell.ariaLabel}
-							onClick={() => {
-								if (cell.date && onCellClick) {
-									onCellClick(cell.date);
-								}
-							}}
 						/>
 					</Tooltip>
 				);
@@ -5,8 +5,6 @@ import Stack from "@mui/material/Stack";
 import type { SxProps, Theme } from "@mui/material/styles";
 import { useTranslation } from "react-i18next";
 import { formatMs } from "@/Utils/TimeUtils";
-import { mergeSx } from "@/Pages/StatusPage/Status/themes/shared/sx";
-
 import type {
 	BarKind,
 	ChartCell,
@@ -18,7 +16,6 @@ interface Props {
 	barSx: (kind: BarKind, heightPct: number, severity?: number) => SxProps<Theme>;
 	statsSx: SxProps<Theme>;
 	statsGap?: number;
-	onCellClick?: (date: string) => void;
 }

 export const ThemedHistogram = ({
@@ -27,7 +24,6 @@ export const ThemedHistogram = ({
 	barSx,
 	statsSx,
 	statsGap = 1,
-	onCellClick,
 }: Props) => {
 	const { t } = useTranslation();

@@ -43,22 +39,17 @@ export const ThemedHistogram = ({
 	return (
 		<Stack gap={statsGap}>
 			<Box
-				sx={mergeSx(containerSx, { gridTemplateColumns: `repeat(${cells.length}, 1fr)` })}
+				sx={[
+					...(Array.isArray(containerSx) ? containerSx : [containerSx]),
+					{ gridTemplateColumns: `repeat(${cells.length}, 1fr)` },
+				]}
 			>
 				{cells.map((cell) => {
 					if (cell.barKind === "empty") {
 						return (
 							<Box
 								key={cell.key}
-								sx={mergeSx(
-									barSx("empty", cell.heightPct),
-									!!cell.date && !!onCellClick ? { cursor: "pointer" } : undefined
-								)}
-								onClick={() => {
-									if (cell.date && onCellClick) {
-										onCellClick(cell.date);
-									}
-								}}
+								sx={barSx("empty", cell.heightPct)}
 							/>
 						);
 					}
@@ -70,16 +61,8 @@ export const ThemedHistogram = ({
 							placement="top"
 						>
 							<Box
-								sx={mergeSx(
-									barSx(cell.barKind, cell.heightPct, cell.severity),
-									!!cell.date && !!onCellClick ? { cursor: "pointer" } : undefined
-								)}
+								sx={barSx(cell.barKind, cell.heightPct, cell.severity)}
 								aria-label={cell.ariaLabel}
-								onClick={() => {
-									if (cell.date && onCellClick) {
-										onCellClick(cell.date);
-									}
-								}}
 							/>
 						</Tooltip>
 					);
@@ -1,16 +0,0 @@
-import type { SxProps, Theme } from "@mui/material/styles";
-
-export const mergeSx = (
-	...styles: Array<SxProps<Theme> | false | null | undefined>
-): SxProps<Theme> => {
-	const result: SxProps<Theme>[] = [];
-	for (const style of styles) {
-		if (!style) continue;
-		if (Array.isArray(style)) {
-			result.push(...(style.filter(Boolean) as SxProps<Theme>[]));
-		} else {
-			result.push(style);
-		}
-	}
-	return result as SxProps<Theme>;
-};
@@ -8,9 +8,6 @@ import AuthRegister from "@/Pages/Auth/Register";
 import AuthForgotPassword from "@/Pages/Auth/Recovery";
 import AuthSetNewPassword from "@/Pages/Auth/SetNewPassword";

-// Dashboard
-import Dashboard from "@/Pages/Dashboard";
-
 // Uptime
 import Uptime from "@/Pages/Uptime/Monitors";
 import UptimeDetails from "@/Pages/Uptime/Details";
@@ -95,10 +92,6 @@ const Routes = () => {
 					path="/"
 					element={<Navigate to="/uptime" />}
 				/>
-				<Route
-					path="dashboard"
-					element={<Dashboard />}
-				/>
 				<Route
 					path="/uptime"
 					element={<Uptime />}
@@ -1,2 +0,0 @@
-export const dashboardCardKeys = ["monitorStatus", "monitorsByType"] as const;
-export type DashboardCardKey = (typeof dashboardCardKeys)[number];
@@ -60,15 +60,6 @@ export const monitorTypeLabelKey: Record<SelectableMonitorType, string> &
 	pagespeed: "optionPagespeed",
 };

-export const getMonitorTypeLabel = (
-	type: MonitorType,
-	t: (key: string) => string
-): string => {
-	const monitorLabel = monitorTypeLabelKey[type];
-	return monitorLabel ? t(`pages.common.monitors.monitorTypes.${monitorLabel}`) : type;
-};
-export const MIN_MONITOR_INTERVAL_MS = 10000;
-
 export const MonitorIntervalOptions = [
 	{ value: 15000, labelKey: "fifteenSeconds" },
 	{ value: 30000, labelKey: "thirtySeconds" },
@@ -169,8 +160,6 @@ export interface Monitor {
 	geoCheckLocations?: GeoContinent[];
 	geoCheckInterval?: number;
 	dockerLogsEnabled?: boolean;
-	dockerAlertOnStopped?: boolean;
-	dockerAlertOnUnhealthy?: boolean;
 	dockerTlsCa?: string;
 	dockerTlsCert?: string;
 	dockerTlsKeySet?: boolean;
@@ -194,11 +183,6 @@ export interface MonitorsSummary {
 	breachedMonitors: number;
 }

-export interface MonitorTypeCount {
-	type: MonitorType;
-	count: number;
-}
-
 export interface MonitorsWithChecksResponse {
 	count: number;
 	monitors: MonitorWithChecks[];
@@ -47,6 +47,3 @@ export const getPercentage = (value: number, total: number) => {
 	if (!value || !total) return 0;
 	return (value / total) * 100;
 };
-
-// Shown wherever a value is not available for the current data source.
-export const PLACEHOLDER = "—";
@@ -20,7 +20,7 @@ export const getMonitorPath = (type: MonitorType): string => {
 		websocket: "uptime",
 		dns: "uptime",
 		unknown: "uptime",
-		docker: "docker/host",
+		docker: "docker",
 		hardware: "infrastructure",
 		pagespeed: "pagespeed",
 	};
@@ -85,10 +85,6 @@ export const lightPalette = {
 	sidebar: {
 		accent: colors.brandGreen,
 	},
-	scrollbar: {
-		track: colors.rule200,
-		thumb: colors.brandGreen,
-	},
 	rowStatus: {
 		running: colors.green200,
 		paused: colors.yellow200,
@@ -141,10 +137,6 @@ export const darkPalette = {
 	sidebar: {
 		accent: colors.brandGreenLight,
 	},
-	scrollbar: {
-		track: colors.ruleDark,
-		thumb: colors.brandGreen,
-	},
 	rowStatus: {
 		running: alpha(colors.brandGreen, 0.18),
 		paused: alpha(colors.orange500, 0.18),
@@ -3,7 +3,6 @@ import { lightPalette, darkPalette, typographyLevels } from "@/Utils/Theme/Palet

 import type { Theme } from "@mui/material/styles";
 import type {} from "@mui/material/styles";
-import { SCROLLBAR_SIZE } from "@/Utils/Theme/constants";

 declare module "@mui/material/styles" {
 	interface TypographyVariants {
@@ -21,7 +20,6 @@ declare module "@mui/material/styles" {
 	}
 	interface Palette {
 		sidebar: { accent: string };
-		scrollbar: { track: string; thumb: string };
 		rowStatus: { running: string; paused: string };
 		chart: {
 			phases: {
@@ -36,7 +34,6 @@ declare module "@mui/material/styles" {
 	}
 	interface PaletteOptions {
 		sidebar?: { accent: string };
-		scrollbar?: { track: string; thumb: string };
 		rowStatus?: { running: string; paused: string };
 		chart?: {
 			phases: {
@@ -115,27 +112,6 @@ export const theme = (mode: string, palette: any) =>
 		},

 		components: {
-			MuiCssBaseline: {
-				styleOverrides: (theme) => ({
-					"*": {
-						scrollbarWidth: "auto",
-						scrollbarColor: `${theme.palette.scrollbar.thumb} ${theme.palette.scrollbar.track}`,
-					},
-					"*::-webkit-scrollbar": {
-						width: SCROLLBAR_SIZE,
-						height: SCROLLBAR_SIZE,
-					},
-					"*::-webkit-scrollbar-track": {
-						background: theme.palette.scrollbar.track,
-						borderRadius: theme.shape.borderRadius,
-					},
-					"*::-webkit-scrollbar-thumb": {
-						background: theme.palette.scrollbar.thumb,
-						borderRadius: theme.shape.borderRadius,
-					},
-					"*::-webkit-scrollbar-button": { display: "none" },
-				}),
-			},
 			MuiTouchRipple: {
 				styleOverrides: {
 					root: {
@@ -19,7 +19,7 @@ export const LAYOUT = {
 } as const;

 export const INPUT_BASE_HEIGHT = 32; // Height for inputs/controls
-export const SCROLLBAR_SIZE = 16;
+
 export const HOVER = {
 	DARKEN: 0.06, // This is a coefficient for darkening function
 	ROW: 0.025, // Overlay alpha for hoverable rows and cards
@@ -104,52 +104,9 @@ export const formatMs = (ms: number, hasSpace: boolean = true): string => {
 	return formatted;
 };

-type DurationUnit = "day" | "hour" | "minute" | "second";
-
-interface FormatDurationOptions {
-	long?: boolean;
-	relative?: boolean;
-	hasSpace?: boolean;
-	locale?: string;
-}
-
-const DURATION_UNITS: Array<{ unit: DurationUnit; milliseconds: number }> = [
-	{ unit: "day", milliseconds: MS_PER_DAY },
-	{ unit: "hour", milliseconds: MS_PER_HOUR },
-	{ unit: "minute", milliseconds: MS_PER_MINUTE },
-	{ unit: "second", milliseconds: MS_PER_SECOND },
-];
-
-const FALLBACK_DURATION_UNIT = DURATION_UNITS[DURATION_UNITS.length - 1];
-
-const getDurationUnit = (ms: number) =>
-	DURATION_UNITS.find(({ milliseconds }) => Math.abs(ms) >= milliseconds) ??
-	FALLBACK_DURATION_UNIT;
-
-const getExactDurationUnit = (ms: number) =>
-	DURATION_UNITS.find(({ milliseconds }) => ms !== 0 && ms % milliseconds === 0) ??
-	FALLBACK_DURATION_UNIT;
-
-export const formatDuration = (
-	ms: number,
-	{ long = false, relative = false, hasSpace = true, locale }: FormatDurationOptions = {}
-): string => {
-	if (relative) {
-		const { unit, milliseconds } = getDurationUnit(ms);
-		const value = Math.sign(ms) * Math.floor(Math.abs(ms) / milliseconds);
-		return new Intl.RelativeTimeFormat(locale, {
-			numeric: "always",
-			style: long ? "long" : "narrow",
-		}).format(-value, unit);
-	}
-
-	if (long) {
-		const { unit, milliseconds } = getExactDurationUnit(ms);
-		return new Intl.NumberFormat(locale, {
-			style: "unit",
-			unit,
-			unitDisplay: "long",
-		}).format(ms / milliseconds);
+export const formatDuration = (ms: number, verbose: boolean = false, hasSpace = true) => {
+	if (verbose) {
+		return prettyMilliseconds(ms, { verbose: true });
 	}

 	const formatted = prettyMilliseconds(ms, {
@@ -6,7 +6,6 @@ import {
 	HttpMethods,
 	PageSpeedStrategies,
 	ProxyModes,
-	MIN_MONITOR_INTERVAL_MS,
 	type MonitorType,
 } from "@/Types/Monitor";
 import { ALL_HTTP_STATUS_CODES } from "@/Utils/statusCode";
@@ -28,8 +27,7 @@ const baseSchema = z.object({
 	description: z.string().optional(),
 	interval: z
 		.number()
-		.int("Interval must be a whole number of milliseconds")
-		.min(MIN_MONITOR_INTERVAL_MS, "Interval must be at least 10 seconds")
+		.min(15000, "Interval must be at least 15 seconds")
 		.register(monitorStepRegistry, { step: 1 }),
 	notifications: z.array(z.string()).register(monitorStepRegistry, { step: 1 }),
 	tags: z.array(z.string()).register(monitorStepRegistry, { step: 1 }),
@@ -110,40 +108,23 @@ const portSchema = baseSchema.extend({
 		.max(65535, "Port must be at most 65535"),
 });

-// Docker monitor schema. The URL forms mirror the Docker source helpers in
-// server/src/utils/dockerHost.ts.
+// Docker monitor schema. The url forms mirror DOCKER_TLS_URL and
+// DOCKER_SOCKET_URL in server/src/utils/dockerHost.ts.
 const dockerTlsUrlRegex = /^(tcp|https):\/\/([^/\s:]+)(?::(\d+))?\/?$/;
 const dockerSocketUrlRegex = /^(?:unix:\/\/\/\S+|\/\S+)$/;

 export const isDockerTlsUrl = (url: string | undefined): boolean =>
 	dockerTlsUrlRegex.test(url?.trim() ?? "");

-export const isCaptureDockerUrl = (url: string | undefined): boolean => {
-	try {
-		const parsed = new URL(url?.trim() ?? "");
-		const pathname = parsed.pathname.replace(/\/+$/, "");
-		return (
-			(parsed.protocol === "http:" || parsed.protocol === "https:") &&
-			pathname.endsWith("/metrics/docker")
-		);
-	} catch {
-		return false;
-	}
-};
-
 const dockerSchema = baseSchema.extend({
 	type: z.literal("docker"),
 	url: z
 		.string()
 		.min(1, "Docker host URL is required")
 		.refine(
-			(url) =>
-				dockerSocketUrlRegex.test(url.trim()) ||
-				isDockerTlsUrl(url) ||
-				isCaptureDockerUrl(url),
-			"Docker host must be a socket path, a TLS daemon URL, or a Capture /metrics/docker endpoint"
+			(url) => dockerSocketUrlRegex.test(url.trim()) || isDockerTlsUrl(url),
+			"Docker host must be unix:///path, an absolute socket path, or tcp://host[:port]"
 		),
-	secret: z.string(),
 	ignoreTlsErrors: z.boolean(),
 	dockerTlsCa: z.string(),
 	dockerTlsCert: z.string(),
@@ -152,8 +133,6 @@ const dockerSchema = baseSchema.extend({
 	// Read only mirror of the server flag, stripped on submit
 	dockerTlsKeySet: z.boolean(),
 	dockerLogsEnabled: z.boolean().register(monitorStepRegistry, { step: 1 }),
-	dockerAlertOnStopped: z.boolean().register(monitorStepRegistry, { step: 1 }),
-	dockerAlertOnUnhealthy: z.boolean().register(monitorStepRegistry, { step: 1 }),
 });

 // Game server monitor schema
@@ -269,14 +248,6 @@ export const monitorSchema = monitorSchemaUnion.superRefine((data, ctx) => {
 		});
 	}

-	if (data.type === "docker" && isCaptureDockerUrl(data.url) && !data.secret.trim()) {
-		ctx.addIssue({
-			code: "custom",
-			path: ["secret"],
-			message: "Capture API secret is required",
-		});
-	}
-
 	if (data.type === "docker" && isDockerTlsUrl(data.url)) {
 		if (!data.dockerTlsCert.trim()) {
 			ctx.addIssue({
@@ -1377,9 +1377,6 @@
 					"maintenance": "صيانة",
 					"paused": "متوقف مؤقتاً",
 					"up": "قيد التشغيل"
-				},
-				"incidents": {
-					"errorLoading": "فشل تحميل الحوادث."
 				}
 			},
 			"statusBar": {
@@ -1377,9 +1377,6 @@
 				"uptime": {
 					"title": "Temps en línia",
 					"responseTime": "Temps de resposta"
-				},
-				"incidents": {
-					"errorLoading": "No s'han pogut carregar les incidències."
 				}
 			},
 			"statusBar": {
@@ -1377,9 +1377,6 @@
 					"maintenance": "Údržba",
 					"paused": "Pozastaveno",
 					"up": "V provozu"
-				},
-				"incidents": {
-					"errorLoading": "Nepodařilo se načíst incidenty."
 				}
 			},
 			"statusBar": {
@@ -448,7 +448,6 @@
 				},
 				"statBoxes": {
 					"activeFor": "Aktiv seit",
-					"checkingEvery": "Check alle {{interval}}",
 					"certificateExpiry": "Zertifikatablauf",
 					"lastCheck": "Letzter Check",
 					"lastResponseTime": "Letzte Antwortzeit",
@@ -1378,9 +1377,6 @@
 					"maintenance": "Wartung",
 					"paused": "Pausiert",
 					"up": "Betriebsbereit"
-				},
-				"incidents": {
-					"errorLoading": "Vorfälle konnten nicht geladen werden."
 				}
 			},
 			"statusBar": {
@@ -226,8 +226,7 @@
 					"alerting": "Alerting",
 					"reporting": "Reporting",
 					"configuration": "Configuration"
-				},
-				"dashboard": "Dashboard"
+				}
 			},
 			"bottomMenu": {
 				"support": "Support",
@@ -548,7 +547,6 @@
 				},
 				"statBoxes": {
 					"activeFor": "Active for",
-					"checkingEvery": "Checking every {{interval}}",
 					"certificateExpiry": "Certificate expiry",
 					"domainExpiry": "Domain expiry",
 					"lastCheck": "Last check",
@@ -557,7 +555,7 @@
 				},
 				"status": {
 					"down": "down",
-					"breached": "alert",
+					"breached": "threshold exceeded",
 					"initializing": "initializing",
 					"maintenance": "maintenance",
 					"paused": "paused",
@@ -720,7 +718,7 @@
 						"http": "Enter the URL or IP to monitor (e.g., https://example.com/ or 192.168.1.100) and add a clear display name that appears on the dashboard.  Set an optional proxy server to connect through.",
 						"ping": "Enter the IP address or hostname to ping (e.g., 192.168.1.100 or example.com) and add a clear display name that appears on the dashboard.",
 						"port": "Enter the URL or IP of the server, the port number and a clear display name that appears on the dashboard.",
-						"docker": "Enter a Docker socket such as unix:///var/run/docker.sock, a remote daemon such as tcp://host:2376 with TLS client certificates, or a Capture endpoint ending in /metrics/docker with its authorization secret. Every container on the host is monitored.",
+						"docker": "Enter the Docker socket to monitor, as unix:///var/run/docker.sock or an absolute path such as /var/run/docker.sock, or a remote daemon as tcp://host:2376 to connect with TLS client certificates. Every container on the host is monitored.",
 						"game": "Enter the IP address or hostname and the port number to ping (e.g., 192.168.1.100 or example.com) and choose game type. Some games require enabling server queries in their config file — check your game server's documentation. See the <gamedigLink>supported games list</gamedigLink> for protocol details.",
 						"pagespeed": "Track page load performance, Core Web Vitals, and optimization scores for your website.",
 						"grpc": "Enter the hostname and port of the gRPC server, optionally specify a service name for the health check, and add a display name.",
@@ -827,18 +825,6 @@
 						}
 					}
 				},
-				"dockerAlerts": {
-					"title": "Container alerts",
-					"description": "Mark this host as breached while any container on it is stopped or failing its health check, and notify on the change. Containers that exit with code 0 do not count as stopped. Capture does not report exit codes, so on Capture hosts every stopped container counts.",
-					"option": {
-						"onStopped": {
-							"label": "Alert when a container is stopped"
-						},
-						"onUnhealthy": {
-							"label": "Alert when a container is unhealthy"
-						}
-					}
-				},
 				"stats": {
 					"title": "Monitor history",
 					"description": "Clear all monitoring history and statistics for your team. This action is irreversible.",
@@ -1697,7 +1683,7 @@
 				"status": {
 					"up": "Operational",
 					"down": "Down",
-					"breached": "Alert",
+					"breached": "Threshold exceeded",
 					"maintenance": "Maintenance",
 					"paused": "Paused",
 					"initializing": "Initializing"
@@ -1724,26 +1710,19 @@
 				"uptime": {
 					"title": "Uptime",
 					"responseTime": "Response time"
-				},
-				"incidents": {
-					"modalTitle": "Incidents for {{date}}",
-					"loading": "Loading...",
-					"noIncidents": "No incidents reported for this day.",
-					"ongoing": "Ongoing",
-					"errorLoading": "Failed to load incidents."
 				}
 			},
 			"statusBar": {
 				"monitoringSummary": "Monitoring {{count}} service · Updates every 10 seconds",
 				"monitoringSummary_other": "Monitoring {{count}} services · Updates every 10 seconds",
 				"allUp": "All systems operational",
-				"allBreached": "All systems have active alerts",
+				"allBreached": "All systems have exceeded thresholds",
 				"allMaintenance": "All systems are under maintenance",
 				"allDown": "All systems are down",
 				"allPaused": "All systems are paused",
 				"allInitializing": "All systems are initializing",
-				"breachedAndDown": "Some systems have active alerts and some are down",
-				"breached": "Some systems have active alerts",
+				"breachedAndDown": "Some systems have exceeded thresholds and are down",
+				"breached": "Some systems have exceeded thresholds",
 				"degraded": "Some systems are experiencing issues",
 				"maintenanceAndDown": "Some systems are down during maintenance",
 				"maintenance": "Some systems are under maintenance",
@@ -1928,26 +1907,6 @@
 				"title": "Uptime monitors",
 				"description": "Watch HTTP endpoints, pings, containers, and ports — and get alerted the moment something goes down."
 			}
-		},
-		"dashboard": {
-			"noData": "No data available at this moment.",
-			"monitorStatus": {
-				"ofUp": "of {{total}} up"
-			},
-			"cards": {
-				"monitorStatus": "Monitor status",
-				"monitorsByType": "Monitors by type"
-			},
-			"header": {
-				"title": "Dashboard",
-				"description": "See every monitor type in one place and spot what needs attention."
-			},
-			"editCards": "Edit cards",
-			"editCardsModal": {
-				"title": "Edit cards",
-				"description": "Select the cards to display on your dashboard.",
-				"done": "Done"
-			}
 		}
 	}
 }
@@ -1377,9 +1377,6 @@
 					"maintenance": "Mantenimiento",
 					"paused": "Pausado",
 					"up": "Operativo"
-				},
-				"incidents": {
-					"errorLoading": "Error al cargar incidentes."
 				}
 			},
 			"statusBar": {
@@ -1377,9 +1377,6 @@
 					"maintenance": "Huolto",
 					"paused": "Keskeytetty",
 					"up": "Toiminnassa"
-				},
-				"incidents": {
-					"errorLoading": "Häiriöiden lataaminen epäonnistui."
 				}
 			},
 			"statusBar": {
@@ -1377,9 +1377,6 @@
 					"maintenance": "Maintenance",
 					"paused": "En pause",
 					"up": "Opérationnel"
-				},
-				"incidents": {
-					"errorLoading": "Échec du chargement des incidents."
 				}
 			},
 			"statusBar": {
@@ -1473,9 +1473,6 @@
 				"uptime": {
 					"title": "Uptime",
 					"responseTime": "Tempo di risposta"
-				},
-				"incidents": {
-					"errorLoading": "Impossibile caricare gli incidenti."
 				}
 			},
 			"statusBar": {
@@ -1377,9 +1377,6 @@
 					"maintenance": "メンテナンス",
 					"paused": "一時停止中",
 					"up": "稼働中"
-				},
-				"incidents": {
-					"errorLoading": "インシデントの読み込みに失敗しました。"
 				}
 			},
 			"statusBar": {
@@ -1584,9 +1584,6 @@
 				"uptime": {
 					"responseTime": "Czas odpowiedzi",
 					"title": "Czas pracy"
-				},
-				"incidents": {
-					"errorLoading": "Nie udało się załadować incydentów."
 				}
 			},
 			"preview": {
@@ -1377,9 +1377,6 @@
 					"maintenance": "Manutenção",
 					"paused": "Pausado",
 					"up": "Operacional"
-				},
-				"incidents": {
-					"errorLoading": "Falha ao carregar incidentes."
 				}
 			},
 			"statusBar": {
@@ -1377,9 +1377,6 @@
 					"maintenance": "Обслуживание",
 					"paused": "Приостановлено",
 					"up": "Работает"
-				},
-				"incidents": {
-					"errorLoading": "Не удалось загрузить инциденты."
 				}
 			},
 			"statusBar": {
@@ -1377,9 +1377,6 @@
 					"maintenance": "การบำรุงรักษา",
 					"paused": "หยุดชั่วคราว",
 					"up": "ใช้งานได้"
-				},
-				"incidents": {
-					"errorLoading": "ไม่สามารถโหลดเหตุการณ์ได้"
 				}
 			},
 			"statusBar": {
@@ -1377,9 +1377,6 @@
 					"maintenance": "Bakım",
 					"paused": "Duraklatıldı",
 					"up": "Çalışıyor"
-				},
-				"incidents": {
-					"errorLoading": "Olaylar yüklenemedi."
 				}
 			},
 			"statusBar": {
@@ -1377,9 +1377,6 @@
 					"maintenance": "Обслуговування",
 					"paused": "Призупинено",
 					"up": "Працює"
-				},
-				"incidents": {
-					"errorLoading": "Не вдалося завантажити інциденти."
 				}
 			},
 			"statusBar": {
@@ -1377,9 +1377,6 @@
 					"maintenance": "Bảo trì",
 					"paused": "Tạm dừng",
 					"up": "Hoạt động"
-				},
-				"incidents": {
-					"errorLoading": "Không thể tải sự cố."
 				}
 			},
 			"statusBar": {
@@ -1378,9 +1378,6 @@
 					"maintenance": "维护中",
 					"paused": "已暂停",
 					"up": "运行中"
-				},
-				"incidents": {
-					"errorLoading": "无法加载事件。"
 				}
 			},
 			"statusBar": {
@@ -1377,9 +1377,6 @@
 					"maintenance": "維護中",
 					"paused": "已暫停",
 					"up": "運行中"
-				},
-				"incidents": {
-					"errorLoading": "無法載入事件。"
 				}
 			},
 			"statusBar": {
@@ -466,12 +466,6 @@
 					"dockerLogsEnabled": {
 						"type": "boolean"
 					},
-					"dockerAlertOnStopped": {
-						"type": "boolean"
-					},
-					"dockerAlertOnUnhealthy": {
-						"type": "boolean"
-					},
 					"dockerTlsCa": {
 						"type": "string"
 					},
@@ -529,8 +523,6 @@
 					"geoCheckLocations",
 					"geoCheckInterval",
 					"dockerLogsEnabled",
-					"dockerAlertOnStopped",
-					"dockerAlertOnUnhealthy",
 					"teamId",
 					"userId",
 					"createdAt",
@@ -702,12 +694,6 @@
 									"dockerLogsEnabled": {
 										"type": "boolean"
 									},
-									"dockerAlertOnStopped": {
-										"type": "boolean"
-									},
-									"dockerAlertOnUnhealthy": {
-										"type": "boolean"
-									},
 									"dockerTlsCa": {
 										"type": "string"
 									},
@@ -767,8 +753,6 @@
 									"geoCheckLocations",
 									"geoCheckInterval",
 									"dockerLogsEnabled",
-									"dockerAlertOnStopped",
-									"dockerAlertOnUnhealthy",
 									"teamId",
 									"userId",
 									"createdAt",
@@ -7202,12 +7186,6 @@
 														"dockerLogsEnabled": {
 															"type": "boolean"
 														},
-														"dockerAlertOnStopped": {
-															"type": "boolean"
-														},
-														"dockerAlertOnUnhealthy": {
-															"type": "boolean"
-														},
 														"dockerTlsCa": {
 															"type": "string"
 														},
@@ -7267,8 +7245,6 @@
 														"geoCheckLocations",
 														"geoCheckInterval",
 														"dockerLogsEnabled",
-														"dockerAlertOnStopped",
-														"dockerAlertOnUnhealthy",
 														"teamId",
 														"userId",
 														"createdAt",
@@ -7785,12 +7761,6 @@
 														"dockerLogsEnabled": {
 															"type": "boolean"
 														},
-														"dockerAlertOnStopped": {
-															"type": "boolean"
-														},
-														"dockerAlertOnUnhealthy": {
-															"type": "boolean"
-														},
 														"dockerTlsCa": {
 															"type": "string"
 														},
@@ -7850,8 +7820,6 @@
 														"geoCheckLocations",
 														"geoCheckInterval",
 														"dockerLogsEnabled",
-														"dockerAlertOnStopped",
-														"dockerAlertOnUnhealthy",
 														"teamId",
 														"userId",
 														"createdAt",
@@ -9340,12 +9308,6 @@
 									"dockerLogsEnabled": {
 										"type": "boolean"
 									},
-									"dockerAlertOnStopped": {
-										"type": "boolean"
-									},
-									"dockerAlertOnUnhealthy": {
-										"type": "boolean"
-									},
 									"dockerTlsCa": {
 										"anyOf": [
 											{
@@ -10071,14 +10033,6 @@
 													"type": "boolean",
 													"default": false
 												},
-												"dockerAlertOnStopped": {
-													"type": "boolean",
-													"default": false
-												},
-												"dockerAlertOnUnhealthy": {
-													"type": "boolean",
-													"default": false
-												},
 												"dnsServer": {
 													"type": "string",
 													"minLength": 1
@@ -10646,12 +10600,6 @@
 									"dockerLogsEnabled": {
 										"type": "boolean"
 									},
-									"dockerAlertOnStopped": {
-										"type": "boolean"
-									},
-									"dockerAlertOnUnhealthy": {
-										"type": "boolean"
-									},
 									"dockerTlsCa": {
 										"anyOf": [
 											{
@@ -13346,25 +13294,6 @@
 									"globalProxyId": {
 										"type": "string",
 										"nullable": true
-									},
-									"egressCheckEnabled": {
-										"type": "boolean"
-									},
-									"egressCheckTargets": {
-										"type": "array",
-										"items": {
-											"type": "string",
-											"minLength": 1,
-											"maxLength": 253
-										},
-										"maxItems": 10
-									},
-									"egressNotifications": {
-										"type": "array",
-										"items": {
-											"type": "string",
-											"pattern": "^[0-9a-fA-F]{24}$"
-										}
 									}
 								}
 							}
@@ -18,7 +18,6 @@
 				"compression": "1.8.1",
 				"cookie-parser": "^1.4.7",
 				"cors": "^2.8.5",
-				"dayjs": "^1.11.23",
 				"dockerode": "5.0.0",
 				"dotenv": "^16.4.5",
 				"express": "^4.19.2",
@@ -5804,12 +5803,6 @@
 				"node": ">=18"
 			}
 		},
-		"node_modules/dayjs": {
-			"version": "1.11.23",
-			"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.23.tgz",
-			"integrity": "sha512-QDTCU0M0MxR3hQfnlDJfwekQiaanm1ubOD231u73WBckQ/fsamwRLiE2GBz6D3a/xF1NgfiDLJjXBa1hYOYTtQ==",
-			"license": "MIT"
-		},
 		"node_modules/debug": {
 			"version": "4.4.3",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
@@ -15,7 +15,7 @@
 		"worker": "QUEUE_MODE=worker node ./dist/index.js",
 		"worker:dev": "QUEUE_MODE=worker nodemon --exec tsx src/index.js",
 		"clean": "rm -rf dist",
-		"build": "npm run clean && npm run build:openapi && tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && cp -r src/templates dist/templates && mkdir -p dist/service && cp -r src/service/protos dist/service/",
+		"build": "npm run clean && npm run build:openapi && tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && cp -r src/templates dist/templates",
 		"typeCheck": "tsc --noEmit",
 		"build:openapi": "tsc --noEmit && tsx scripts/buildOpenApi.ts",
 		"lint": "eslint .",
@@ -42,7 +42,6 @@
 		"compression": "1.8.1",
 		"cookie-parser": "^1.4.7",
 		"cors": "^2.8.5",
-		"dayjs": "^1.11.23",
 		"dockerode": "5.0.0",
 		"dotenv": "^16.4.5",
 		"express": "^4.19.2",
@@ -35,18 +35,11 @@ class NotificationController implements INotificationController {

 	testNotification = catchAsync(async (req: Request, res: Response) => {
 		const notification = testNotificationBodyValidation.parse(req.body);
-		let success = false;
-		let reason: string | undefined;
-		try {
-			success = await this.notificationsService.sendTestNotification(notification);
-		} catch (error: unknown) {
-			if (!(error instanceof AppError)) throw error;
-			reason = error.message;
-		}
+		const success = await this.notificationsService.sendTestNotification(notification);

 		return res.status(200).json({
 			success,
-			msg: success ? "Notification sent successfully" : (reason ?? "Notification could not be sent — check the destination details."),
+			msg: success ? "Notification sent successfully" : "Notification could not be sent — check the destination details.",
 			details: { service: SERVICE_NAME },
 		});
 	});
@@ -6,11 +6,8 @@ import { AppError } from "@/utils/AppError.js";
 import { ISettingsService } from "@/domain/app-settings/app-settings.service.js";
 import { IEmailService } from "@/service/emailService.js";
 import { IProxiesService } from "@/domain/proxies/proxy.service.js";
-import { IEgressStateService } from "@/domain/egress/egress-state.service.js";
 import { Settings } from "@/domain/app-settings/app-settings.type.js";

-const SERVICE_NAME = "SettingsController";
-
 export interface ISettingsController {
 	getAppSettings: RequestHandler;
 	updateAppSettings: RequestHandler;
@@ -21,17 +18,10 @@ class SettingsController implements ISettingsController {
 	private settingsService: ISettingsService;
 	private emailService: IEmailService;
 	private proxiesService: IProxiesService;
-	private egressStateService: IEgressStateService;
-	constructor(
-		settingsService: ISettingsService,
-		emailService: IEmailService,
-		proxiesService: IProxiesService,
-		egressStateService: IEgressStateService
-	) {
+	constructor(settingsService: ISettingsService, emailService: IEmailService, proxiesService: IProxiesService) {
 		this.settingsService = settingsService;
 		this.emailService = emailService;
 		this.proxiesService = proxiesService;
-		this.egressStateService = egressStateService;
 	}

 	buildAppSettings = async (dbSettings: Settings) => {
@@ -80,14 +70,7 @@ class SettingsController implements ISettingsController {
 			}
 		}

-		const previousSettings = await this.settingsService.getDBSettings();
 		const updatedSettings = await this.settingsService.updateDbSettings(validatedBody);
-
-		// Switching the egress check on or off starts from a clean state: no degraded episode, no pending recovery job
-		if (validatedBody.egressCheckEnabled !== undefined && validatedBody.egressCheckEnabled !== previousSettings.egressCheckEnabled) {
-			await this.egressStateService.reset();
-		}
-
 		const returnSettings = await this.buildAppSettings(updatedSettings);
 		return res.status(200).json({
 			success: true,
@@ -121,7 +104,7 @@ class SettingsController implements ISettingsController {

 		const html = await this.emailService.buildEmail("testEmailTemplate", context);
 		if (!html) {
-			throw new AppError({ message: "Failed to build email template.", status: 500, service: SERVICE_NAME, method: "sendTestEmail" });
+			throw new AppError({ message: "Failed to build email template.", status: 500 });
 		}
 		let messageId: string;
 		try {
@@ -144,11 +127,8 @@ class SettingsController implements ISettingsController {
 			// Surface the underlying SMTP failure: diagnosing the settings is the whole
 			// point of the test email endpoint.
 			throw new AppError({
-				message: error instanceof AppError ? error.message : "Failed to send test email.",
-				status: error instanceof AppError ? error.status : 500,
-				service: SERVICE_NAME,
-				method: "sendTestEmail",
-				details: error instanceof AppError ? error.details : undefined,
+				message: error instanceof Error ? `Failed to send test email. ${error.message}` : "Failed to send test email.",
+				status: 500,
 			});
 		}

@@ -7,8 +7,6 @@ import {
 	getStatusPageQueryValidation,
 	imageValidation,
 	resolveStatusPageQueryValidation,
-	getPublicMonitorIncidentsParamValidation,
-	getPublicMonitorIncidentsQueryValidation,
 } from "@/api/validation/statusPageValidation.js";
 import { AppError } from "@/utils/AppError.js";
 import { requireTeamId, requireUserId } from "@/api/controllers/controllerUtils.js";
@@ -19,7 +17,6 @@ export interface IStatusPageController {
 	createStatusPage: RequestHandler;
 	updateStatusPage: RequestHandler;
 	getStatusPageByUrl: RequestHandler;
-	getPublicMonitorIncidents: RequestHandler;
 	resolveStatusPageByDomain: RequestHandler;
 	getStatusPagesByTeamId: RequestHandler;
 	deleteStatusPage: RequestHandler;
@@ -88,19 +85,6 @@ class StatusPageController implements IStatusPageController {
 		});
 	});

-	getPublicMonitorIncidents = catchAsync(async (req: Request, res: Response) => {
-		const { url, monitorId } = getPublicMonitorIncidentsParamValidation.parse(req.params);
-		const { date } = getPublicMonitorIncidentsQueryValidation.parse(req.query);
-
-		const incidents = await this.statusPageService.getPublicMonitorIncidents(url, monitorId, date, req.user?.teamId);
-
-		return res.status(200).json({
-			success: true,
-			msg: "Incidents retrieved successfully",
-			data: { incidents },
-		});
-	});
-
 	resolveStatusPageByDomain = catchAsync(async (req: Request, res: Response) => {
 		const { range } = resolveStatusPageQueryValidation.parse(req.query);
 		const domain = resolveStatusPageDomainFromRequest(req.hostname, req.query.domain as string | undefined);
@@ -16,15 +16,7 @@ export const isPublicStatusPageApiPath = (method: string, path: string): boolean
 		return true;
 	}

-	if (!slug || slug === "team") {
-		return false;
-	}
-
-	if (slug.includes("/")) {
-		const parts = slug.split("/");
-		if (parts.length === 3 && parts[1] === "incidents") {
-			return true;
-		}
+	if (!slug || slug === "team" || slug.includes("/")) {
 		return false;
 	}

@@ -14,7 +14,6 @@ export const createStatusPageRoutes = (
 	router.put("/:id", imageUpload.single("logo"), verifyJWT, isAllowed(["admin", "superadmin"]), statusPageController.updateStatusPage);
 	router.get("/resolve", statusPageController.resolveStatusPageByDomain);
 	router.get("/:url", verifyStatusPageAccess, statusPageController.getStatusPageByUrl);
-	router.get("/:url/incidents/:monitorId", verifyStatusPageAccess, statusPageController.getPublicMonitorIncidents);
 	router.delete("/:id", verifyJWT, isAllowed(["admin", "superadmin"]), statusPageController.deleteStatusPage);
 	return router;
 };
@@ -15,7 +15,7 @@ import {
 import { DateRanges, SortOrders } from "@/types/query.js";
 import { DockerContainerStates, DockerHealthStatuses, DockerLogStreams, DockerPortProtocols } from "@/domain/docker/docker.type.js";
 import { DOCKER_LOG_PAGE_DEFAULT, DOCKER_LOG_PAGE_MAX } from "@/domain/docker/docker-log.type.js";
-import { isCaptureDockerUrl, isDockerSocketUrl, isDockerTlsUrl } from "@/utils/dockerHost.js";
+import { isDockerSocketUrl, isDockerTlsUrl } from "@/utils/dockerHost.js";
 import { X509Certificate } from "node:crypto";
 import { keyMatchesCertificate, parseCertificates, parsePrivateKey } from "@/utils/pem.js";

@@ -125,21 +125,15 @@ const refineProxySelection = (body: { proxyMode?: string; proxyId?: string }, ct

 const refineDockerUrl = (data: { type?: string; url?: string }, ctx: z.RefinementCtx) => {
 	if (data.type !== "docker" || data.url === undefined) return;
-	if (!isDockerSocketUrl(data.url) && !isDockerTlsUrl(data.url) && !isCaptureDockerUrl(data.url)) {
+	if (!isDockerSocketUrl(data.url) && !isDockerTlsUrl(data.url)) {
 		ctx.addIssue({
 			code: "custom",
 			path: ["url"],
-			message: "Docker host must be a socket path, a TLS daemon URL, or a Capture /metrics/docker endpoint",
+			message: "Docker host must be unix:///path, an absolute socket path, or tcp://host[:port]",
 		});
 	}
 };

-// Edits are checked in the monitor service against the stored secret, since the body may omit either the url or the secret.
-const refineCaptureSecret = (data: { type?: string; url?: string; secret?: string }, ctx: z.RefinementCtx) => {
-	if (data.type !== "docker" || !isCaptureDockerUrl(data.url)) return;
-	if (!data.secret?.trim()) ctx.addIssue({ code: "custom", path: ["secret"], message: "Capture API secret is required" });
-};
-
 type DockerTlsFields = {
 	type?: string;
 	url?: string;
@@ -220,8 +214,6 @@ export const createMonitorBodyValidation = z
 		geoCheckLocations: z.array(z.enum(GeoContinents)).optional(),
 		geoCheckInterval: z.number().min(300000).optional(),
 		dockerLogsEnabled: z.boolean().optional(),
-		dockerAlertOnStopped: z.boolean().optional(),
-		dockerAlertOnUnhealthy: z.boolean().optional(),
 		dockerTlsCa: z.union([z.string(), z.literal("")]).optional(),
 		dockerTlsCert: z.union([z.string(), z.literal("")]).optional(),
 		dockerTlsKey: z.union([z.string(), z.literal("")]).optional(),
@@ -234,7 +226,6 @@ export const createMonitorBodyValidation = z
 	.superRefine(refineRegexPattern)
 	.superRefine(refineProxySelection)
 	.superRefine(refineDockerUrl)
-	.superRefine(refineCaptureSecret)
 	.superRefine(refineDockerTls("create"));

 export const editMonitorBodyValidation = z
@@ -272,8 +263,6 @@ export const editMonitorBodyValidation = z
 		geoCheckLocations: z.array(z.enum(GeoContinents)).optional(),
 		geoCheckInterval: z.number().min(300000).optional(),
 		dockerLogsEnabled: z.boolean().optional(),
-		dockerAlertOnStopped: z.boolean().optional(),
-		dockerAlertOnUnhealthy: z.boolean().optional(),
 		dockerTlsCa: z.union([z.string(), z.literal("")]).optional(),
 		dockerTlsCert: z.union([z.string(), z.literal("")]).optional(),
 		dockerTlsKey: z.union([z.string(), z.literal("")]).optional(),
@@ -354,8 +343,6 @@ const importedMonitorSchema = z
 		geoCheckLocations: z.array(z.enum(GeoContinents)).default([]),
 		geoCheckInterval: z.number().min(300000).default(300000),
 		dockerLogsEnabled: z.boolean().default(false),
-		dockerAlertOnStopped: z.boolean().default(false),
-		dockerAlertOnUnhealthy: z.boolean().default(false),
 		dnsServer: dnsServerValidation.optional(),
 		dnsRecordType: z.enum(DnsRecordTypes).optional(),
 		createdAt: z.string().optional(),
@@ -366,8 +353,7 @@ const importedMonitorSchema = z
 	.superRefine(refineHeadMatching)
 	.superRefine(refineRegexPattern)
 	.superRefine(refineProxySelection)
-	.superRefine(refineDockerUrl)
-	.superRefine(refineCaptureSecret);
+	.superRefine(refineDockerUrl);

 export const importMonitorsBodyValidation = z.object({
 	monitors: z.array(importedMonitorSchema).min(1, "At least one monitor is required"),
@@ -446,8 +432,6 @@ export const monitorResponseSchema = z
 		geoCheckLocations: z.array(z.enum(GeoContinents)),
 		geoCheckInterval: z.number(),
 		dockerLogsEnabled: z.boolean(),
-		dockerAlertOnStopped: z.boolean(),
-		dockerAlertOnUnhealthy: z.boolean(),
 		dockerTlsCa: z.string().optional(),
 		dockerTlsCert: z.string().optional(),
 		dockerTlsKeySet: z.boolean().optional(),
@@ -1,17 +1,6 @@
 import { CHECK_TTL_SENTINEL } from "@/domain/checks/check.type.js";
-import { MAX_EGRESS_TARGETS } from "@/domain/egress/egress.type.js";
-import { parseEgressTarget } from "@/utils/egressTarget.js";
 import { z } from "zod";

-// A reliability target is a bare host/IP (ICMP ping), host:port (TCP connect) or an http(s) URL.
-// Parsed with the same function the probe uses, so nothing the validator accepts can fail to probe.
-const egressTargetValidation = z
-	.string()
-	.trim()
-	.min(1)
-	.max(253)
-	.refine((target) => parseEgressTarget(target) !== null, "Enter a hostname or IP address, host:port, or http(s) URL");
-
 //****************************************
 // Settings Validations
 //****************************************
@@ -53,10 +42,6 @@ export const updateAppSettingsBodyValidation = z
 			.optional(),
 		globalProxyEnabled: z.boolean().optional(),
 		globalProxyId: z.string().nullable().optional(),
-
-		egressCheckEnabled: z.boolean().optional(),
-		egressCheckTargets: z.array(egressTargetValidation).max(MAX_EGRESS_TARGETS).optional(), // empty list falls back to DEFAULT_EGRESS_TARGETS
-		egressNotifications: z.array(z.string().regex(/^[0-9a-fA-F]{24}$/, "Invalid notification id")).optional(),
 	})
 	.strip()
 	.superRefine((body, ctx) => {
@@ -20,15 +20,6 @@ export const getStatusPageParamValidation = z.object({
 	url: z.string().min(1, "URL is required"),
 });

-export const getPublicMonitorIncidentsParamValidation = z.object({
-	url: z.string().min(1, "URL is required"),
-	monitorId: z.string().regex(/^[0-9a-fA-F]{24}$/, "Must be a valid monitor ID"),
-});
-
-export const getPublicMonitorIncidentsQueryValidation = z.object({
-	date: z.string().date("Date must be a valid calendar date in YYYY-MM-DD format"),
-});
-
 export const getStatusPageQueryValidation = z.object({
 	type: z.union([z.enum(StatusPageTypes), z.array(z.enum(StatusPageTypes))]).transform((val) => (Array.isArray(val) ? val : [val])),
 	range: z.enum(StatusPageRanges).optional().default("latest"),
@@ -36,12 +36,7 @@ export const initializeControllers = (apiServices: ApiServices): InitializedCont
 	return {
 		authController: new AuthController(apiServices.userService),
 		monitorController: new MonitorController(apiServices.monitorService, apiServices.notificationsService),
-		settingsController: new SettingsController(
-			apiServices.settingsService,
-			apiServices.emailService,
-			apiServices.proxiesService,
-			apiServices.egressStateService
-		),
+		settingsController: new SettingsController(apiServices.settingsService, apiServices.emailService, apiServices.proxiesService),
 		checkController: new CheckController(apiServices.checkService),
 		geoCheckController: new GeoCheckController(apiServices.geoChecksService),
 		inviteController: new InviteController(apiServices.inviteService),
@@ -7,7 +7,6 @@ import { ITagsService, TagsService } from "@/domain/tags/tag.service.js";
 import { IUserService, UserService } from "@/domain/users/user.service.js";
 import { IJobScheduler } from "@/worker/worker.interface.js";
 import { ProxiesService, IProxiesService } from "@/domain/proxies/proxy.service.js";
-import { EgressStateService, IEgressStateService } from "@/domain/egress/egress-state.service.js";
 import { SharedServices } from "@/config/services.shared.js";

 // Third-party
@@ -25,7 +24,6 @@ export interface ApiServices extends SharedServices {
 	tagsService: ITagsService;
 	diagnosticService: IDiagnosticService;
 	proxiesService: IProxiesService;
-	egressStateService: IEgressStateService;
 }

 export const buildApi = (shared: SharedServices, jobScheduler: IJobScheduler): ApiServices => {
@@ -50,7 +48,6 @@ export const buildApi = (shared: SharedServices, jobScheduler: IJobScheduler): A
 		maintenanceWindowsRepository,
 		jobsRepository,
 		proxiesRepository,
-		egressStateRepository,
 	} = shared;

 	const userService = new UserService({
@@ -99,11 +96,10 @@ export const buildApi = (shared: SharedServices, jobScheduler: IJobScheduler): A
 		emailService,
 	});

-	const statusPageService = new StatusPageService(statusPagesRepository, settingsService, monitorsRepository, checksRepository, incidentsRepository);
+	const statusPageService = new StatusPageService(statusPagesRepository, settingsService, monitorsRepository, checksRepository);
 	const tagsService = new TagsService(tagsRepository, monitorsRepository);
 	const diagnosticService = new DiagnosticService(db);
 	const proxiesService = new ProxiesService(proxiesRepository, monitorsRepository, settingsService);
-	const egressStateService = new EgressStateService(egressStateRepository, jobsRepository);
 	return {
 		...shared,
 		worker: jobScheduler,
@@ -115,6 +111,5 @@ export const buildApi = (shared: SharedServices, jobScheduler: IJobScheduler): A
 		tagsService,
 		diagnosticService,
 		proxiesService,
-		egressStateService,
 	};
 };
@@ -56,7 +56,6 @@ import { ITagsRepository } from "@/domain/tags/tag.repository.interface.js";
 import { ITeamsRepository } from "@/domain/teams/team.repository.interface.js";
 import { IUsersRepository } from "@/domain/users/user.repository.interface.js";
 import { IProxiesRepository } from "@/domain/proxies/proxy.repository.interface.js";
-import { IEgressStateRepository } from "@/domain/egress/egress-state.repository.interface.js";

 // Mongo repository implementations
 import MongoSettingsRepository from "@/domain/app-settings/app-settings.repository.mongo.js";
@@ -77,7 +76,6 @@ import MongoTagsRepository from "@/domain/tags/tag.repository.mongo.js";
 import MongoTeamsRepository from "@/domain/teams/team.repository.model.js";
 import MongoUsersRepository from "@/domain/users/user.repository.mongo.js";
 import MongoProxiesRepository from "@/domain/proxies/proxy.repository.mongo.js";
-import MongoEgressStateRepository from "@/domain/egress/egress-state.repository.mongo.js";
 import { IDockerLogsRepository } from "@/domain/docker/docker-log.repository.interface.js";

 // Shared infrastructure + business services that both the API and the worker process construct.
@@ -116,7 +114,6 @@ export interface SharedServices {
 	teamsRepository: ITeamsRepository;
 	maintenanceWindowsRepository: IMaintenanceWindowsRepository;
 	proxiesRepository: IProxiesRepository;
-	egressStateRepository: IEgressStateRepository;
 }

 export const buildShared = async ({
@@ -160,7 +157,6 @@ export const buildShared = async ({
 	const teamsRepository = new MongoTeamsRepository();
 	const maintenanceWindowsRepository = new MongoMaintenanceWindowsRepository();
 	const proxiesRepository = new MongoProxiesRepository();
-	const egressStateRepository = new MongoEgressStateRepository();

 	// Inject settings repository into settings service (now that DB is connected)
 	(settingsService as SettingsService).setRepository(settingsRepository);
@@ -250,7 +246,6 @@ export const buildShared = async ({
 		teamsRepository,
 		maintenanceWindowsRepository,
 		proxiesRepository,
-		egressStateRepository,
 	};
 	return sharedServices;
 };
@@ -17,15 +17,17 @@ import { INetworkService, NetworkService } from "@/service/networkService.js";
 import { IBufferService, BufferService } from "@/service/bufferService.js";
 import { IStatusService, StatusService } from "@/service/statusService.js";
 import { SecretsRotationService } from "@/service/encryption/secretsRotationService.js";
-import { IQueueWorker, JobHandlers } from "@/worker/worker.interface.js";
+import { IQueueWorker } from "@/worker/worker.interface.js";
+import { MonitorStatusPolicy } from "@/worker/worker.monitor-status-policy.js";
 import { WorkerHelper } from "@/worker/worker.helper.js";
-import { GeoChecksPipeline } from "@/worker/worker.geo-pipeline.js";
+import { CheckProducer } from "@/worker/worker.check-producer.js";
+import { CheckEvaluator } from "@/worker/worker.check-evaluator.js";
+import { GeoChecksPipeline } from "@/worker/worker.check-pipeline.js";
 import { NotificationReactor } from "@/worker/reactors/reactor.notification.js";
 import { IncidentReactor } from "@/worker/reactors/reactor.incident.js";
 import { ReactorDispatcher } from "@/worker/reactors/reactor.dispatcher.js";
 import { DBQueueWorker } from "@/worker/worker.db-queue.js";
 import { ProxyResolver } from "@/service/network/ProxyResolver.js";
-import { IEgressService, EgressService } from "@/domain/egress/egress.service.js";
 // Network providers
 import { PingProvider } from "@/service/network/PingProvider.js";
 import { HttpProvider } from "@/service/network/HttpProvider.js";
@@ -39,13 +41,11 @@ import { GrpcProvider } from "@/service/network/GrpcProvider.js";
 import { WebSocketProvider } from "@/service/network/WebSocketProvider.js";
 import { DNSProvider } from "@/service/network/DNSProvider.js";
 import { AppError } from "@/utils/AppError.js";
-import { WorkerPipeline } from "@/worker/worker.pipeline.js";
 export interface WorkerServices {
 	worker: IQueueWorker;
 	networkService: INetworkService;
 	bufferService: IBufferService;
 	statusService: IStatusService;
-	egressService: IEgressService;
 }

 export const buildWorker = async (shared: SharedServices, envSettings: EnvConfig): Promise<WorkerServices> => {
@@ -70,17 +70,16 @@ export const buildWorker = async (shared: SharedServices, envSettings: EnvConfig
 		teamsRepository,
 		maintenanceWindowsRepository,
 		proxiesRepository,
-		egressStateRepository,
 	} = shared;

 	// ***********************
 	// Network providers
 	// ***********************
-	const pingProvider = new PingProvider(ping, net);
+	const pingProvider = new PingProvider(ping);
 	const httpProvider = new HttpProvider(got, new AdvancedMatcher(jmespath));
 	const pageSpeedProvider = new PageSpeedProvider(httpProvider, settingsService, logger);
 	const hardwareProvider = new HardwareProvider(httpProvider);
-	const dockerProvider = new DockerProvider(logger, Docker, encryptionService, httpProvider);
+	const dockerProvider = new DockerProvider(logger, Docker, encryptionService);
 	const portProvider = new PortProvider(net);
 	const gameProvider = new GameProvider(logger, GameDig);
 	const grpcProvider = new GrpcProvider(grpc, protoLoader);
@@ -101,33 +100,35 @@ export const buildWorker = async (shared: SharedServices, envSettings: EnvConfig
 	]);

 	const proxyResolver = new ProxyResolver(proxiesRepository, settingsService, logger);
-	const bufferService = new BufferService(logger, geoChecksService, dockerLogsService, settingsService, (checks): Promise<void> =>
-		pipeline.ingestChecks(checks)
-	);
+	const bufferService = new BufferService(logger, checkService, geoChecksService, dockerLogsService, settingsService, jobsRepository);
 	const statusService = new StatusService(logger, monitorsRepository, monitorStatsRepository);
-	const egressService = new EgressService(settingsService, egressStateRepository, jobsRepository, networkService, proxyResolver, logger);
+	const monitorStatusPolicy = new MonitorStatusPolicy();
+
+	// ***********************
+	// Reactors and dispatcher
+	// Handles notifications and incidents
+	// ***********************

 	const notificationReactor = new NotificationReactor(notificationsService);
 	const incidentReactor = new IncidentReactor(incidentService);
 	const reactorDispatcher = new ReactorDispatcher(logger, [notificationReactor, incidentReactor]);

-	const pipeline = new WorkerPipeline({
-		logger,
+	// ***********************
+	// Check producer/evaluator
+	// Handles creating and evaluatiog checks
+	// ***********************
+	const checkProducer = new CheckProducer(
 		monitorsRepository,
 		maintenanceWindowsRepository,
-		checksRepository,
-		jobsRepository,
 		checkService,
 		networkService,
 		proxyResolver,
 		bufferService,
 		dockerLogsService,
-		egressService,
-		statusService,
-		dispatcher: reactorDispatcher,
-	});
-
-	const geoCheckPipeline = new GeoChecksPipeline(monitorsRepository, maintenanceWindowsRepository, geoChecksService, bufferService, logger);
+		logger
+	);
+	const checkEvaluator = new CheckEvaluator(statusService, monitorStatusPolicy);
+	const geoCheckPipeline = new GeoChecksPipeline(maintenanceWindowsRepository, geoChecksService, bufferService, logger);

 	// ***********************
 	// Worker
@@ -144,26 +145,22 @@ export const buildWorker = async (shared: SharedServices, envSettings: EnvConfig
 		checksRepository,
 		incidentsRepository,
 		geoChecksRepository,
-		dockerLogsRepository,
-		egressService
+		dockerLogsRepository
 	);

-	const handlers: JobHandlers = {
-		check: pipeline.handleCheck,
-		evaluate: pipeline.handleEvaluate,
-		"geo-check": geoCheckPipeline.handle,
-		"cleanup-orphaned": workerHelper.getCleanupOrphanedJob(),
-		"cleanup-retention": workerHelper.getCleanupRetentionJob(),
-		egress: workerHelper.getEgressRecoveryJob(),
-	};
-
 	const worker = await DBQueueWorker.create({
 		logger,
 		isDbConnected: () => mongoose.connection.readyState === 1,
 		jobsRepository,
 		monitorsRepository,
+		checksRepository,
+		checkService,
 		bufferService,
-		handlers,
+		checkProducer,
+		checkEvaluator,
+		geoCheckPipeline,
+		dispatcher: reactorDispatcher,
+		helper: workerHelper,
 		queueWorkersRepository,
 		queueMode: envSettings.queueMode,
 		queuePrimaryProcesses: envSettings.queuePrimaryProcesses,
@@ -188,5 +185,5 @@ export const buildWorker = async (shared: SharedServices, envSettings: EnvConfig
 		});
 	}

-	return { worker, networkService, bufferService, statusService, egressService };
+	return { worker, networkService, bufferService, statusService };
 };
@@ -6,7 +6,6 @@ export interface ISettingsRepository {
 	findSingleton(): Promise<Settings | null>;
 	// update
 	update(settings: SettingsUpdate): Promise<Settings>;
-	removeEgressNotification(notificationId: string): Promise<void>; // $pull, so it cannot race a concurrent settings update
 	// delete
 	deleteLegacy: () => Promise<boolean>;
 }
@@ -1,6 +1,5 @@
 import { Schema, model, type Types } from "mongoose";
 import type { Settings, SettingsThresholds } from "@/domain/app-settings/app-settings.type.js";
-import { DEFAULT_EGRESS_TARGETS } from "@/domain/egress/egress.type.js";

 interface AppSettingsDocument extends Omit<Settings, "id" | "createdAt" | "updatedAt"> {
 	_id: Types.ObjectId;
@@ -43,9 +42,6 @@ const AppSettingsSchema = new Schema<AppSettingsDocument>(
 		globalThresholds: { type: thresholdsSchema },
 		globalProxyEnabled: { type: Boolean, default: false },
 		globalProxyId: { type: String, default: null },
-		egressCheckEnabled: { type: Boolean, default: false },
-		egressCheckTargets: { type: [String], default: () => [...DEFAULT_EGRESS_TARGETS] },
-		egressNotifications: { type: [String], default: () => [] }, // Notification ids, stored as strings like globalProxyId
 	},
 	{ timestamps: true }
 );
@@ -3,7 +3,6 @@ import { ISettingsRepository } from "@/domain/app-settings/app-settings-reposito
 import type { Settings, SettingsUpdate } from "@/domain/app-settings/app-settings.type.js";
 import { AppSettingsModel, type AppSettingsDocument } from "@/domain/app-settings/app-settings.model.js";
 import { toStringId, toDateString } from "@/utils/mongoMappers.js";
-import { DEFAULT_EGRESS_TARGETS } from "@/domain/egress/egress.type.js";

 class MongoSettingsRepository implements ISettingsRepository {
 	private toEntity = (doc: AppSettingsDocument): Settings => {
@@ -31,9 +30,6 @@ class MongoSettingsRepository implements ISettingsRepository {
 			globalThresholds: doc.globalThresholds ?? undefined,
 			globalProxyEnabled: doc.globalProxyEnabled ?? false,
 			globalProxyId: doc.globalProxyId ?? undefined,
-			egressCheckEnabled: doc.egressCheckEnabled ?? false,
-			egressCheckTargets: doc.egressCheckTargets ?? [...DEFAULT_EGRESS_TARGETS],
-			egressNotifications: doc.egressNotifications ?? [],
 			createdAt: toDateString(doc.createdAt),
 			updatedAt: toDateString(doc.updatedAt),
 		};
@@ -83,10 +79,6 @@ class MongoSettingsRepository implements ISettingsRepository {
 		return this.toEntity(updatedSettings);
 	};

-	removeEgressNotification = async (notificationId: string) => {
-		await AppSettingsModel.updateMany({ egressNotifications: notificationId }, { $pull: { egressNotifications: notificationId } });
-	};
-
 	deleteLegacy = async () => {
 		const res = await AppSettingsModel.deleteMany({ version: { $exists: false } });
 		return res.deletedCount > 0;
@@ -23,27 +23,15 @@ export interface ISettingsService {
 	getSettings(): EnvConfig;
 	areStatusPageThemesEnabled(): boolean;
 	getDBSettings(): Promise<Settings>;
-	getCachedDBSettings(): Promise<Settings>;
 	updateDbSettings(newSettings: SettingsUpdate): Promise<Settings>;
-	removeEgressNotification(notificationId: string): Promise<void>;
 }

-const DB_SETTINGS_CACHE_TTL_MS = 60_000;
-
-type CachedSettings = {
-	value: Promise<Settings>;
-	expiresAt: number;
-};
 export class SettingsService implements ISettingsService {
 	static SERVICE_NAME = SERVICE_NAME;
 	private settings: EnvConfig;
 	private settingsRepository: ISettingsRepository | null = null;
-	private dbSettingsCache: CachedSettings | null = null;

-	constructor(
-		env: ValidatedEnv,
-		private dbSettingsTTLMs: number = DB_SETTINGS_CACHE_TTL_MS
-	) {
+	constructor(env: ValidatedEnv) {
 		this.settings = {
 			jwtSecret: env.JWT_SECRET,
 			jwtTTL: env.TOKEN_TTL as StringValue,
@@ -87,14 +75,7 @@ export class SettingsService implements ISettingsService {
 	}

 	updateDbSettings = async (newSettings: SettingsUpdate) => {
-		const updated = await this.getRepository().update(newSettings);
-		this.dbSettingsCache = null;
-		return updated;
-	};
-
-	removeEgressNotification = async (notificationId: string) => {
-		await this.getRepository().removeEgressNotification(notificationId);
-		this.dbSettingsCache = null;
+		return await this.getRepository().update(newSettings);
 	};

 	getDBSettings = async () => {
@@ -114,17 +95,4 @@ export class SettingsService implements ISettingsService {

 		return settings;
 	};
-
-	getCachedDBSettings = async () => {
-		const hit = this.dbSettingsCache;
-		if (hit && hit.expiresAt > Date.now()) {
-			return hit.value;
-		}
-		const entry: CachedSettings = { value: this.getDBSettings(), expiresAt: Date.now() + this.dbSettingsTTLMs };
-		this.dbSettingsCache = entry;
-		entry.value.catch(() => {
-			if (this.dbSettingsCache === entry) this.dbSettingsCache = null;
-		});
-		return entry.value;
-	};
 }
@@ -51,10 +51,6 @@ export interface Settings {
 	globalThresholds?: SettingsThresholds;
 	globalProxyEnabled: boolean;
 	globalProxyId?: string | null;
-	// Egress self-check (see domain/egress)
-	egressCheckEnabled: boolean;
-	egressCheckTargets: string[];
-	egressNotifications: string[]; // Notification ids to receive the "egress recovered" alert
 	createdAt: string;
 	updatedAt: string;
 }
@@ -1,6 +1,5 @@
 import CheckModel from "@/domain/checks/check.model.js";
 import { DockerContainerStatsBucket, DockerStatsBucket } from "@/domain/checks/check.type.js";
-import { EXCLUDE_DEGRADED_EGRESS_MATCH } from "@/domain/checks/check.query.js";
 import mongoose from "mongoose";

 type DateRange = { start: Date; end: Date };
@@ -10,7 +9,6 @@ export const getDockerTotalChecks = async (monitorId: string, dates: DateRange):
 		"metadata.monitorId": new mongoose.Types.ObjectId(monitorId),
 		"metadata.type": "docker",
 		createdAt: { $gte: dates.start, $lte: dates.end },
-		...EXCLUDE_DEGRADED_EGRESS_MATCH,
 	});

 export const getDockerUpChecks = async (monitorId: string, dates: DateRange): Promise<{ totalChecks: number }> => {
@@ -18,7 +16,6 @@ export const getDockerUpChecks = async (monitorId: string, dates: DateRange): Pr
 		"metadata.monitorId": new mongoose.Types.ObjectId(monitorId),
 		"metadata.type": "docker",
 		createdAt: { $gte: dates.start, $lte: dates.end },
-		...EXCLUDE_DEGRADED_EGRESS_MATCH,
 		status: true,
 	});
 	return { totalChecks: count };
@@ -31,7 +28,6 @@ export const getDockerStats = async (monitorId: string, dates: DateRange, dateSt
 				"metadata.monitorId": new mongoose.Types.ObjectId(monitorId),
 				"metadata.type": "docker",
 				createdAt: { $gte: dates.start, $lte: dates.end },
-				...EXCLUDE_DEGRADED_EGRESS_MATCH,
 			},
 		},
 		{
@@ -52,7 +48,6 @@ export const getDockerLatestCheck = async (monitorId: string) =>
 	CheckModel.findOne({
 		"metadata.monitorId": new mongoose.Types.ObjectId(monitorId),
 		"metadata.type": "docker",
-		...EXCLUDE_DEGRADED_EGRESS_MATCH,
 	})
 		.sort({ createdAt: -1 })
 		.select("containers containerSummary createdAt")
@@ -70,7 +65,6 @@ export const getDockerContainerStats = async (
 				"metadata.monitorId": new mongoose.Types.ObjectId(monitorId),
 				"metadata.type": "docker",
 				createdAt: { $gte: dates.start, $lte: dates.end },
-				...EXCLUDE_DEGRADED_EGRESS_MATCH,
 				"containers.name": containerName,
 			},
 		},
@@ -94,7 +88,6 @@ export const getDockerContainerLatestCheck = async (monitorId: string, container
 		"metadata.monitorId": new mongoose.Types.ObjectId(monitorId),
 		"metadata.type": "docker",
 		"containers.name": containerName,
-		...EXCLUDE_DEGRADED_EGRESS_MATCH,
 	})
 		.sort({ createdAt: -1 })
 		.select("containers createdAt")
@@ -1,7 +1,6 @@
 import { CheckModel } from "@/domain/checks/check.model.js";
 import mongoose from "mongoose";
 import type { HardwareDiskStats, HardwareNetStats } from "@/domain/checks/check.type.js";
-import { EXCLUDE_DEGRADED_EGRESS_MATCH } from "@/domain/checks/check.query.js";

 type DateRange = { start: Date; end: Date };
 type HardwareUpChecks = { totalChecks: number };
@@ -71,7 +70,6 @@ export const getHardwareTotalChecks = async (monitorId: string, dates: DateRange
 		"metadata.monitorId": new mongoose.Types.ObjectId(monitorId),
 		"metadata.type": "hardware",
 		createdAt: { $gte: dates.start, $lte: dates.end },
-		...EXCLUDE_DEGRADED_EGRESS_MATCH,
 	});
 };

@@ -80,7 +78,6 @@ export const getHardwareUpChecks = async (monitorId: string, dates: DateRange):
 		"metadata.monitorId": new mongoose.Types.ObjectId(monitorId),
 		"metadata.type": "hardware",
 		createdAt: { $gte: dates.start, $lte: dates.end },
-		...EXCLUDE_DEGRADED_EGRESS_MATCH,
 		status: true,
 	});
 	return { totalChecks: count };
@@ -98,7 +95,6 @@ export const getHardwareStats = async (monitorId: string, dates: DateRange, date
 				"metadata.monitorId": new mongoose.Types.ObjectId(monitorId),
 				"metadata.type": "hardware",
 				createdAt: { $gte: dates.start, $lte: dates.end },
-				...EXCLUDE_DEGRADED_EGRESS_MATCH,
 			},
 		},
 		{ $sort: { createdAt: 1 } },
@@ -1,6 +1,5 @@
 import { Schema, model, Types } from "mongoose";
 import { MonitorTypes, type MonitorType } from "@/domain/monitors/monitor.type.js";
-import { EgressStatuses } from "@/domain/egress/egress.type.js";
 import type {
 	Check,
 	CheckAudits,
@@ -220,7 +219,6 @@ const dockerContainerSchema = new Schema<DockerContainerInfo>(
 		startedAt: { type: String },
 		ports: { type: [dockerContainerPortSchema], default: undefined },
 		mounts: { type: [dockerContainerMountSchema], default: undefined },
-		exitCode: { type: Number, default: undefined },
 	},
 	{ _id: false }
 );
@@ -339,11 +337,6 @@ const CheckSchema = new Schema<CheckDocument>(
 			type: containerSummarySchema,
 			default: undefined,
 		},
-		egressStatus: {
-			type: String,
-			enum: EgressStatuses,
-			default: undefined,
-		},
 	},
 	{
 		timestamps: true,
@@ -1,7 +0,0 @@
-import type { EgressStatus } from "@/domain/egress/egress.type.js";
-
-// A check recorded while the instance's own egress was down says nothing about the target, so it is left out of
-// every aggregate: uptime percentages, up/down counts and the response-time series alike. A degraded episode
-// therefore reads as a gap in monitoring rather than as downtime or as a dip in response time.
-// Spread this into the $match or filter of any query that reports statistics. Check listings keep degraded checks.
-export const EXCLUDE_DEGRADED_EGRESS_MATCH = { egressStatus: { $ne: "degraded" satisfies EgressStatus } } as const;
@@ -9,7 +9,6 @@ import type {
 	PageSpeedChecksResult,
 	UptimeChecksResult,
 } from "@/domain/checks/check.type.js";
-import { PendingCheck } from "@/domain/jobs/job.type.js";
 import type { MonitorType } from "@/domain/monitors/monitor.type.js";
 import { CheckFilter, DateRange } from "@/types/query.js";

@@ -44,7 +43,7 @@ export interface IChecksRepository {
 	): Promise<UptimeChecksResult | HardwareChecksResult | PageSpeedChecksResult | DockerChecksResult>;
 	findDockerContainerChecks(monitorId: string, containerName: string, dateRange: DateRange): Promise<Omit<DockerContainerStats, "restartsInRange">>;
 	findSummaryByTeamId(teamId: string, dateRange: DateRange): Promise<ChecksSummary>;
-	findUnevaluatedByMonitorId(monitorId: string, pending: PendingCheck[]): Promise<Check[]>;
+	findUnevaluatedByMonitorId(monitorId: string, since: number): Promise<Check[]>;
 	getDailyStatusBuckets(monitorIds: string[], days: number, timezone: string): Promise<DailyCheckBucket[]>;

 	// update
@@ -16,7 +16,6 @@ import type {
 } from "@/domain/checks/check.type.js";
 import type { MonitorType } from "@/domain/monitors/monitor.type.js";
 import { CheckModel, type CheckDocument } from "@/domain/checks/check.model.js";
-import { EXCLUDE_DEGRADED_EGRESS_MATCH } from "@/domain/checks/check.query.js";
 import mongoose from "mongoose";
 import { getDateFormat, getDateForRange } from "@/utils/dataUtils.js";
 import { ILogger } from "@/utils/logger.js";
@@ -34,7 +33,6 @@ import {
 	getDockerTotalChecks,
 	getDockerUpChecks,
 } from "@/domain/checks/check.docker.aggregation.js";
-import { PendingCheck } from "@/domain/jobs/job.type.js";

 const SERVICE_NAME = "ChecksRepository";

@@ -180,7 +178,6 @@ class MongoChecksRepository implements IChecksRepository {
 			audits: mapAudits(doc.audits),
 			containers: doc.containers,
 			containerSummary: doc.containerSummary,
-			egressStatus: doc.egressStatus,
 			createdAt: toDateString(doc.createdAt),
 			updatedAt: toDateString(doc.updatedAt),
 		};
@@ -350,7 +347,6 @@ class MongoChecksRepository implements IChecksRepository {
 		const baseMatch = {
 			"metadata.teamId": new mongoose.Types.ObjectId(teamId),
 			createdAt: { $gte: getDateForRange(dateRange) },
-			...EXCLUDE_DEGRADED_EGRESS_MATCH,
 		};

 		const [totalResult, downResult] = await Promise.all([
@@ -364,23 +360,10 @@ class MongoChecksRepository implements IChecksRepository {
 		};
 	};

-	findUnevaluatedByMonitorId = async (monitorId: string, pending: PendingCheck[]) => {
-		if (pending.length === 0) return [];
-
-		const ids = pending.map((entry) => new mongoose.Types.ObjectId(entry.checkId));
-
-		// Bound the query to the pending time range so the monitorId + createdAt index is used
-		let from = Number.POSITIVE_INFINITY;
-		let to = Number.NEGATIVE_INFINITY;
-		for (const entry of pending) {
-			if (entry.createdAt < from) from = entry.createdAt;
-			if (entry.createdAt > to) to = entry.createdAt;
-		}
-
+	findUnevaluatedByMonitorId = async (monitorId: string, since: number) => {
 		const docs = await CheckModel.find({
 			"metadata.monitorId": new mongoose.Types.ObjectId(monitorId),
-			createdAt: { $gte: new Date(from), $lte: new Date(to) },
-			_id: { $in: ids },
+			createdAt: { $gt: new Date(since) },
 		})
 			.sort({ createdAt: 1 })
 			.lean<CheckDocument[]>();
@@ -396,7 +379,6 @@ class MongoChecksRepository implements IChecksRepository {
 				$match: {
 					"metadata.monitorId": { $in: objectIds },
 					createdAt: { $gte: windowStart },
-					...EXCLUDE_DEGRADED_EGRESS_MATCH,
 				},
 			},
 			{
@@ -477,7 +459,6 @@ class MongoChecksRepository implements IChecksRepository {
 		const matchStage = {
 			"metadata.monitorId": monitorObjectId,
 			createdAt: { $gte: startDate, $lte: endDate },
-			...EXCLUDE_DEGRADED_EGRESS_MATCH,
 		};
 		const [result] = await CheckModel.aggregate([
 			{ $match: matchStage },
@@ -643,7 +624,6 @@ class MongoChecksRepository implements IChecksRepository {
 		const matchStage = {
 			"metadata.monitorId": monitorObjectId,
 			createdAt: { $gte: startDate, $lte: endDate },
-			...EXCLUDE_DEGRADED_EGRESS_MATCH,
 		};

 		const [result] = await CheckModel.aggregate([
@@ -12,6 +12,7 @@ const SERVICE_NAME = "checkService";

 export interface ICheckService {
 	createChecks(checks: Check[]): Promise<Check[]>;
+	toLastEvaluatedAt(check: Check): number;
 	toCheck(statusResponse: MonitorStatusResponse<MonitorPayloadMap[keyof MonitorPayloadMap]>): Check | undefined;
 	toStatusResponse(check: Check): MonitorStatusResponse<MonitorPayloadMap[keyof MonitorPayloadMap]>;
 	getChecksByMonitor(params: {
@@ -54,6 +55,10 @@ export class CheckService implements ICheckService {
 		return this.checksRepository.createChecks(checks);
 	};

+	toLastEvaluatedAt = (check: Check) => {
+		return new Date(check.createdAt).getTime();
+	};
+
 	toCheck = (statusResponse: MonitorStatusResponse<MonitorPayloadMap[keyof MonitorPayloadMap]>): Check | undefined => {
 		const { monitorId, teamId, type, status, responseTime, code, message, payload, timings } = statusResponse;

@@ -135,17 +140,6 @@ export class CheckService implements ICheckService {
 		return check;
 	};

-	private toPayload = (check: Check): HardwareStatusPayload | DockerStatusPayload | undefined => {
-		switch (check.metadata.type) {
-			case "hardware":
-				return { data: { cpu: check.cpu, memory: check.memory, disk: check.disk, host: check.host, net: check.net } } as HardwareStatusPayload;
-			case "docker":
-				return check.containers ? { containers: check.containers, summary: check.containerSummary } : undefined;
-			default:
-				return undefined;
-		}
-	};
-
 	toStatusResponse = (check: Check) => {
 		const statusResponse: MonitorStatusResponse<MonitorPayloadMap[keyof MonitorPayloadMap]> = {
 			monitorId: check.metadata.monitorId,
@@ -156,7 +150,10 @@ export class CheckService implements ICheckService {
 			message: check.message,
 			responseTime: check.responseTime,
 			// re-nest hardware metrics so updateMonitorStatus / extractThresholdBreaches see payload.data
-			payload: this.toPayload(check),
+			payload:
+				check.metadata.type === "hardware"
+					? ({ data: { cpu: check.cpu, memory: check.memory, disk: check.disk, host: check.host, net: check.net } } as HardwareStatusPayload)
+					: undefined,
 		};
 		return statusResponse;
 	};
@@ -1,5 +1,4 @@
 import type { MonitorType } from "@/domain/monitors/monitor.type.js";
-import type { EgressStatus } from "@/domain/egress/egress.type.js";
 import { DockerContainerInfo, DockerContainerSummary } from "@/domain/docker/docker.type.js";
 import type { Response } from "got";

@@ -117,10 +116,6 @@ export interface Check {
 	seo?: number;
 	performance?: number;
 	audits?: CheckAudits;
-	// Set on failing checks while the egress check is enabled; absent otherwise.
-	// "degraded": no reliability target was reachable (or the instance was already degraded), so the failure is not attributable to the target.
-	// "ok": a reliability target was reachable.
-	egressStatus?: EgressStatus;
 	createdAt: string;
 	updatedAt: string;
 }
@@ -1,47 +0,0 @@
-import type { DockerContainerInfo } from "@/domain/docker/docker.type.js";
-import type { Monitor } from "@/domain/monitors/monitor.type.js";
-
-export const DockerAlertReasons = ["stopped", "unhealthy"] as const;
-export type DockerAlertReason = (typeof DockerAlertReasons)[number];
-
-export interface DockerContainerBreach {
-	name: string;
-	reason: DockerAlertReason;
-	exitCode?: number;
-}
-
-export const isContainerStopped = (container: DockerContainerInfo): boolean => {
-	// Container with exit code 0 is probably a one shot container don't report stopped
-	return container.state === "dead" || (container.state === "exited" && container.exitCode !== 0);
-};
-
-export const isContainerUnhealthy = (container: DockerContainerInfo): boolean => {
-	return container.health === "unhealthy";
-};
-
-export const findContainerBreaches = (monitor: Monitor, containers: DockerContainerInfo[]): DockerContainerBreach[] => {
-	const breaches: DockerContainerBreach[] = [];
-	for (const container of containers) {
-		if (monitor.dockerAlertOnStopped && isContainerStopped(container)) {
-			breaches.push({
-				name: container.name,
-				reason: "stopped",
-				exitCode: container.exitCode,
-			});
-		} else if (monitor.dockerAlertOnUnhealthy && isContainerUnhealthy(container)) {
-			breaches.push({
-				name: container.name,
-				reason: "unhealthy",
-			});
-		}
-	}
-	return breaches;
-};
-
-export const describeContainerBreach = (breach: DockerContainerBreach): string => {
-	if (breach.reason === "unhealthy") return `${breach.name}: unhealthy`;
-	if (breach.exitCode === undefined) {
-		return `${breach.name}: stopped`;
-	}
-	return `${breach.name}: stopped (exit code ${breach.exitCode})`;
-};
@@ -55,7 +55,6 @@ export interface DockerContainerInfo {
 	startedAt?: string; // ISO date
 	ports?: DockerContainerPort[];
 	mounts?: DockerContainerMount[];
-	exitCode?: number;
 }

 export interface DockerContainerSummary {
@@ -1,40 +0,0 @@
-import { Schema, model, type Types } from "mongoose";
-import { EgressStatuses, type EgressProbeResult, type EgressState } from "@/domain/egress/egress.type.js";
-
-interface EgressStateDocument extends Omit<EgressState, "id" | "degradedSince" | "lastRecoveredAt" | "lastProbeAt" | "createdAt" | "updatedAt"> {
-	_id: Types.ObjectId;
-	singleton: boolean;
-	degradedSince: Date | null;
-	lastRecoveredAt: Date | null;
-	lastProbeAt: Date | null;
-	createdAt: Date;
-	updatedAt: Date;
-}
-
-const probeResultSchema = new Schema<EgressProbeResult>(
-	{
-		target: { type: String, required: true },
-		reachable: { type: Boolean, required: true },
-		responseTime: { type: Number, default: 0 },
-		message: { type: String },
-	},
-	{ _id: false }
-);
-
-const EgressStateSchema = new Schema<EgressStateDocument>(
-	{
-		singleton: { type: Boolean, required: true, unique: true, default: true },
-		status: { type: String, enum: EgressStatuses, required: true, default: "ok" },
-		degradedSince: { type: Date, default: null },
-		lastRecoveredAt: { type: Date, default: null },
-		lastProbeAt: { type: Date, default: null },
-		lastProbeResults: { type: [probeResultSchema], default: () => [] },
-	},
-	{ timestamps: true }
-);
-
-const EgressStateModel = model<EgressStateDocument>("EgressState", EgressStateSchema);
-
-export type { EgressStateDocument };
-export { EgressStateModel };
-export default EgressStateModel;
@@ -1,13 +0,0 @@
-import type { EgressProbeResult, EgressState } from "@/domain/egress/egress.type.js";
-
-export interface IEgressStateRepository {
-	// read
-	findSingleton(): Promise<EgressState>; // creates the "ok" singleton on first call, a plain read after that
-	// update
-	recordProbe(results: EgressProbeResult[], now: Date): Promise<EgressState>;
-	reset(): Promise<EgressState>; // back to "ok" with no episode; used when the feature is toggled
-	// Atomic transitions. Each returns the updated state when this caller performed the transition,
-	// or null when the state was already on the target side (another worker got there first).
-	markDegraded(results: EgressProbeResult[], now: Date): Promise<EgressState | null>;
-	markRecovered(results: EgressProbeResult[], now: Date): Promise<EgressState | null>;
-}
@@ -1,88 +0,0 @@
-import { IEgressStateRepository } from "@/domain/egress/egress-state.repository.interface.js";
-import type { EgressProbeResult, EgressState } from "@/domain/egress/egress.type.js";
-import { EgressStateModel, type EgressStateDocument } from "@/domain/egress/egress-state.model.js";
-import { toStringId, toDateString } from "@/utils/mongoMappers.js";
-
-const SERVICE_NAME = "EgressStateRepository";
-
-class MongoEgressStateRepository implements IEgressStateRepository {
-	static SERVICE_NAME = SERVICE_NAME;
-
-	private toEntity = (doc: EgressStateDocument): EgressState => {
-		return {
-			id: toStringId(doc._id),
-			status: doc.status,
-			degradedSince: doc.degradedSince ? toDateString(doc.degradedSince) : null,
-			lastRecoveredAt: doc.lastRecoveredAt ? toDateString(doc.lastRecoveredAt) : null,
-			lastProbeAt: doc.lastProbeAt ? toDateString(doc.lastProbeAt) : null,
-			lastProbeResults: (doc.lastProbeResults ?? []).map((result) => ({
-				target: result.target,
-				reachable: result.reachable,
-				responseTime: result.responseTime ?? 0,
-				...(result.message !== undefined && { message: result.message }),
-			})),
-			createdAt: toDateString(doc.createdAt),
-			updatedAt: toDateString(doc.updatedAt),
-		};
-	};
-
-	findSingleton = async () => {
-		// Read first: with timestamps on, every findOneAndUpdate would $set updatedAt, so a read would write.
-		const existing = await EgressStateModel.findOne({ singleton: true }).lean<EgressStateDocument>();
-		if (existing) return this.toEntity(existing);
-		try {
-			const doc = await EgressStateModel.findOneAndUpdate(
-				{ singleton: true },
-				{ $setOnInsert: { singleton: true, status: "ok" } },
-				{ upsert: true, new: true, setDefaultsOnInsert: true }
-			).lean<EgressStateDocument>();
-			return this.toEntity(doc);
-		} catch (error: unknown) {
-			// Two processes can race the very first insert; the unique index rejects the loser, who reads the winner's row.
-			if ((error as { code?: number }).code === 11000) {
-				const doc = await EgressStateModel.findOne({ singleton: true }).lean<EgressStateDocument>();
-				if (doc) return this.toEntity(doc);
-			}
-			throw error;
-		}
-	};
-
-	reset = async () => {
-		const doc = await EgressStateModel.findOneAndUpdate(
-			{ singleton: true },
-			{ $set: { status: "ok", degradedSince: null, lastProbeAt: null, lastProbeResults: [] }, $setOnInsert: { singleton: true } },
-			{ upsert: true, new: true, setDefaultsOnInsert: true }
-		).lean<EgressStateDocument>();
-		return this.toEntity(doc);
-	};
-
-	recordProbe = async (results: EgressProbeResult[], now: Date) => {
-		const doc = await EgressStateModel.findOneAndUpdate(
-			{ singleton: true },
-			{ $set: { lastProbeAt: now, lastProbeResults: results }, $setOnInsert: { singleton: true, status: "ok" } },
-			{ upsert: true, new: true, setDefaultsOnInsert: true }
-		).lean<EgressStateDocument>();
-		return this.toEntity(doc);
-	};
-
-	markDegraded = async (results: EgressProbeResult[], now: Date) => {
-		// Only the caller that flips ok -> degraded sees a document back; everyone else sees null.
-		const doc = await EgressStateModel.findOneAndUpdate(
-			{ singleton: true, status: "ok" },
-			{ $set: { status: "degraded", degradedSince: now, lastProbeAt: now, lastProbeResults: results } },
-			{ new: true }
-		).lean<EgressStateDocument>();
-		return doc ? this.toEntity(doc) : null;
-	};
-
-	markRecovered = async (results: EgressProbeResult[], now: Date) => {
-		const doc = await EgressStateModel.findOneAndUpdate(
-			{ singleton: true, status: "degraded" },
-			{ $set: { status: "ok", lastRecoveredAt: now, lastProbeAt: now, lastProbeResults: results } },
-			{ new: true }
-		).lean<EgressStateDocument>();
-		return doc ? this.toEntity(doc) : null;
-	};
-}
-
-export default MongoEgressStateRepository;
@@ -1,31 +0,0 @@
-import { IEgressStateRepository } from "@/domain/egress/egress-state.repository.interface.js";
-import { IJobsRepository } from "@/domain/jobs/job.repository.interface.js";
-import type { EgressState } from "@/domain/egress/egress.type.js";
-
-export interface IEgressStateService {
-	getState(): Promise<EgressState>;
-	reset(): Promise<EgressState>;
-}
-
-const SERVICE_NAME = "EgressStateService";
-
-// API-process view of the instance-global egress state. Probe-driven transitions are owned by the
-// worker (egress.service.ts); this exists so the controller never touches the repositories.
-export class EgressStateService implements IEgressStateService {
-	static SERVICE_NAME = SERVICE_NAME;
-
-	constructor(
-		private egressStateRepository: IEgressStateRepository,
-		private jobsRepository: IJobsRepository
-	) {}
-
-	getState = async (): Promise<EgressState> => {
-		return this.egressStateRepository.findSingleton();
-	};
-
-	// Called when the feature is switched on or off: drop any pending recovery job and start from "ok".
-	reset = async (): Promise<EgressState> => {
-		await this.jobsRepository.deleteGlobalJob("egress");
-		return this.egressStateRepository.reset();
-	};
-}
@@ -1,278 +0,0 @@
-import type { Monitor } from "@/domain/monitors/monitor.type.js";
-import type { ISettingsService } from "@/domain/app-settings/app-settings.service.js";
-import type { IEgressStateRepository } from "@/domain/egress/egress-state.repository.interface.js";
-import type { IJobsRepository } from "@/domain/jobs/job.repository.interface.js";
-import { jobId, type Job, type JobSeed } from "@/domain/jobs/job.type.js";
-import type { INetworkService } from "@/service/networkService.js";
-import type { IProxyResolver } from "@/service/network/ProxyResolver.js";
-import type { ILogger } from "@/utils/logger.js";
-import {
-	EGRESS_RECOVERY_POLL_SECONDS,
-	DEFAULT_EGRESS_TARGETS,
-	type EgressAssessment,
-	type EgressProbeResult,
-	type EgressStatus,
-} from "@/domain/egress/egress.type.js";
-import { timeRequest } from "@/service/network/utils.js";
-import { parseEgressTarget, type EgressTarget } from "@/utils/egressTarget.js";
-
-const SERVICE_NAME = "EgressService";
-const PROBE_TIMEOUT_MS = 5000;
-// How long a settled assessment answers for later failures. An assessment still in flight is shared
-// for as long as it takes, so this only bounds how stale a reused answer can be.
-const ASSESSMENT_REUSE_MS = 5000;
-// Global job row (refId null) that re-probes while degraded. Inserted when egress degrades, removed on recovery.
-const RECOVERY_JOB_TYPE = "egress" as const;
-const RECOVERY_JOB_ID = jobId(RECOVERY_JOB_TYPE, null);
-
-// HttpProvider reports transport failures with NETWORK_ERROR (outside the HTTP range) and everything else with the real status code.
-export const isHttpStatusCode = (code: unknown): boolean => typeof code === "number" && code >= 100 && code <= 599;
-
-// Synthetic identity stamped on the probe monitors so provider responses are recognisable in logs.
-const PROBE_MONITOR_ID = "egress-probe";
-const PROBE_TEAM_ID = "system";
-
-export interface IEgressService {
-	probeTargets(targets: string[]): Promise<EgressProbeResult[]>;
-	// Called by the check producer when a check fails. Null when the feature is off or the assessment itself failed.
-	assessAfterFailure(): Promise<EgressStatus | null>;
-	// Handler for the "egress" job: re-probes while degraded and removes the job once egress is back.
-	checkRecovery(job: Job): Promise<void>;
-}
-
-type CachedAssessment = {
-	value: Promise<EgressAssessment | null>;
-	expiresAt: number | null; // null while the assessment is still in flight
-};
-
-export class EgressService implements IEgressService {
-	static SERVICE_NAME = SERVICE_NAME;
-
-	private assessment: CachedAssessment | null = null;
-
-	constructor(
-		private settingsService: ISettingsService,
-		private egressStateRepository: IEgressStateRepository,
-		private jobsRepository: IJobsRepository,
-		private networkService: INetworkService,
-		private proxyResolver: IProxyResolver,
-		private logger: ILogger
-	) {}
-
-	// ****************************
-	// Probing
-	// ****************************
-
-	// Reuses the existing ping/port/http providers by dressing each target up as a minimal monitor.
-	// proxyMode "inherit" lets the resolver apply the global proxy to http probes, as it does for monitors.
-	private toProbeMonitor = (target: EgressTarget, raw: string): Monitor => {
-		const base = {
-			id: PROBE_MONITOR_ID,
-			teamId: PROBE_TEAM_ID,
-			name: `Egress probe: ${raw}`,
-			method: "GET",
-			proxyMode: "inherit",
-			useAdvancedMatching: false,
-			ignoreTlsErrors: false,
-			customUpCodes: [],
-		};
-
-		switch (target.kind) {
-			case "http":
-				return { ...base, type: "http", url: target.url } as unknown as Monitor;
-			case "port":
-				return { ...base, type: "port", url: target.host, port: target.port } as unknown as Monitor;
-			case "ping":
-				return { ...base, type: "ping", url: target.host } as unknown as Monitor;
-		}
-	};
-
-	private probeTarget = async (raw: string): Promise<EgressProbeResult> => {
-		const target = parseEgressTarget(raw);
-		if (!target) {
-			// Validation rejects these; a stored value can still be stale, and it must not count as reachable.
-			return { target: raw, reachable: false, responseTime: 0, message: "Invalid egress target" };
-		}
-
-		const monitor = this.toProbeMonitor(target, raw);
-		let timer: NodeJS.Timeout | undefined;
-
-		const { response, responseTime, error } = await timeRequest(async () => {
-			const proxyUrl = await this.proxyResolver.resolve(monitor);
-			return Promise.race([
-				this.networkService.requestStatus(monitor, { proxyUrl }),
-				new Promise<never>((_, reject) => {
-					timer = setTimeout(() => reject(new Error(`Egress probe timed out after ${PROBE_TIMEOUT_MS}ms`)), PROBE_TIMEOUT_MS);
-				}),
-			]).finally(() => clearTimeout(timer));
-		});
-
-		if (error || !response) {
-			return {
-				target: raw,
-				reachable: false,
-				responseTime,
-				message: error instanceof Error ? error.message : error ? String(error) : "No response",
-			};
-		}
-
-		return {
-			target: raw,
-			// Any HTTP response, including 4xx/5xx, proves the instance can reach the target; only a transport
-			// failure counts against egress. Ping and port providers have no such distinction.
-			reachable: response.status === true || (target.kind === "http" && isHttpStatusCode(response.code)),
-			responseTime: response.responseTime ?? responseTime,
-			message: response.message,
-		};
-	};
-
-	probeTargets = async (targets: string[]): Promise<EgressProbeResult[]> => {
-		return await Promise.all(targets.map((target) => this.probeTarget(target)));
-	};
-
-	private resolveTargets = (configured: string[] | undefined): string[] => {
-		const targets = (configured ?? []).map((target) => target.trim()).filter((target) => target.length > 0);
-		// An empty list would make "all unreachable" vacuously true, so fall back to the defaults.
-		return targets.length > 0 ? targets : [...DEFAULT_EGRESS_TARGETS];
-	};
-
-	// ****************************
-	// Event-triggered assessment
-	// ****************************
-
-	assessAfterFailure = async (): Promise<EgressStatus | null> => {
-		const assessment = await this.sharedAssessment();
-		return assessment === "disabled" ? null : assessment;
-	};
-
-	// When egress is down every monitor fails at once. Concurrent failures share the in-flight assessment
-	// however long it takes, and a settled one answers for ASSESSMENT_REUSE_MS. Same shape as ProxyResolver's cache.
-	private sharedAssessment = (): Promise<EgressAssessment | null> => {
-		const cached = this.assessment;
-		if (cached && (cached.expiresAt === null || cached.expiresAt > Date.now())) {
-			return cached.value;
-		}
-
-		const entry: CachedAssessment = { value: this.assess(), expiresAt: null };
-		this.assessment = entry;
-		void entry.value.then((result) => {
-			if (this.assessment !== entry) return;
-			if (result === null) {
-				this.assessment = null; // an internal failure is not cached, so the next failing check retries
-			} else {
-				entry.expiresAt = Date.now() + ASSESSMENT_REUSE_MS;
-			}
-		});
-		return entry.value;
-	};
-
-	private assess = async (): Promise<EgressAssessment | null> => {
-		try {
-			const settings = await this.settingsService.getCachedDBSettings();
-			if (!settings.egressCheckEnabled) {
-				return "disabled";
-			}
-
-			const state = await this.egressStateRepository.findSingleton();
-			if (state.status === "degraded") {
-				// Recovery is detected by the scheduled job. Make sure the row exists without touching its schedule.
-				await this.scheduleRecoveryCheck(false);
-				return "degraded";
-			}
-
-			const results = await this.probeTargets(this.resolveTargets(settings.egressCheckTargets));
-			const now = new Date();
-
-			if (results.some((result) => result.reachable)) {
-				await this.egressStateRepository.recordProbe(results, now);
-				return "ok";
-			}
-
-			// Schedule the recovery job before recording the transition: a crash between the two then leaves a stray row
-			// while ok, which the job's first run removes, rather than a degraded state that nothing is polling.
-			await this.scheduleRecoveryCheck(true);
-			const degraded = await this.egressStateRepository.markDegraded(results, now);
-			this.logger.warn({
-				message: degraded
-					? "Instance egress degraded: every reliability target is unreachable. Monitor failures will not be counted until it recovers"
-					: "Instance egress degraded (transition already recorded by another worker)",
-				service: SERVICE_NAME,
-				method: "assessAfterFailure",
-				details: { results },
-			});
-			return "degraded";
-		} catch (error: unknown) {
-			// The egress check must never break check production; treat an internal failure as "unknown" and carry on.
-			this.logger.error({
-				message: error instanceof Error ? error.message : String(error),
-				service: SERVICE_NAME,
-				method: "assessAfterFailure",
-				stack: error instanceof Error ? error.stack : undefined,
-			});
-			return null;
-		}
-	};
-
-	// ****************************
-	// Recovery job
-	// ****************************
-
-	// reschedule=true sets nextScheduledAt (start of an episode); false only inserts the row if it is missing,
-	// so re-arming while degraded never pushes a pending run back.
-	private scheduleRecoveryCheck = async (reschedule: boolean) => {
-		const intervalMs = EGRESS_RECOVERY_POLL_SECONDS * 1000;
-		const seed: JobSeed = {
-			id: RECOVERY_JOB_ID,
-			type: RECOVERY_JOB_TYPE,
-			refId: null,
-			isActive: true,
-			nextScheduledAt: Date.now() + intervalMs,
-			intervalMs,
-		};
-		if (reschedule) {
-			await this.jobsRepository.upsertCleanupJob(seed); // global-row upsert that also sets the schedule
-		} else {
-			await this.jobsRepository.upsertJob(seed);
-		}
-	};
-
-	// Removes the row only if nobody has rescheduled it since this run claimed it. Another worker may have seen
-	// egress fail again in the meantime and started a new episode; its schedule must survive.
-	private releaseRecoveryJob = async (job: Job) => {
-		await this.jobsRepository.deleteGlobalJobIfUnchanged(RECOVERY_JOB_TYPE, job.nextScheduledAt);
-	};
-
-	// Runs on the queue at the configured interval while degraded. Errors propagate so the queue records
-	// the failure and retries with its usual backoff.
-	checkRecovery = async (job: Job): Promise<void> => {
-		const settings = await this.settingsService.getCachedDBSettings();
-		const state = await this.egressStateRepository.findSingleton();
-		if (!settings.egressCheckEnabled || state.status !== "degraded") {
-			// Feature switched off, recovery recorded by another worker, or state reset: nothing left to poll for.
-			await this.releaseRecoveryJob(job);
-			return;
-		}
-
-		const results = await this.probeTargets(this.resolveTargets(settings.egressCheckTargets));
-		const now = new Date();
-
-		if (!results.some((result) => result.reachable)) {
-			await this.egressStateRepository.recordProbe(results, now);
-			return;
-		}
-
-		const recovered = await this.egressStateRepository.markRecovered(results, now);
-		await this.releaseRecoveryJob(job);
-		if (!recovered) {
-			// Another process performed the transition.
-			return;
-		}
-
-		this.logger.info({
-			message: `Instance egress recovered (degraded since ${recovered.degradedSince ?? "unknown"})`,
-			service: SERVICE_NAME,
-			method: "checkRecovery",
-			details: { results },
-		});
-	};
-}
@@ -1,37 +0,0 @@
-// Egress self-check: detects loss of the instance's own outbound connectivity so that
-// a burst of simultaneous monitor failures is not reported as a burst of real outages.
-
-export const EgressStatuses = ["ok", "degraded"] as const;
-export type EgressStatus = (typeof EgressStatuses)[number];
-// Outcome of one assessment: a status, or "disabled" when the feature is switched off (distinct from an internal failure).
-export type EgressAssessment = EgressStatus | "disabled";
-
-// Sensible defaults for a fresh install. Bare hosts are ICMP-pinged, host:port is a TCP connect,
-// http(s):// URLs are fetched. Any one target being reachable means egress is fine.
-export const DEFAULT_EGRESS_TARGETS = ["1.1.1.1", "8.8.8.8"] as const;
-export const MAX_EGRESS_TARGETS = 10;
-
-// While the instance is marked degraded, every failing check is flagged from stored state without probing, so
-// this interval is the window in which a recovered instance still discards its checks. It is deliberately fixed
-// and not configurable: the only effect of raising it is a longer blind window.
-export const EGRESS_RECOVERY_POLL_SECONDS = 5;
-
-// Instance-global singleton persisted in MongoDB so that every worker process and the API
-// process share one view of the state (the queue worker may run separately from the API).
-export interface EgressState {
-	id: string;
-	status: EgressStatus;
-	degradedSince: string | null; // ISO timestamp of the current or most recent degraded entry
-	lastRecoveredAt: string | null; // ISO timestamp of the most recent recovery
-	lastProbeAt: string | null; // ISO timestamp of the most recent reliability probe
-	lastProbeResults: EgressProbeResult[];
-	createdAt: string;
-	updatedAt: string;
-}
-
-export interface EgressProbeResult {
-	target: string;
-	reachable: boolean;
-	responseTime: number; // ms
-	message?: string;
-}
@@ -82,7 +82,6 @@ IncidentSchema.index({ teamId: 1, startTime: -1 });
 IncidentSchema.index({ status: 1, startTime: -1 });
 IncidentSchema.index({ resolutionType: 1, status: 1 });
 IncidentSchema.index({ resolvedBy: 1, status: 1 });
-IncidentSchema.index({ monitorId: 1, startTime: -1 });
 IncidentSchema.index({ createdAt: -1 });

 const IncidentModel = model<IncidentDocument>("Incident", IncidentSchema);
@@ -17,7 +17,6 @@ export interface IIncidentsRepository {
 		monitorId?: string,
 		resolutionType?: string
 	): Promise<Incident[]>;
-	findByMonitorIdAndDate(monitorId: string, teamId: string, dateStart: Date, dateEnd: Date): Promise<Incident[]>;
 	findSummaryByTeamId(teamId: string, limit?: number): Promise<IncidentSummary>;
 	countByTeamId(teamId: string, startDate: Date | undefined, status?: boolean, monitorId?: string, resolutionType?: string): Promise<number>;

@@ -120,17 +120,6 @@ class MongoIncidentsRepository implements IIncidentsRepository {
 		return this.mapDocuments(incidents);
 	};

-	findByMonitorIdAndDate = async (monitorId: string, teamId: string, dateStart: Date, dateEnd: Date): Promise<Incident[]> => {
-		const matchStage = {
-			monitorId: new mongoose.Types.ObjectId(monitorId),
-			teamId: new mongoose.Types.ObjectId(teamId),
-			startTime: { $lt: dateEnd },
-			$or: [{ endTime: null }, { endTime: { $gte: dateStart } }],
-		};
-		const incidents = await IncidentModel.find(matchStage).sort({ startTime: -1 });
-		return this.mapDocuments(incidents);
-	};
-
 	updateById = async (incidentId: string, teamId: string, patch: Partial<Incident>) => {
 		const updatedIncident = await IncidentModel.findOneAndUpdate(
 			{ _id: new mongoose.Types.ObjectId(incidentId), teamId: new mongoose.Types.ObjectId(teamId) },
@@ -1,6 +1,6 @@
 const SERVICE_NAME = "incidentService";
 import type { Monitor } from "@/domain/monitors/monitor.type.js";
-import type { DockerStatusPayload, MonitorStatusResponse } from "@/types/network.js";
+import type { MonitorStatusResponse } from "@/types/network.js";
 import { AppError } from "@/utils/AppError.js";
 import { getDateForRange } from "@/utils/dataUtils.js";
 import type { IIncidentsRepository } from "@/domain/incidents/incident.repository.interface.js";
@@ -8,11 +8,10 @@ import type { IMonitorsRepository } from "@/domain/monitors/monitor.repository.i
 import type { IUsersRepository } from "@/domain/users/user.repository.interface.js";
 import type { Incident, IncidentSummary } from "@/domain/incidents/incident.type.js";
 import type { User } from "@/domain/users/user.type.js";
-import type { MonitorActionDecision } from "@/worker/worker.interface.js";
+import type { MonitorActionDecision } from "@/worker/worker.helper.js";
 import type { INotificationMessageBuilder } from "@/domain/notifications/notification.message-builder.js";
 import type { ILogger } from "@/utils/logger.js";
 import { DateRange } from "@/types/query.js";
-import { describeContainerBreach, findContainerBreaches } from "@/domain/docker/docker-alert.js";

 export interface IIncidentService {
 	handleIncident(
@@ -107,12 +106,6 @@ export class IncidentService implements IIncidentService {
 	};

 	private buildThresholdBreachMessage(monitor: Monitor, monitorStatusResponse?: MonitorStatusResponse): string {
-		if (monitor.type === "docker") {
-			const containers = (monitorStatusResponse?.payload as DockerStatusPayload | undefined)?.containers ?? [];
-			const breaches = findContainerBreaches(monitor, containers);
-			return breaches.length > 0 ? breaches.map(describeContainerBreach).join(", ") : "Container alert";
-		}
-
 		if (!monitorStatusResponse) {
 			return "Threshold breach detected";
 		}
@@ -20,11 +20,6 @@ export interface Incident {
 	updatedAt: string;
 }

-export type PublicIncident = Pick<
-	Incident,
-	"id" | "monitorId" | "status" | "startTime" | "endTime" | "resolutionType" | "message" | "statusCode" | "createdAt"
->;
-
 export interface IncidentSummaryTopMonitor {
 	monitorId: string;
 	monitorName: string | null;
@@ -47,18 +47,6 @@ const JobSchema = new Schema<JobDocument>(
 			default: null,
 		},

-		// Pending checks, inserted but not yet evaluated
-		pendingChecks: {
-			type: [
-				{
-					checkId: { type: String, required: true },
-					createdAt: { type: Number, required: true },
-				},
-			],
-			default: [],
-			_id: false,
-		},
-
 		// Observability
 		runCount: {
 			type: Number,
Author	SHA1	Message	Date
Alexander Holliday	bc4a30c607	Merge pull request #3954 from bluewave-labs/develop develop -> master	2026-09-12 15:06:56 -07:00
Alexander Holliday	021f99e0be	Merge pull request #3889 from bluewave-labs/develop develop -> master	2026-08-26 12:08:53 -07:00
Alexander Holliday	adc6af83e3	Merge pull request #3885 from bluewave-labs/develop Develop -> Master	2026-08-26 10:45:29 -07:00
Alexander Holliday	872e5f32cb	Merge pull request #3807 from bluewave-labs/develop develop -> master	2026-07-30 09:39:06 -07:00
Alexander Holliday	d368ec5bd7	Merge pull request #3761 from bluewave-labs/develop develop -> master	2026-07-07 10:19:52 -07:00
Alexander Holliday	825bcc5fdb	Merge pull request #3751 from bluewave-labs/develop develop -> master	2026-07-02 11:06:47 -07:00
Alexander Holliday	69cdf948da	Merge pull request #3750 from bluewave-labs/develop develop -> master	2026-07-02 10:57:17 -07:00
Alexander Holliday	d337bb235c	Merge pull request #3749 from bluewave-labs/develop migration fix	2026-07-02 10:43:59 -07:00
Alexander Holliday	0c0f43174d	Merge pull request #3748 from bluewave-labs/develop fix/migration	2026-07-02 10:30:55 -07:00
Alexander Holliday	51149d1dd4	Merge pull request #3747 from bluewave-labs/develop develop -> master	2026-07-02 10:18:55 -07:00
Alexander Holliday	448fcc4628	Merge pull request #3707 from bluewave-labs/develop develop -> master	2026-06-05 12:04:15 -07:00
Alexander Holliday	ee5462d039	Merge pull request #3699 from bluewave-labs/develop develop -> master	2026-06-05 10:39:06 -07:00
Alexander Holliday	7ee6d342e9	Merge pull request #3606 from bluewave-labs/develop develop -> master	2026-04-29 12:11:29 -07:00
Alexander Holliday	49d3737a93	Merge pull request #3604 from bluewave-labs/develop develop -> master	2026-04-29 11:51:43 -07:00
Alexander Holliday	4402e4fbfa	Merge pull request #3567 from bluewave-labs/develop develop -> master	2026-04-23 11:26:21 -07:00
Alexander Holliday	721f77ed26	Merge pull request #3565 from bluewave-labs/develop develop -> master	2026-04-23 10:15:31 -07:00
Alexander Holliday	34f29e5ae6	Merge pull request #3563 from bluewave-labs/develop develop -> master	2026-04-23 09:52:58 -07:00
Alexander Holliday	c2170267e8	Merge pull request #3394 from bluewave-labs/develop develop -> master 3.5.1 release	2026-03-06 12:56:20 -08:00
Alexander Holliday	321ca59380	Merge pull request #3368 from bluewave-labs/develop Develop -> master (3.5.0)	2026-03-04 10:41:02 -08:00
Alexander Holliday	e3ecfe6ad8	Merge pull request #3323 from bluewave-labs/develop develop -> master	2026-02-20 12:38:33 -08:00
Alexander Holliday	f4664eec16	Merge pull request #3321 from bluewave-labs/develop develop->master	2026-02-20 12:20:49 -08:00
Alexander Holliday	56f601e34b	Merge pull request #3319 from bluewave-labs/develop develop -> master	2026-02-20 12:07:29 -08:00
Alexander Holliday	1244ff6d93	Merge pull request #3212 from bluewave-labs/develop develop -> master	2026-01-27 13:58:48 -08:00
Alexander Holliday	c0ea804c98	Merge pull request #3209 from bluewave-labs/develop develop -> master	2026-01-27 13:40:25 -08:00
Alexander Holliday	c21cf29db6	Merge pull request #3207 from bluewave-labs/develop develop -> master	2026-01-27 13:20:18 -08:00
Alexander Holliday	3d0da70ce6	Merge pull request #3204 from bluewave-labs/develop develop -> master	2026-01-27 13:09:47 -08:00
Alexander Holliday	feb061240b	Merge pull request #3042 from bluewave-labs/develop develp->master	2025-10-27 12:09:00 -07:00
Alexander Holliday	a924227805	Merge pull request #2964 from bluewave-labs/develop develop -> master	2025-09-18 13:40:45 -07:00
Alexander Holliday	2144d3f8c0	Merge pull request #2962 from bluewave-labs/develop develop -> master	2025-09-18 12:04:51 -07:00
Alexander Holliday	fcd6786149	Merge pull request #2936 from bluewave-labs/develop develop -> master	2025-09-08 20:43:21 -07:00
Alexander Holliday	ea968ebf3c	Merge pull request #2933 from bluewave-labs/develop develop -> master	2025-09-08 20:33:35 -07:00
Alexander Holliday	8a7b852974	Merge pull request #2929 from bluewave-labs/develop develop -> master	2025-09-08 07:24:16 -07:00
Alexander Holliday	c8d3e3b70c	Merge pull request #2921 from bluewave-labs/develop develop -> master	2025-09-04 15:46:30 -07:00
Alexander Holliday	7a90a6f9f4	Merge pull request #2915 from bluewave-labs/develop develop->master	2025-09-01 10:33:09 -07:00