chore(helm): migrate chart to the all-in-one image

FIRST PASS - renders and lints, but has NOT been installed on a cluster.
See #3898. Needs a real deploy and an upgrade test from 0.2.x before merge.

The chart deployed checkmate-client, checkmate-backend and checkmate-mongo,
none of which CI publishes any more. Chart.yaml pinned appVersion to v3.8.1
with a comment explaining the chart could not be bumped until it moved to the
all-in-one image. This does that move.

Structure. The application image serves the client and the API from one
origin, so the separate client deployment, service, nginx ConfigMap and
ingress are removed and templates/api/ becomes templates/app/. One ingress
now routes / to the app rather than one routing / to nginx and another
routing /api/v1 to the API - which also drops the CORS annotations, since
the browser is same-origin. MongoDB moves to upstream mongo:8.0, matching
docker/docker-compose.yaml.

Environment. UPTIME_APP_API_BASE_URL and UPTIME_APP_CLIENT_HOST are gone;
the server stopped reading them. CLIENT_HOST is derived from the app's own
ingress, and is omitted from `env` when secrets.CLIENT_HOST is set, because
`env` takes precedence over `envFrom` and would otherwise discard the
override silently.

Back-compat. checkmate.app merges any legacy client/api/server block over
the app defaults, so most values files upgrade unedited. client.image and
client.tag are deliberately not inherited - that repo is unpublished, and
honouring it would pin an install to an unpullable image. checkmate.api is
kept as an alias.

Two upgrade cases fail loudly instead of deploying something wrong: a set
client.image, and client/api ingress hosts that differ (one origin cannot
serve both).

Worker is unchanged in shape - still opt-in, still the same image as the
app, still deriving QUEUE_PRIMARY_PROCESSES. It referenced
.Values.client.protocol, which no longer exists; rendering with
worker.enabled=true caught that nil pointer.

Verified with helm lint and helm template across: defaults, worker enabled,
worker plus KEDA autoscaling, each of the three legacy value blocks, the two
new guards, the change_me guard, and the CLIENT_HOST override. No
checkmate-client, checkmate-backend, checkmate-mongo or UPTIME_APP_* strings
remain in rendered output.

Not done: INSTALLATION.md has a new migration section but its body still
documents the two-tier layout in places, and no cluster test has been run.

Claude-Session: https://claude.ai/code/session_01AbYLvwpEaZFXktHVcqrFRd

.github/CODEOWNERS

@@ -1 +1 @@
-
+*     @ajhollid @mohicody @Br0wnHammer @Owaiseimdad @karenvicent @shanikauwu1

CLAUDE.md

@@ -109,7 +109,7 @@ client/src/
 - **Data Fetching**: SWR + Axios
 - **Database**: MongoDB with Mongoose ODM
 - **Queue/Cache**: Redis + BullMQ + Pulse (cron scheduling)
-- **i18n**: i18next + react-i18next (non-English locales are machine translated, not managed through a translation service)
+- **i18n**: i18next + react-i18next (translations via PoEditor)
 
 ---
 

README.md

@@ -36,7 +36,8 @@
 
 [![Run on PikaPods](https://www.pikapods.com/static/run-button.svg)](https://www.pikapods.com/pods?run=checkmate)
 
-<img width="1461" height="853" alt="image" src="https://github.com/user-attachments/assets/d5ee1a4e-9db9-47cc-ad47-e1ba88a9d796" />
+
+<img width="1703" height="1041" alt="image" src="https://github.com/user-attachments/assets/0f4dcf38-9b42-4b84-8633-ff34778df1a8" />
 </p>
 <br>
 
@@ -92,7 +93,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), [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).
 
 
 ### Configuration
@@ -104,15 +105,7 @@ The image is configured entirely through environment variables on the server con
 | `DB_CONNECTION_STRING` | Yes | MongoDB connection string, e.g. `mongodb://mongodb:27017/uptime_db` |
 | `JWT_SECRET` | Yes | Secret used to sign auth tokens; generate one with `openssl rand -hex 32` |
 | `CLIENT_HOST` | Yes | The URL users reach the app at, e.g. `https://checkmate.example.com`; used for CORS and for links in notifications and emails |
-| `ENCRYPTION_KEY` | No | Encrypts stored Docker TLS client keys at rest; generate one with `openssl rand -base64 32`. Comma-separated list: the first key encrypts, every key decrypts. Must be identical on the API and every worker. To rotate without downtime, deploy `OLD_KEY,NEW_KEY` everywhere, then `NEW_KEY,OLD_KEY` everywhere, wait for the worker to re-encrypt every row, then drop `OLD_KEY`. |
-| `PORT` | No | Port the API and web client are served on (default `52345`) |
-| `HEALTH_PORT` | No | Port for the `/livez`, `/readyz` and `/metrics` endpoints, served by any process that runs the job worker (default `52346`) |
-| `NODE_ENV` | No | `development`, `production` or `test` (default `development`). `development` disables the general API rate limiter; set `production` on real deployments |
 | `LOG_LEVEL` | No | Server log level: `error`, `warn`, `info`, or `debug` (default `debug`) |
-| `TOKEN_TTL` | No | Lifetime of issued auth tokens, e.g. `12h` or `7d` (default `99d`) |
-| `QUEUE_MODE` | No | `primary` (default) runs the API, the web client and the job scheduler; `worker` runs a job-processing worker only, with no API |
-| `QUEUE_PRIMARY_PROCESSES` | No | `true` (default) or `false`. Whether a `primary` node also processes monitoring jobs itself; set `false` when dedicated `worker` nodes handle all checks. Ignored in `worker` mode |
-| `STATUS_PAGE_THEMES_ENABLED` | No | `true` (default) or `false`. When `false`, status pages ignore theme settings and always render the default theme |
 
 The web client needs no configuration by default: it calls the API on the same origin it was served from (`/api/v1`). For setups where the defaults don't apply — for example, the API is reached through a different origin than the page — the server renders overrides into the client at runtime via these optional variables:
 
@@ -126,119 +119,12 @@ The web client needs no configuration by default: it calls the API on the same o
 
 See full installation instructions in the [Checkmate documentation portal](https://checkmate.so/docs). 
 
-Alternatively, you can also use [Coolify](https://coolify.io/), [Elestio](https://elest.io/open-source/checkmate), [K8s](./charts/helm/checkmate/INSTALLATION.md) (legacy images, pinned at v3.8.1), [Sive Host](https://sive.host) (South Africa), [Cloudzy](https://cloudzy.com/marketplace/checkmate) or [Pikapods](https://www.pikapods.com/) to quickly spin off a Checkmate instance. If you would like to monitor your server infrastructure, you'll need [Capture agent](https://github.com/bluewave-labs/capture). Capture repository also contains the installation instructions.
+Alternatively, you can also use [Coolify](https://coolify.io/), [Elestio](https://elest.io/open-source/checkmate), [K8s](./charts/helm/checkmate/INSTALLATION.md), [Sive Host](https://sive.host) (South Africa), [Cloudzy](https://cloudzy.com/marketplace/checkmate) or [Pikapods](https://www.pikapods.com/) to quickly spin off a Checkmate instance. If you would like to monitor your server infrastructure, you'll need [Capture agent](https://github.com/bluewave-labs/capture). Capture repository also contains the installation instructions.
 
 ### Using a Custom CA
 
 If you need to monitor internal HTTPS endpoints with certificates from private Certificate Authorities (like Smallstep), see our [Custom CA Trust Guide](./docs/custom-ca-trust.md) for Docker configuration options.
 
-### Docker monitors
-
-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 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. |
-
-**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:
-
-```yaml
-services:
-  checkmate:
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    group_add:
-      - "989"   # the gid printed by stat
-```
-
-**Monitoring a remote daemon.** Set the host to `tcp://host:port` and fill in the **TLS credentials** section of the monitor form with the same PEM files you would pass to `docker --tlsverify`:
-
-- **CA certificate**: the CA that signed the daemon's server certificate. Required unless **Ignore TLS/SSL errors** is on, which skips verifying the daemon's identity.
-- **Client certificate**: the certificate the daemon uses to authenticate Checkmate.
-- **Client key**: the matching private key, unencrypted (no passphrase). Checkmate checks that it matches the certificate, encrypts it with `ENCRYPTION_KEY`, and never shows it again. Leave the field blank when editing to keep the stored key.
-
-TLS Docker monitors require `ENCRYPTION_KEY` to be set on the server (see [Configuration](#configuration)). Saving one without it fails with an error telling you so. If the key is ever removed or rotated incorrectly, affected checks fail with a decryption error until it is restored.
-
-If the daemon's certificate is signed by a private CA that you also want the rest of Checkmate to trust, see the [Custom CA Trust Guide](./docs/custom-ca-trust.md); for Docker monitors alone, the **CA certificate** field is enough.
-
-### Securing the Docker daemon with TLS
-
-The Docker daemon does not enable TLS by default. Follow these steps on the Docker host to generate a CA, a server certificate, and a client certificate for Checkmate. This is the procedure from [Docker's own guide](https://docs.docker.com/engine/security/protect-access/), condensed. Replace `docker.example.com` and `203.0.113.10` with your daemon's DNS name and IP.
-
-**1. Create a CA.** The CA key gets a passphrase; keep it offline once the certificates are issued.
-
-```bash
-openssl genrsa -aes256 -out ca-key.pem 4096
-openssl req -new -x509 -days 365 -key ca-key.pem -sha256 -subj "/CN=docker-ca" -out ca.pem
-```
-
-**2. Create the server certificate.** The subject alternative names must cover every name or address Checkmate will use to reach the daemon.
-
-```bash
-openssl genrsa -out server-key.pem 4096
-openssl req -subj "/CN=docker.example.com" -sha256 -new -key server-key.pem -out server.csr
-cat > server-ext.cnf <<EOF
-subjectAltName = DNS:docker.example.com,IP:203.0.113.10
-extendedKeyUsage = serverAuth
-EOF
-openssl x509 -req -days 365 -sha256 -in server.csr -CA ca.pem -CAkey ca-key.pem -CAcreateserial \
-  -out server-cert.pem -extfile server-ext.cnf
-```
-
-**3. Create the client certificate for Checkmate.** Do not add a passphrase to this key; Checkmate cannot use encrypted private keys.
-
-```bash
-openssl genrsa -out key.pem 4096
-openssl req -subj "/CN=checkmate" -new -key key.pem -out client.csr
-echo "extendedKeyUsage = clientAuth" > client-ext.cnf
-openssl x509 -req -days 365 -sha256 -in client.csr -CA ca.pem -CAkey ca-key.pem -CAcreateserial \
-  -out cert.pem -extfile client-ext.cnf
-rm client.csr server.csr server-ext.cnf client-ext.cnf
-chmod 0400 ca-key.pem key.pem server-key.pem
-chmod 0444 ca.pem server-cert.pem cert.pem
-```
-
-**4. Point the daemon at the certificates.** Move `ca.pem`, `server-cert.pem` and `server-key.pem` to `/etc/docker/certs/` and configure `/etc/docker/daemon.json`:
-
-```json
-{
-  "hosts": ["unix:///var/run/docker.sock", "tcp://0.0.0.0:2376"],
-  "tls": true,
-  "tlsverify": true,
-  "tlscacert": "/etc/docker/certs/ca.pem",
-  "tlscert": "/etc/docker/certs/server-cert.pem",
-  "tlskey": "/etc/docker/certs/server-key.pem"
-}
-```
-
-On distributions where the systemd unit already passes `-H fd://` (Debian, Ubuntu and derivatives), the daemon refuses to start with `hosts` set in both places. Remove the flag from the unit with an override, then restart:
-
-```bash
-sudo systemctl edit docker.service
-```
-
-```ini
-[Service]
-ExecStart=
-ExecStart=/usr/bin/dockerd
-```
-
-```bash
-sudo systemctl daemon-reload && sudo systemctl restart docker
-```
-
-Open port `2376` on the host firewall only to the machine running Checkmate.
-
-**5. Verify from the Checkmate host**, then paste `ca.pem`, `cert.pem` and `key.pem` into the monitor form:
-
-```bash
-docker --tlsverify --tlscacert=ca.pem --tlscert=cert.pem --tlskey=key.pem \
-  -H=docker.example.com:2376 version
-```
-
 For more documentation, see the [docs directory](./docs/).
 
 <a id="performance"></a>
@@ -248,7 +134,7 @@ Thanks to extensive optimizations, Checkmate operates with an exceptionally smal
 
 ![image](https://github.com/user-attachments/assets/37e04a75-d83a-488f-b25c-025511b492c9)
 
-You can see the memory footprint of MongoDB on the same server (398Mb) for the same amount of servers:
+You can see the memory footprint of MongoDB and Redis on the same server (398Mb and 15Mb) for the same amount of servers:
 
 ![image](https://github.com/user-attachments/assets/3b469e85-e675-4040-a162-3f24c1afc751)
 
@@ -266,16 +152,16 @@ Feel free to ask questions or share your ideas - we'd love to hear from you!
 ## Features
 
 - Completely open source, deployable on your servers or home devices (e.g Raspberry Pi 4 or 5)
-- Several monitoring options: HTTP (with SSL certificate expiry), Ping, Port, DNS, Docker, gRPC, WebSocket, Game server
+- Several monitoring options: Uptime, Docker, Ping, SSL, Port, Game server
 - Page speed monitoring
 - Infrastructure monitoring (memory, disk usage, CPU performance, network etc) - requires [Capture](https://github.com/bluewave-labs/capture) agent
   - Selective disk monitoring with mountpoint selection
 - Incidents at a glance
-- Status pages with 5 beautiful themes
-- E-mail, Webhooks, Discord, Slack, PagerDuty, Matrix, Rocket.Chat, Microsoft Teams, Telegram, Pushover, ntfy, SignalGrid, Twilio (SMS) notifications
+- Status pages with 4 beautiful themes
+- E-mail, Webhooks, Discord, Slack, PagerDuty, Matrix, Rocket.Chat, Microsoft Teams, Telegram, Pushover, Twilio (SMS) notifications
 - Scheduled maintenance
 - JSON query monitoring
-- Multi-language support for Arabic, Catalan, Chinese (Simplified), Chinese (Traditional, Taiwan), Czech, English, Finnish, French, German, Italian, Japanese, Polish, Portuguese (Brazil), Russian, Spanish, Thai, Turkish, Ukrainian, and Vietnamese
+- Multi-language support for Arabic, Chinese (Simplified), Chinese (Traditional, Taiwan), Czech, English, Finnish, French, German, Japanese, Portuguese (Brazil), Russian, Spanish, Thai, Turkish, Ukrainian, and Vietnamese
 
 
 ## Monitor Lifecycle
@@ -326,9 +212,9 @@ Feel free to ask questions or share your ideas - we'd love to hear from you!
 <a id="contributing"></a>
 ## Contributing
 
-We are [Alex](http://github.com/ajhollid) (team lead), [Gorkem](http://github.com/gorkem-bwl/), [Aryaman](https://github.com/Br0wnHammer), [Malena](https://github.com/malenacaroline) and [Mert](https://github.com/mertssmnoglu) helping individuals and businesses monitor their infra and servers.
+We are [Alex](http://github.com/ajhollid) (team lead), [Gorkem](http://github.com/gorkem-bwl/), [Aryaman](https://github.com/Br0wnHammer) and [Mert](https://github.com/mertssmnoglu) helping individuals and businesses monitor their infra and servers.
 
-We pride ourselves on building strong connections with contributors at every level. Despite being a young project, Checkmate has already earned almost 11K stars and attracted 150+ contributors from around the globe.
+We pride ourselves on building strong connections with contributors at every level. Despite being a young project, Checkmate has already earned almost 11K+ stars and attracted 150+ contributors from around the globe.
 
 Our repo is starred by employees from **Google, Microsoft, Intel, Cisco, Tencent, Electronic Arts, ByteDance, JP Morgan Chase, Deloitte, Accenture, Foxconn, Broadcom, China Telecom, Barclays, Capgemini, Wipro, Cloudflare, Dassault Systèmes and NEC**, so don’t hold back — jump in, contribute and learn with us!
 

charts/helm/checkmate/Chart.yaml

@@ -2,9 +2,5 @@ apiVersion: v2
 name: checkmate-chart
 description: A Helm chart for Checkmate App
 type: application
-version: 0.2.0
-# DO NOT bump appVersion past v3.8.1 until this chart is migrated to the all-in-one
-# image (ghcr.io/bluewave-labs/checkmate). The checkmate-client / checkmate-backend /
-# checkmate-mongo images this chart references are frozen at v3.8.1 — later versions
-# are never published, so a bumped chart will fail to pull.
-appVersion: "v3.8.1" # "v" prefix: published image tags are v-prefixed (ghcr.io/.../checkmate-*:v3.8.1)
+version: 0.3.0
+appVersion: "latest" # the all-in-one image publishes :latest on release tags; pin a version here to freeze

charts/helm/checkmate/INSTALLATION.md

@@ -19,8 +19,8 @@ cd checkmate/charts/helm/checkmate
 
 ### 2. Customize values.yaml
 Edit `values.yaml` to update:
-- `client.ingress.host` and `api.ingress.host` with your domain names
-- `api.protocol` (usually http or https)
+- `app.ingress.host` with your domain name
+- `app.protocol` (usually http or https)
 - **If upgrading**: Migrate persistence settings from flat structure to nested:
   - Old: `persistence.mongodbSize` → New: `persistence.mongo.size`
   - Add: `persistence.mongo.storageClass` (leave empty for default)
@@ -95,7 +95,7 @@ chart. You can still pin per tier:
 
 ```yaml
 api:
-  image: ghcr.io/bluewave-labs/checkmate-backend   # repo only
+  image: ghcr.io/bluewave-labs/checkmate   # repo only
   tag: ""            # empty → Chart.appVersion; set e.g. "v3.1.0" to pin, or "latest" for a dev tag
 ```
 
@@ -244,3 +244,41 @@ kubectl get secrets | grep checkmate-tls
 ```
 
 The ingress will automatically use these secrets to enable HTTPS access to your Checkmate instance.
+
+## Upgrading to chart 0.3.0 (all-in-one image)
+
+Checkmate now ships as a single image that serves both the client and the API, so
+the chart deploys one workload and one ingress instead of two.
+
+**What changed**
+
+| 0.2.x | 0.3.0 |
+|---|---|
+| `client.*` + `api.*` value blocks | one `app.*` block |
+| `checkmate-client` + `checkmate-backend` images | `ghcr.io/bluewave-labs/checkmate` |
+| `ghcr.io/bluewave-labs/checkmate-mongo` | upstream `mongo:8.0` |
+| Deployment `checkmate-api` + `checkmate-client` | Deployment `checkmate` |
+| Ingress `checkmate-api-ingress` (`/api/v1`) + client ingress (`/`) | Ingress `checkmate-ingress` (`/`) |
+| `UPTIME_APP_API_BASE_URL`, `UPTIME_APP_CLIENT_HOST` | not set — the client is same-origin |
+
+`appVersion` is no longer frozen at v3.8.1; the chart tracks the published image again.
+
+**Upgrading an existing install**
+
+Existing `client.*`, `api.*` and `server.*` overrides are still read and merged over
+the `app.*` defaults, so most values files upgrade without edits. Two cases fail
+deliberately rather than deploying something wrong:
+
+- `client.image` set — that image is no longer published, so the chart stops instead
+  of leaving you with an ImagePullBackOff. Remove the `client:` block.
+- `client.ingress.host` and `api.ingress.host` set to *different* hosts — one origin
+  now serves both, so the chart cannot honour a split. Set a single `app.ingress.host`.
+
+Migrate overrides to `app.*` when convenient; the legacy blocks are transitional.
+
+**One ingress, one host**
+
+If you previously served the client and API on separate hostnames, external clients
+now use the single `app.ingress.host`. Update any bookmarks, uptime checks, or DNS
+records that pointed at the old API hostname.
+

charts/helm/checkmate/templates/_helpers.tpl

@@ -1,18 +1,41 @@
 {{- /*
-Back-compat shim: the `server.*` value block was renamed to `api.*`. Existing installs that
-still pass a legacy `server:` block keep working — this returns the effective API values with any
-legacy `server.*` overrides merged on top of the `api.*` defaults (legacy wins where set).
+Back-compat shim for the all-in-one image migration.
 
-New installs have no `server:` key, so this is a no-op deepCopy of `.Values.api`. Consume it as:
-  {{- $api := include "checkmate.api" . | fromYaml -}}
-then reference `$api.*` instead of `.Values.api.*`.
+Chart 0.2.x deployed a separate client and API, configured through `client.*` and
+`api.*` (and, before that, `server.*`). Checkmate now ships one image that serves
+both, so those collapse into a single `app.*` block.
+
+Existing installs keep working: any legacy block is merged over the `app.*`
+defaults, in the order client -> api -> server, so a value set in an older block
+still wins. Only `image`/`tag` are deliberately NOT inherited from `client.*` —
+that repo (checkmate-client) is no longer published, so honouring it would pin an
+install to an image that cannot be pulled.
+
+New installs have no legacy keys and this is a no-op deepCopy of `.Values.app`.
+Consume it as:
+  {{- $app := include "checkmate.app" . | fromYaml -}}
+*/}}
+{{- define "checkmate.app" -}}
+{{- $app := deepCopy .Values.app -}}
+{{- with .Values.client -}}
+{{- $legacy := omit (deepCopy .) "image" "tag" "port" -}}
+{{- $app = mergeOverwrite $app $legacy -}}
+{{- end -}}
+{{- with .Values.api -}}
+{{- $app = mergeOverwrite $app (deepCopy .) -}}
+{{- end -}}
+{{- with .Values.server -}}
+{{- $app = mergeOverwrite $app (deepCopy .) -}}
+{{- end -}}
+{{- $app | toYaml -}}
+{{- end -}}
+
+{{- /*
+Deprecated alias kept so any out-of-tree template referencing `checkmate.api`
+still resolves. Prefer `checkmate.app`.
 */}}
 {{- define "checkmate.api" -}}
-{{- $api := deepCopy .Values.api -}}
-{{- with .Values.server -}}
-{{- $api = mergeOverwrite $api (deepCopy .) -}}
-{{- end -}}
-{{- $api | toYaml -}}
+{{- include "checkmate.app" . -}}
 {{- end -}}
 
 {{- /*

charts/helm/checkmate/templates/api/deployment.yaml

@@ -1,65 +0,0 @@
-{{- $api := include "checkmate.api" . | fromYaml -}}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: checkmate-api
-spec:
-  replicas: 1 # single scheduler — seeds/reconciles the jobs collection
-  selector:
-    matchLabels:
-      app: checkmate-api
-  template:
-    metadata:
-      labels:
-        app: checkmate-api
-    spec:
-    {{- with $api.affinity }}
-      affinity:
-        {{- tpl ( . | toYaml) $ | nindent 8 }}
-    {{- end }}
-    {{- with $api.tolerations }}
-      tolerations:
-        {{- tpl ( . | toYaml) $ | nindent 8 }}
-    {{- end }}
-      containers:
-        - name: api
-          image: {{ include "checkmate.image" (dict "image" $api.image "tag" $api.tag "root" $) }}
-          imagePullPolicy: {{ $api.imagePullPolicy }}
-          ports:
-            - name: http
-              containerPort: {{ $api.port }}
-          envFrom:
-            - secretRef:
-                name: checkmate-secrets
-          # Probes hit the Express /api/v1/health endpoint — proves the HTTP server is responsive.
-          # NOTE: this does NOT detect a wedged job loop when queuePrimaryProcesses=true (the API is
-          # also a worker). Worker-aware health for that mode is a follow-up — see worker-health-checks.md §7.5.
-          livenessProbe:
-            httpGet:
-              path: /api/v1/health
-              port: http
-            initialDelaySeconds: {{ $api.probes.liveness.initialDelaySeconds }}
-            periodSeconds: {{ $api.probes.liveness.periodSeconds }}
-            timeoutSeconds: {{ $api.probes.liveness.timeoutSeconds }}
-            failureThreshold: {{ $api.probes.liveness.failureThreshold }}
-          readinessProbe:
-            httpGet:
-              path: /api/v1/health
-              port: http
-            initialDelaySeconds: {{ $api.probes.readiness.initialDelaySeconds }}
-            periodSeconds: {{ $api.probes.readiness.periodSeconds }}
-            timeoutSeconds: {{ $api.probes.readiness.timeoutSeconds }}
-            failureThreshold: {{ $api.probes.readiness.failureThreshold }}
-          {{- with $api.resources }}
-          resources:
-              {{- tpl ( . | toYaml) $ | nindent 12 }}
-          {{- end }}
-          env:
-          - name: CLIENT_HOST
-            value: "{{ .Values.client.protocol }}://{{ .Values.client.ingress.host }}"
-          - name: QUEUE_MODE
-            value: "primary"
-          # Derived: when a worker tier is deployed the API only schedules (false); otherwise it is
-          # all-in-one and processes jobs itself (true). Keeps the two from ever competing for jobs.
-          - name: QUEUE_PRIMARY_PROCESSES
-            value: {{ not .Values.worker.enabled | quote }}

charts/helm/checkmate/templates/api/ingress.yaml

@@ -1,39 +0,0 @@
-{{- $api := include "checkmate.api" . | fromYaml -}}
-{{- if $api.ingress.enabled }}
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: checkmate-api-ingress
-  {{- if $api.ingress.annotations }}
-  annotations:
-    {{- range $key, $value := $api.ingress.annotations }}
-    {{ $key }}: {{ $value | quote }}
-    {{- end }}
-  {{- end }}
-  {{/*#annotations:
-    #nginx.ingress.kubernetes.io/rewrite-target: /
-    #nginx.ingress.kubernetes.io/enable-cors: "true"
-    #nginx.ingress.kubernetes.io/cors-allow-origin: "http://{{ .Values.client.ingress.host }},https://{{ .Values.client.ingress.host }}"
-    #nginx.ingress.kubernetes.io/cors-allow-methods: "GET, PUT, POST, DELETE, PATCH, OPTIONS"
-    #nginx.ingress.kubernetes.io/cors-allow-headers: "DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization"
-    #nginx.ingress.kubernetes.io/cors-allow-credentials: "true"*/}}
-spec:
-  ingressClassName: {{ $api.ingress.className }}
-  {{- if $api.ingress.tls.enabled }}
-  tls:
-    - hosts:
-        - {{ $api.ingress.host }}
-      secretName: {{ default (printf "%s-api-tls" .Release.Name) $api.ingress.tls.secretName }}
-  {{- end }}
-  rules:
-    - host: {{ $api.ingress.host }}
-      http:
-        paths:
-          - path: /api/v1
-            pathType: Prefix
-            backend:
-              service:
-                name: checkmate-api
-                port:
-                  number: {{ $api.port }}
-{{- end }}

charts/helm/checkmate/templates/api/service.yaml

@@ -1,10 +0,0 @@
-{{- $api := include "checkmate.api" . | fromYaml -}}
-apiVersion: v1
-kind: Service
-metadata:
-  name: checkmate-api
-spec:
-  selector:
-    app: checkmate-api
-  ports:
-    - port: {{ $api.port }}

charts/helm/checkmate/templates/app/deployment.yaml

@@ -0,0 +1,71 @@
+{{- $app := include "checkmate.app" . | fromYaml -}}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: checkmate
+spec:
+  replicas: 1 # single scheduler — seeds/reconciles the jobs collection
+  selector:
+    matchLabels:
+      app: checkmate
+  template:
+    metadata:
+      labels:
+        app: checkmate
+    spec:
+    {{- with $app.affinity }}
+      affinity:
+        {{- tpl ( . | toYaml) $ | nindent 8 }}
+    {{- end }}
+    {{- with $app.tolerations }}
+      tolerations:
+        {{- tpl ( . | toYaml) $ | nindent 8 }}
+    {{- end }}
+      containers:
+        - name: checkmate
+          image: {{ include "checkmate.image" (dict "image" $app.image "tag" $app.tag "root" $) }}
+          imagePullPolicy: {{ $app.imagePullPolicy }}
+          ports:
+            - name: http
+              containerPort: {{ $app.port }}
+          envFrom:
+            - secretRef:
+                name: checkmate-secrets
+          # Probes hit the Express /api/v1/health endpoint — proves the HTTP server is responsive.
+          # NOTE: this does NOT detect a wedged job loop when queuePrimaryProcesses=true (the app is
+          # also a worker). Worker-aware health for that mode is a follow-up — see worker-health-checks.md §7.5.
+          livenessProbe:
+            httpGet:
+              path: /api/v1/health
+              port: http
+            initialDelaySeconds: {{ $app.probes.liveness.initialDelaySeconds }}
+            periodSeconds: {{ $app.probes.liveness.periodSeconds }}
+            timeoutSeconds: {{ $app.probes.liveness.timeoutSeconds }}
+            failureThreshold: {{ $app.probes.liveness.failureThreshold }}
+          readinessProbe:
+            httpGet:
+              path: /api/v1/health
+              port: http
+            initialDelaySeconds: {{ $app.probes.readiness.initialDelaySeconds }}
+            periodSeconds: {{ $app.probes.readiness.periodSeconds }}
+            timeoutSeconds: {{ $app.probes.readiness.timeoutSeconds }}
+            failureThreshold: {{ $app.probes.readiness.failureThreshold }}
+          {{- with $app.resources }}
+          resources:
+              {{- tpl ( . | toYaml) $ | nindent 12 }}
+          {{- end }}
+          env:
+          # The client is served from this same origin, so CLIENT_HOST defaults to
+          # the app's own ingress URL. `env` takes precedence over `envFrom`, so an
+          # explicit secrets.CLIENT_HOST is honoured by omitting this entry rather
+          # than emitting a value that would silently win over it.
+          {{- if not (hasKey .Values.secrets "CLIENT_HOST") }}
+          - name: CLIENT_HOST
+            value: "{{ $app.protocol }}://{{ $app.ingress.host }}"
+          {{- end }}
+          - name: QUEUE_MODE
+            value: "primary"
+          # Derived: when a worker tier is deployed the app only schedules (false); otherwise it is
+          # all-in-one and processes jobs itself (true). Keeps the two from ever competing for jobs.
+          - name: QUEUE_PRIMARY_PROCESSES
+            value: {{ not .Values.worker.enabled | quote }}

charts/helm/checkmate/templates/app/ingress.yaml

@@ -0,0 +1,35 @@
+{{- $app := include "checkmate.app" . | fromYaml -}}
+{{- if $app.ingress.enabled }}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: checkmate-ingress
+  {{- if $app.ingress.annotations }}
+  annotations:
+    {{- range $key, $value := $app.ingress.annotations }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+  {{- end }}
+spec:
+  ingressClassName: {{ $app.ingress.className }}
+  {{- if $app.ingress.tls.enabled }}
+  tls:
+    - hosts:
+        - {{ $app.ingress.host }}
+      secretName: {{ default (printf "%s-tls" .Release.Name) $app.ingress.tls.secretName }}
+  {{- end }}
+  rules:
+    - host: {{ $app.ingress.host }}
+      http:
+        paths:
+          # The application serves both the client and /api/v1 from one origin, so
+          # a single root rule replaces the separate client and API ingresses. No
+          # CORS annotations are needed now that the browser is same-origin.
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: checkmate
+                port:
+                  number: {{ $app.port }}
+{{- end }}

charts/helm/checkmate/templates/app/service.yaml

@@ -0,0 +1,10 @@
+{{- $app := include "checkmate.app" . | fromYaml -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: checkmate
+spec:
+  selector:
+    app: checkmate
+  ports:
+    - port: {{ $app.port }}

charts/helm/checkmate/templates/client/deployment.yaml

@@ -1,46 +0,0 @@
-{{- $api := include "checkmate.api" . | fromYaml -}}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: checkmate-client
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: checkmate-client
-  template:
-    metadata:
-      labels:
-        app: checkmate-client
-    spec:
-    {{- with .Values.client.affinity }}
-      affinity:
-        {{- tpl ( . | toYaml) $ | nindent 8 }}
-    {{- end }}
-    {{- with .Values.client.tolerations }}
-      tolerations:
-        {{- tpl ( . | toYaml) $ | nindent 8 }}
-    {{- end }}
-      containers:
-        - name: client
-          image: {{ include "checkmate.image" (dict "image" .Values.client.image "tag" .Values.client.tag "root" $) }}
-          imagePullPolicy: {{ .Values.client.imagePullPolicy }}
-          ports:
-            - containerPort: {{ .Values.client.port }}
-          env:
-            - name: UPTIME_APP_API_BASE_URL
-              value: "{{ $api.protocol }}://{{ $api.ingress.host }}/api/v1"
-            - name: UPTIME_APP_CLIENT_HOST
-              value: "{{ .Values.client.protocol }}://{{ .Values.client.ingress.host }}"
-          volumeMounts:
-            - name: config-volume
-              mountPath: /etc/nginx/conf.d/default.conf
-              subPath: default.conf
-          {{- with .Values.client.resources }}
-          resources:
-              {{- tpl ( . | toYaml) $ | nindent 12 }}
-          {{- end }}
-      volumes:
-        - name: config-volume
-          configMap:
-            name: checkmate-client-nginx-cm

charts/helm/checkmate/templates/client/ingress.yaml

@@ -1,31 +0,0 @@
-{{- if .Values.client.ingress.enabled }}
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: checkmate-client-ingress
-  {{- if .Values.client.ingress.annotations }}
-  annotations:
-    {{- range $key, $value := .Values.client.ingress.annotations }}
-    {{ $key }}: {{ $value | quote }}
-    {{- end }}
-  {{- end }}
-spec:
-  ingressClassName: {{ .Values.client.ingress.className }}
-  {{- if .Values.client.ingress.tls.enabled }}
-  tls:
-    - hosts:
-        - {{ .Values.client.ingress.host }}
-      secretName: {{ default (printf "%s-client-tls" .Release.Name) .Values.client.ingress.tls.secretName }}
-  {{- end }}
-  rules:
-    - host: {{ .Values.client.ingress.host }}
-      http:
-        paths:
-          - path: /
-            pathType: Prefix
-            backend:
-              service:
-                name: checkmate-client
-                port:
-                  number: {{ .Values.client.port }}
-{{- end }}

charts/helm/checkmate/templates/client/nginx-cm.yaml

@@ -1,42 +0,0 @@
-{{- $api := include "checkmate.api" . | fromYaml -}}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: checkmate-client-nginx-cm
-data:
-  default.conf: |
-    server {
-      listen       80;
-      listen  [::]:80;
-
-      server_name checkmate-demo.bluewavelabs.ca;
-      server_tokens off;
-
-      location /.well-known/acme-challenge/ {
-          root /var/www/certbot;
-      }
-
-      location / {
-          root   /usr/share/nginx/html;
-          index  index.html index.htm;
-          try_files $uri $uri/ /index.html;
-      }
-
-      # location /api/ {
-      #     proxy_pass http://{{ $api.ingress.host }}:5000/api/;
-      #     proxy_http_version 1.1;
-      #     proxy_set_header Host $host;
-      #     proxy_set_header X-Real-IP $remote_addr;
-      #     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-      #     proxy_set_header X-Forwarded-Proto $scheme;
-      # }
-
-      location /api-docs/ {
-          proxy_pass http://{{ $api.ingress.host }}:5000/api-docs/;
-          proxy_http_version 1.1;
-          proxy_set_header Host $host;
-          proxy_set_header X-Real-IP $remote_addr;
-          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-          proxy_set_header X-Forwarded-Proto $scheme;
-      }
-    }

charts/helm/checkmate/templates/client/service.yaml

@@ -1,9 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: checkmate-client
-spec:
-  selector:
-    app: checkmate-client
-  ports:
-    - port: {{ .Values.client.port }}

charts/helm/checkmate/templates/prechecks.yaml

@@ -1,49 +1,45 @@
-{{- $api := include "checkmate.api" . | fromYaml -}}
-{{- if eq .Values.client.ingress.host "change_me" }}
-  {{- fail "client.ingress.host must be overridden and not set to 'change_me'" }}
+{{- $app := include "checkmate.app" . | fromYaml -}}
+{{- if eq $app.ingress.host "change_me" }}
+  {{- fail "app.ingress.host must be overridden and not set to 'change_me'" }}
 {{- end }}
 
-{{- if eq $api.ingress.host "change_me" }}
-  {{- fail "api.ingress.host (or legacy server.ingress.host) must be overridden and not set to 'change_me'" }}
-{{- end }}
-
-{{- $apiProtocol := $api.protocol }}
-{{- if not (or (eq $apiProtocol "http") (eq $apiProtocol "https")) }}
-  {{- fail "api.protocol must be either 'http' or 'https'" }}
-{{- end }}
-
-{{- $clientProtocol := .Values.client.protocol }}
-{{- if not (or (eq $clientProtocol "http") (eq $clientProtocol "https")) }}
-  {{- fail "client.protocol must be either 'http' or 'https'" }}
+{{- $protocol := $app.protocol }}
+{{- if not (or (eq $protocol "http") (eq $protocol "https")) }}
+  {{- fail "app.protocol must be either 'http' or 'https'" }}
 {{- end }}
 
 {{/* Enforce protocol when TLS is enabled to avoid mixed-content */}}
-{{- if and .Values.client.ingress.tls.enabled (ne $clientProtocol "https") }}
-  {{- fail "client.ingress.tls.enabled is true but client.protocol is not 'https'. Set client.protocol: https to avoid mixed content." }}
-{{- end }}
-
-{{- if and $api.ingress.tls.enabled (ne $apiProtocol "https") }}
-  {{- fail "api.ingress.tls.enabled is true but api.protocol is not 'https'. Set api.protocol: https to ensure correct API base URL." }}
-{{- end }}
-
-{{/* If client runs on https, API must also be https to avoid mixed content */}}
-{{- if and (eq $clientProtocol "https") (ne $apiProtocol "https") }}
-  {{- fail "client.protocol is 'https' but api.protocol is not. Set api.protocol: https to prevent browser mixed-content issues." }}
+{{- if and $app.ingress.tls.enabled (ne $protocol "https") }}
+  {{- fail "app.ingress.tls.enabled is true but app.protocol is not 'https'. Set app.protocol: https to avoid mixed content." }}
 {{- end }}
 
 {{/* Fail early if TLS enabled without cert-manager annotations (cluster-issuer or issuer) */}}
-{{- $cAnn := .Values.client.ingress.annotations | default dict }}
-{{- $aAnn := $api.ingress.annotations | default dict }}
+{{- $ann := $app.ingress.annotations | default dict }}
+{{- $hasIssuer := or (hasKey $ann "cert-manager.io/cluster-issuer") (hasKey $ann "cert-manager.io/issuer") }}
 
-{{- $clientHasIssuer := or (hasKey $cAnn "cert-manager.io/cluster-issuer") (hasKey $cAnn "cert-manager.io/issuer") }}
-{{- $apiHasIssuer := or (hasKey $aAnn "cert-manager.io/cluster-issuer") (hasKey $aAnn "cert-manager.io/issuer") }}
-
-{{- if and .Values.client.ingress.tls.enabled (not $clientHasIssuer) }}
-  {{- fail "client.ingress.tls.enabled is true but no cert-manager issuer annotation found. Add 'cert-manager.io/cluster-issuer' or 'cert-manager.io/issuer'." }}
+{{- if and $app.ingress.tls.enabled (not $hasIssuer) }}
+  {{- fail "app.ingress.tls.enabled is true but no cert-manager issuer annotation found. Add 'cert-manager.io/cluster-issuer' or 'cert-manager.io/issuer'." }}
 {{- end }}
 
-{{- if and $api.ingress.tls.enabled (not $apiHasIssuer) }}
-  {{- fail "api.ingress.tls.enabled is true but no cert-manager issuer annotation found. Add 'cert-manager.io/cluster-issuer' or 'cert-manager.io/issuer'." }}
+{{/*
+  Upgrade guard. The client and API are one service now, so a values file that still
+  points the two at different hosts cannot be honoured — fail loudly rather than
+  silently dropping one of them.
+*/}}
+{{- if and .Values.client .Values.api }}
+{{- $clientHost := (.Values.client.ingress | default dict).host }}
+{{- $apiHost := (.Values.api.ingress | default dict).host }}
+{{- if and $clientHost $apiHost (ne $clientHost $apiHost) }}
+  {{- fail (printf "client.ingress.host (%s) and api.ingress.host (%s) differ, but Checkmate now serves the client and the API from one origin. Set a single app.ingress.host instead." $clientHost $apiHost) }}
+{{- end }}
+{{- end }}
+
+{{/*
+  The client image is no longer published. Point this out rather than letting the
+  install fail later on an ImagePullBackOff nobody can action.
+*/}}
+{{- if and .Values.client .Values.client.image }}
+  {{- fail "client.image is set, but the separate client image is no longer published. Remove the client block; the application image in app.image now serves the client." }}
 {{- end }}
 
 {{/* Worker grace period must exceed the server drain timeout (25s) or workers are SIGKILLed mid-drain */}}
@@ -51,4 +47,4 @@
   {{- fail "worker.terminationGracePeriodSeconds must be greater than 25 (the server drain timeout) or workers are killed mid-drain" }}
 {{- end }}
 
-{{/* Secret name can be omitted; we default to <release>-client|api-tls in templates */}}
+{{/* Secret name can be omitted; we default to <release>-tls in templates */}}

charts/helm/checkmate/templates/worker/deployment.yaml

@@ -1,4 +1,4 @@
-{{- $api := include "checkmate.api" . | fromYaml -}}
+{{- $app := include "checkmate.app" . | fromYaml -}}
 {{- if .Values.worker.enabled }}
 apiVersion: apps/v1
 kind: Deployment
@@ -27,8 +27,8 @@ spec:
     {{- end }}
       containers:
         - name: worker
-          image: {{ include "checkmate.image" (dict "image" (.Values.worker.image | default $api.image) "tag" (.Values.worker.tag | default $api.tag) "root" $) }}
-          imagePullPolicy: {{ .Values.worker.imagePullPolicy | default $api.imagePullPolicy }}
+          image: {{ include "checkmate.image" (dict "image" (.Values.worker.image | default $app.image) "tag" (.Values.worker.tag | default $app.tag) "root" $) }}
+          imagePullPolicy: {{ .Values.worker.imagePullPolicy | default $app.imagePullPolicy }}
           ports:
             - name: health
               containerPort: {{ .Values.worker.healthPort }}
@@ -36,9 +36,13 @@ spec:
             - secretRef:
                 name: checkmate-secrets # DB_CONNECTION_STRING (+ JWT_SECRET/CLIENT_HOST for validateEnv)
           env:
-          # Secret default CLIENT_HOST is the non-URL "change_me"; override like the API so validateEnv passes.
+          # validateEnv requires a URL-shaped CLIENT_HOST, so mirror the app's default
+          # here. Omitted when secrets.CLIENT_HOST is set, since `env` would otherwise
+          # take precedence over the envFrom value and silently discard the override.
+          {{- if not (hasKey .Values.secrets "CLIENT_HOST") }}
           - name: CLIENT_HOST
-            value: "{{ .Values.client.protocol }}://{{ .Values.client.ingress.host }}"
+            value: "{{ $app.protocol }}://{{ $app.ingress.host }}"
+          {{- end }}
           - name: QUEUE_MODE
             value: "worker"
           - name: HEALTH_PORT

charts/helm/checkmate/values.yaml

@@ -1,31 +1,17 @@
-client:
-  image: ghcr.io/bluewave-labs/checkmate-client
-  tag: "" # defaults to Chart.appVersion; set a full repo:tag in `image` to pin (e.g. a :latest dev tag)
-  imagePullPolicy: IfNotPresent # IfNotPresent so kind-loaded :latest images are used (not pulled)
-  port: 80
-  protocol: http
-  ingress:
-    enabled: true
-    host: change_me
-    className: nginx
-    annotations: {}
-    # Example annotations for cert-manager:
-    # annotations:
-    #   cert-manager.io/cluster-issuer: "letsencrypt-prod"
-    tls:
-      enabled: false
-      # secretName: {{ .Release.Name }}-client-tls  # Optional; defaults to <release>-client-tls if omitted
-      # Note: when enabling TLS, also set client.protocol: https and add
-      # a cert-manager issuer annotation (e.g. cert-manager.io/cluster-issuer: "letsencrypt-prod").
-      # The secret will be automatically created by cert-manager when using the cert-manager.io/cluster-issuer annotation
-
-api:
-  image: ghcr.io/bluewave-labs/checkmate-backend
+# Checkmate is published as a single all-in-one application image: the API server
+# also serves the React client, so one deployment and one ingress cover both.
+# The `client:` and `api:` blocks from chart 0.2.x are still read for back-compat
+# (see templates/_helpers.tpl) — `app.*` is the block to set on new installs.
+app:
+  image: ghcr.io/bluewave-labs/checkmate
   tag: "" # defaults to Chart.appVersion; set a full repo:tag in `image` to pin (e.g. a :latest dev tag)
   imagePullPolicy: IfNotPresent # IfNotPresent so kind-loaded :latest images are used (not pulled)
   port: 52345
   protocol: http
-  # Liveness/readiness probes hit GET /api/v1/health on the api port (proves the HTTP server is up).
+  resources: {}
+  affinity: {}
+  tolerations: {}
+  # Liveness/readiness probes hit GET /api/v1/health on the app port (proves the HTTP server is up).
   probes:
     liveness:
       initialDelaySeconds: 10
@@ -47,25 +33,27 @@ api:
     #   cert-manager.io/cluster-issuer: "letsencrypt-prod"
     tls:
       enabled: false
-      # secretName: {{ .Release.Name }}-api-tls  # Optional; defaults to <release>-api-tls if omitted
-      # Note: when enabling TLS, also set api.protocol: https and add
+      # secretName: {{ .Release.Name }}-tls  # Optional; defaults to <release>-tls if omitted
+      # Note: when enabling TLS, also set app.protocol: https and add
       # a cert-manager issuer annotation (e.g. cert-manager.io/cluster-issuer: "letsencrypt-prod").
       # The secret will be automatically created by cert-manager when using the cert-manager.io/cluster-issuer annotation
 
+# Upstream MongoDB. The former ghcr.io/bluewave-labs/checkmate-mongo image is no
+# longer published; this matches the mongo version in docker/docker-compose.yaml.
 mongodb:
-  image: ghcr.io/bluewave-labs/checkmate-mongo
-  tag: "" # defaults to Chart.appVersion; set a full repo:tag in `image` to pin
-  imagePullPolicy: IfNotPresent # IfNotPresent so kind-loaded :latest images are used (not pulled)
+  image: mongo
+  tag: "8.0"
+  imagePullPolicy: IfNotPresent
   port: 27017
 
 worker:
   # Off by default; existing installs are unchanged. When true, a dedicated worker processes all
-  # jobs and the API stops processing (QUEUE_PRIMARY_PROCESSES is derived as false). When false, the
-  # API is all-in-one and processes jobs itself.
+  # jobs and the app stops processing (QUEUE_PRIMARY_PROCESSES is derived as false). When false, the
+  # app is all-in-one and processes jobs itself.
   enabled: false
-  image: "" # defaults to api.image when empty, same as API image
-  tag: "" # defaults to api.tag (-> Chart.appVersion) when empty
-  imagePullPolicy: "" # defaults to api.imagePullPolicy when empty
+  image: "" # defaults to app.image when empty, same as the application image
+  tag: "" # defaults to app.tag (-> Chart.appVersion) when empty
+  imagePullPolicy: "" # defaults to app.imagePullPolicy when empty
   replicas: 1 # used only when autoscaling.enabled = false
   healthPort: 52346 # HEALTH_PORT; serves /livez /readyz /metrics
   terminationGracePeriodSeconds: 30 # MUST stay > the server drain timeout (25s) or workers are killed mid-drain
@@ -97,7 +85,8 @@ worker:
 secrets:
   JWT_SECRET: change_me
   DB_CONNECTION_STRING: mongodb://checkmate-mongodb:27017/uptime_db
-  CLIENT_HOST: change_me
+  # CLIENT_HOST is derived from app.protocol + app.ingress.host by the deployment;
+  # set it here only to override that (e.g. when fronting the app with another proxy).
   NODE_ENV: production
   LOG_LEVEL: info
   TOKEN_TTL: 99d

client/package-lock.json

@@ -1,17 +1,16 @@
 {
 	"name": "client",
-	"version": "3.12.0",
+	"version": "3.11.0",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "client",
-			"version": "3.12.0",
+			"version": "3.11.0",
 			"dependencies": {
 				"@csstools/css-tokenizer": "^3.0.4",
 				"@emotion/react": "^11.13.3",
 				"@emotion/styled": "^11.13.0",
-				"@fontsource-variable/geist": "^5.3.0",
 				"@hello-pangea/dnd": "^18.0.0",
 				"@hookform/resolvers": "5.2.2",
 				"@mui/lab": "7.0.0",
@@ -93,7 +92,6 @@
 			"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",
@@ -409,7 +407,6 @@
 		"node_modules/@emotion/react": {
 			"version": "11.14.0",
 			"license": "MIT",
-			"peer": true,
 			"dependencies": {
 				"@babel/runtime": "^7.18.3",
 				"@emotion/babel-plugin": "^11.13.5",
@@ -447,7 +444,6 @@
 		"node_modules/@emotion/styled": {
 			"version": "11.14.1",
 			"license": "MIT",
-			"peer": true,
 			"dependencies": {
 				"@babel/runtime": "^7.18.3",
 				"@emotion/babel-plugin": "^11.13.5",
@@ -954,15 +950,6 @@
 				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			}
 		},
-		"node_modules/@fontsource-variable/geist": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/@fontsource-variable/geist/-/geist-5.3.0.tgz",
-			"integrity": "sha512-j0m+vLQuG5XAYoHtGCVu0spvlGreR3EzpECUVzkFmI1mTVnAO38l/NEPDCFgZ177JxzYJCLSmTQibIiYPilGrA==",
-			"license": "OFL-1.1",
-			"funding": {
-				"url": "https://github.com/sponsors/ayuhito"
-			}
-		},
 		"node_modules/@hapi/hoek": {
 			"version": "9.3.0",
 			"license": "BSD-3-Clause"
@@ -1236,7 +1223,6 @@
 		"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",
@@ -1341,7 +1327,6 @@
 		"node_modules/@mui/system": {
 			"version": "7.3.7",
 			"license": "MIT",
-			"peer": true,
 			"dependencies": {
 				"@babel/runtime": "^7.28.4",
 				"@mui/private-theming": "^7.3.7",
@@ -2386,7 +2371,6 @@
 			"version": "24.5.2",
 			"devOptional": true,
 			"license": "MIT",
-			"peer": true,
 			"dependencies": {
 				"undici-types": "~7.12.0"
 			}
@@ -2402,7 +2386,6 @@
 		"node_modules/@types/react": {
 			"version": "18.3.27",
 			"license": "MIT",
-			"peer": true,
 			"dependencies": {
 				"@types/prop-types": "*",
 				"csstype": "^3.2.2"
@@ -2493,7 +2476,6 @@
 			"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",
@@ -2774,7 +2756,6 @@
 			"version": "8.15.0",
 			"dev": true,
 			"license": "MIT",
-			"peer": true,
 			"bin": {
 				"acorn": "bin/acorn"
 			},
@@ -3131,7 +3112,6 @@
 				}
 			],
 			"license": "MIT",
-			"peer": true,
 			"dependencies": {
 				"baseline-browser-mapping": "^2.10.42",
 				"caniuse-lite": "^1.0.30001800",
@@ -3575,8 +3555,7 @@
 		},
 		"node_modules/dayjs": {
 			"version": "1.11.13",
-			"license": "MIT",
-			"peer": true
+			"license": "MIT"
 		},
 		"node_modules/debug": {
 			"version": "4.4.3",
@@ -3975,7 +3954,6 @@
 			"version": "8.57.1",
 			"dev": true,
 			"license": "MIT",
-			"peer": true,
 			"dependencies": {
 				"@eslint-community/eslint-utils": "^4.2.0",
 				"@eslint-community/regexpp": "^4.6.1",
@@ -4788,7 +4766,6 @@
 				}
 			],
 			"license": "MIT",
-			"peer": true,
 			"dependencies": {
 				"@babel/runtime": "^7.27.6"
 			},
@@ -5600,7 +5577,6 @@
 			"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",
@@ -6382,7 +6358,6 @@
 		"node_modules/react-dom": {
 			"version": "18.3.1",
 			"license": "MIT",
-			"peer": true,
 			"dependencies": {
 				"loose-envify": "^1.1.0",
 				"scheduler": "^0.23.2"
@@ -6394,7 +6369,6 @@
 		"node_modules/react-hook-form": {
 			"version": "7.71.1",
 			"license": "MIT",
-			"peer": true,
 			"engines": {
 				"node": ">=18.0.0"
 			},
@@ -6598,8 +6572,7 @@
 		},
 		"node_modules/redux": {
 			"version": "5.0.1",
-			"license": "MIT",
-			"peer": true
+			"license": "MIT"
 		},
 		"node_modules/redux-persist": {
 			"version": "6.0.0",
@@ -6749,7 +6722,6 @@
 			"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"
 			},
@@ -7591,7 +7563,6 @@
 			"version": "5.9.3",
 			"devOptional": true,
 			"license": "Apache-2.0",
-			"peer": true,
 			"bin": {
 				"tsc": "bin/tsc",
 				"tsserver": "bin/tsserver"
@@ -7729,7 +7700,6 @@
 			"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",

client/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "client",
 	"private": true,
-	"version": "3.12.0",
+	"version": "3.11.0",
 	"type": "module",
 	"scripts": {
 		"lockfile": "docker run --rm -v \"$PWD\":/w -w /w $(grep -m1 -o 'node:[^ ]*' ../docker/Dockerfile) npm install --package-lock-only",
@@ -12,8 +12,7 @@
 		"lint-strict": "eslint . --ext js,jsx,ts,tsx --report-unused-disable-directives --max-warnings 0",
 		"preview": "vite preview",
 		"format": "prettier --write .",
-		"format-check": "prettier --check .",
-		"compile": "tsc -b"
+		"format-check": "prettier --check ."
 	},
 	"lint-staged": {
 		"**/*": "prettier --write --ignore-unknown"
@@ -22,7 +21,6 @@
 		"@csstools/css-tokenizer": "^3.0.4",
 		"@emotion/react": "^11.13.3",
 		"@emotion/styled": "^11.13.0",
-		"@fontsource-variable/geist": "^5.3.0",
 		"@hello-pangea/dnd": "^18.0.0",
 		"@hookform/resolvers": "5.2.2",
 		"@mui/lab": "7.0.0",

client/src/Components/actions-menu/index.tsx

@@ -3,7 +3,6 @@ import Menu from "@mui/material/Menu";
 import MenuItem from "@mui/material/MenuItem";
 import IconButton from "@mui/material/IconButton";
 import { Settings } from "lucide-react";
-import { useTheme } from "@mui/material/styles";
 
 export type ActionMenuItem = {
 	id: number | string;
@@ -13,7 +12,6 @@ export type ActionMenuItem = {
 };
 
 export const ActionsMenu = ({ items }: { items: ActionMenuItem[] }) => {
-	const theme = useTheme();
 	const [anchorEl, setAnchorEl] = useState<null | any>(null);
 	const open = Boolean(anchorEl);
 
@@ -29,14 +27,7 @@ export const ActionsMenu = ({ items }: { items: ActionMenuItem[] }) => {
 
 	return (
 		<div>
-			<IconButton
-				onClick={handleClick}
-				sx={{
-					"&:hover": {
-						backgroundColor: theme.palette.action.controlHover,
-					},
-				}}
-			>
+			<IconButton onClick={handleClick}>
 				<Settings
 					size={20}
 					strokeWidth={1.5}

client/src/Components/common/controls/HeaderTimeRange.tsx

@@ -6,13 +6,12 @@ import { useTheme } from "@mui/material/styles";
 import CircularProgress from "@mui/material/CircularProgress";
 import { useTranslation } from "react-i18next";
 import { useMediaQuery } from "@mui/material";
-import type { DateRange } from "@/Types/Query";
 
 interface MonitorTimeFrameHeaderProps {
 	isLoading?: boolean;
 	hasDateRange?: boolean;
-	dateRange: DateRange;
-	setDateRange: (dateRange: DateRange) => void;
+	dateRange: string;
+	setDateRange: (dateRange: string) => void;
 }
 
 export const HeaderTimeRange = ({
@@ -26,7 +25,7 @@ export const HeaderTimeRange = ({
 	const isSmallScreen = useMediaQuery(theme.breakpoints.down("md"));
 	const handleChange = (
 		_event: React.MouseEvent<HTMLElement>,
-		newValue: DateRange | null
+		newValue: string | null
 	) => {
 		if (newValue !== null) {
 			setDateRange(newValue);

client/src/Components/design-elements/BaseBox.tsx

@@ -1,12 +1,10 @@
 import Box, { type BoxProps } from "@mui/material/Box";
 import { useTheme } from "@mui/material/styles";
-import { forwardRef } from "react";
 
-export const BaseBox = forwardRef<HTMLDivElement, BoxProps>(({ sx, ...rest }, ref) => {
+export const BaseBox = ({ sx, ...rest }: BoxProps) => {
 	const theme = useTheme();
 	return (
 		<Box
-			ref={ref}
 			{...rest}
 			sx={{
 				backgroundColor: theme.palette.background.paper,
@@ -18,6 +16,4 @@ export const BaseBox = forwardRef<HTMLDivElement, BoxProps>(({ sx, ...rest }, re
 			}}
 		/>
 	);
-});
-
-BaseBox.displayName = "BaseBox";
+};

client/src/Components/design-elements/BaseChart.tsx

@@ -10,10 +10,8 @@ import { useTheme } from "@mui/material/styles";
 type BaseChartProps = React.PropsWithChildren<{
 	icon?: React.ReactNode;
 	title: string;
-	rightTitle?: string;
 	width?: number | string;
 	maxWidth?: number | string;
-	flexBasis?: number | string;
 	padding?: number | string | ResponsiveStyleValue<number | string>;
 	onClick?: () => void;
 }>;
@@ -21,10 +19,8 @@ type BaseChartProps = React.PropsWithChildren<{
 export const BaseChart = ({
 	children,
 	title,
-	rightTitle,
 	width = "100%",
 	maxWidth = "100%",
-	flexBasis = "0%",
 	padding,
 	onClick,
 }: BaseChartProps) => {
@@ -36,7 +32,6 @@ export const BaseChart = ({
 				padding: padding ?? theme.spacing(LAYOUT.MD),
 				display: "flex",
 				flex: 1,
-				flexBasis,
 				width: width,
 				maxWidth: maxWidth,
 				...(onClick && {
@@ -49,27 +44,13 @@ export const BaseChart = ({
 				gap={theme.spacing(LAYOUT.MD)}
 				flex={1}
 			>
-				<Stack
-					direction="row"
-					justifyContent={"space-between"}
+				<Typography
+					variant="eyebrow"
+					color="text.secondary"
+					sx={{ overflowWrap: "anywhere" }}
 				>
-					<Typography
-						variant="eyebrow"
-						color="text.secondary"
-						sx={{ overflowWrap: "anywhere" }}
-					>
-						{title}
-					</Typography>
-					{rightTitle && (
-						<Typography
-							variant="eyebrow"
-							color="text.secondary"
-							sx={{ overflowWrap: "anywhere" }}
-						>
-							{rightTitle}
-						</Typography>
-					)}
-				</Stack>
+					{title}
+				</Typography>
 				<Box flex={1}>{children}</Box>
 			</Stack>
 		</BaseBox>

client/src/Components/design-elements/Breadcrumb.tsx

@@ -83,17 +83,12 @@ export const Breadcrumb = ({
 	const basePage = segments[0] || t("common.breadcrumbs.home");
 
 	const secondSegment = segments[1];
-	const thirdSegment = segments[2];
 	const isActionPage = secondSegment && actionSegments.includes(secondSegment);
 	const isDetailsPage = secondSegment && isId(secondSegment);
-	// page/section/:id routes such as docker/host/:monitorId
-	const isSectionDetailsPage = Boolean(
-		secondSegment && !isId(secondSegment) && thirdSegment && isId(thirdSegment)
-	);
-	const hasSubPage = isActionPage || isDetailsPage || isSectionDetailsPage;
+	const hasSubPage = isActionPage || isDetailsPage;
 
 	const getSubPageLabel = (): string => {
-		if (isActionPage || isSectionDetailsPage) {
+		if (isActionPage) {
 			return secondSegment.charAt(0).toUpperCase() + secondSegment.slice(1);
 		}
 		return t("common.breadcrumbs.details");

client/src/Components/design-elements/Gauge.tsx

@@ -39,9 +39,9 @@ export const Gauge = forwardRef<HTMLDivElement, GaugeProps>(function Gauge(
 		() => ({
 			circumference: 2 * Math.PI * radius,
 			totalSize: radius * 2 + strokeWidth * 2,
-			strokeLength: (progressWithinRange / 100) * (2 * Math.PI * radius),
+			strokeLength: (progress / 100) * (2 * Math.PI * radius),
 		}),
-		[radius, strokeWidth, progressWithinRange]
+		[radius, strokeWidth, progress]
 	);
 
 	const [offset, setOffset] = useState(circumference);
@@ -52,7 +52,7 @@ export const Gauge = forwardRef<HTMLDivElement, GaugeProps>(function Gauge(
 		}, 100);
 
 		return () => clearTimeout(timer);
-	}, [circumference, strokeLength]);
+	}, [progress, circumference, strokeLength]);
 
 	const fillColor = getInfraGaugeColor(progressWithinRange, theme);
 
@@ -123,7 +123,6 @@ export const DetailGauge = ({
 	lowerLabel,
 	lowerValue,
 	maxWidth = 225,
-	flexBasis = "0%",
 }: {
 	title: string;
 	progress: number;
@@ -132,7 +131,6 @@ export const DetailGauge = ({
 	lowerLabel?: string;
 	lowerValue?: string | number;
 	maxWidth?: number;
-	flexBasis?: number | string;
 }) => {
 	const theme = useTheme();
 	return (
@@ -140,7 +138,6 @@ export const DetailGauge = ({
 			icon={null}
 			title={title}
 			maxWidth={maxWidth}
-			flexBasis={flexBasis}
 		>
 			<Stack
 				alignItems={"center"}

client/src/Components/design-elements/Icon.tsx

@@ -8,7 +8,7 @@ interface IconProps {
 	color?: string;
 }
 
-const Icon = ({ icon: Icon, size = 16, strokeWidth = 1.5, color }: IconProps) => {
+const Icon = ({ icon: Icon, size = 20, strokeWidth = 1.5, color }: IconProps) => {
 	return (
 		<Icon
 			size={size}

client/src/Components/design-elements/OfflineBanner.tsx

@@ -37,8 +37,8 @@ export const OfflineBanner = ({ visible }: OfflineBannerProps) => {
 				left: 0,
 				right: 0,
 				zIndex: theme.zIndex.snackbar,
-				backgroundColor: theme.palette.error.dark,
-				color: "#FFFFFF",
+				backgroundColor: theme.palette.error.main,
+				color: theme.palette.error.contrastText,
 				px: theme.spacing(8),
 				py: theme.spacing(4),
 				transition: "top 1s ease-in-out",

client/src/Components/design-elements/PageHeader.tsx

@@ -6,7 +6,6 @@ import { Link as RouterLink } from "react-router-dom";
 import { useTranslation } from "react-i18next";
 import { useTheme } from "@mui/material/styles";
 import { ChevronLeft, HelpCircle, FileText, Code } from "lucide-react";
-import { INPUT_BASE_HEIGHT } from "@/Utils/Theme/constants";
 
 import type { ReactNode } from "react";
 
@@ -110,7 +109,7 @@ export const PageHeader = ({
 							fontSize: 14,
 							color: theme.palette.text.secondary,
 							lineHeight: 1.55,
-							maxWidth: "108ch",
+							maxWidth: 640,
 						}}
 					>
 						{description}
@@ -143,7 +142,7 @@ export const PageHeader = ({
 								alignItems: "center",
 								justifyContent: "center",
 								width: 36,
-								height: INPUT_BASE_HEIGHT,
+								height: 32,
 								color: theme.palette.text.secondary,
 								borderRight:
 									idx < linkItems.length - 1

client/src/Components/design-elements/SkeletonCard.tsx

@@ -1,5 +1,4 @@
 import { Box, Stack, useTheme } from "@mui/material";
-import { INPUT_BASE_HEIGHT } from "@/Utils/Theme/constants";
 
 interface SkeletonCardProps {
 	width?: number | string | { xs?: number | string; md?: number | string };
@@ -45,7 +44,7 @@ export const SkeletonCard = ({
 
 	const blockStyle = {
 		width: 55,
-		height: INPUT_BASE_HEIGHT,
+		height: 34,
 		borderRadius: theme.shape.borderRadius,
 		background: theme.palette.secondary.main,
 		border: `1px solid ${theme.palette.divider}`,

client/src/Components/design-elements/StatBox.tsx

@@ -2,7 +2,7 @@ import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
 import Box from "@mui/material/Box";
 import { useTheme } from "@mui/material/styles";
-import { darken, lighten } from "@mui/material/styles";
+import { lighten } from "@mui/material/styles";
 import useMediaQuery from "@mui/material/useMediaQuery";
 import type { PaletteKey } from "@/Utils/Theme/Theme";
 import { BaseBox, TooltipWithInfo } from "@/Components/design-elements";
@@ -11,18 +11,17 @@ import type { SxProps } from "@mui/material";
 type GradientBox = React.PropsWithChildren<{
 	palette?: PaletteKey;
 	sx?: SxProps;
-	interactive?: boolean;
 }>;
 
-export const GradientBox = ({ children, palette, sx, interactive }: GradientBox) => {
+export const GradientBox = ({ children, palette, sx }: GradientBox) => {
 	const theme = useTheme();
 	const isSmall = useMediaQuery(theme.breakpoints.down("md"));
 	const isLight = theme.palette.mode === "light";
 	const paper = theme.palette.background.paper;
-	const paperStart = isLight ? darken(paper, 0.02) : lighten(paper, 0.08);
+	const paperStart = lighten(paper, isLight ? 0.06 : 0.08);
 	const paperEnd = paper;
 	const bg = palette
-		? `linear-gradient(135deg, ${lighten(theme.palette[palette].main, 0.12)} 0%, ${theme.palette[palette].main} 100%)`
+		? `linear-gradient(135deg, ${theme.palette[palette].light} 0%, ${theme.palette[palette].main} 100%)`
 		: `linear-gradient(135deg, ${paperStart} 0%, ${paperEnd} 100%)`;
 
 	return (
@@ -31,12 +30,6 @@ export const GradientBox = ({ children, palette, sx, interactive }: GradientBox)
 				padding: `${theme.spacing(4)} ${theme.spacing(8)}`,
 				width: isSmall ? `100%` : `calc(25% - (3 * ${theme.spacing(8)} / 4))`,
 				background: bg,
-				...(interactive && {
-					cursor: "pointer",
-					"&:hover": {
-						backgroundImage: `linear-gradient(${theme.palette.action.rowHover}, ${theme.palette.action.rowHover}), ${bg}`,
-					},
-				}),
 				...sx,
 			}}
 		>
@@ -69,8 +62,10 @@ export const StatBox = ({
 	return (
 		<GradientBox
 			palette={palette}
-			interactive={Boolean(onClick)}
-			sx={{ ...(sx as object) }}
+			sx={{
+				...(sx as object),
+				...(onClick ? { cursor: "pointer", "&:hover": { opacity: 0.95 } } : {}),
+			}}
 		>
 			<Stack onClick={onClick}>
 				<Box sx={{ display: "flex", alignItems: "center", gap: theme.spacing(2) }}>

client/src/Components/design-elements/StatusBox.tsx

@@ -5,7 +5,7 @@ import { BaseBox } from "@/Components/design-elements";
 import { useTranslation } from "react-i18next";
 import type { SxProps } from "@mui/material";
 
-import { alpha, useTheme } from "@mui/material/styles";
+import { useTheme } from "@mui/material/styles";
 
 type StatusBoxProps = React.PropsWithChildren<{
 	children: React.ReactNode;
@@ -34,8 +34,8 @@ export const BGBox = ({ children, sx }: StatusBoxProps) => {
 				sx={{
 					pointerEvents: "none",
 					backgroundImage: `
-						linear-gradient(${alpha(theme.palette.divider, 0.4)} 1px, transparent 1px),
-						linear-gradient(90deg, ${alpha(theme.palette.divider, 0.4)} 1px, transparent 1px)
+						linear-gradient(${theme.palette.divider} 1px, transparent 1px),
+						linear-gradient(90deg, ${theme.palette.divider} 1px, transparent 1px)
 					`,
 					backgroundSize: "24px 24px",
 					maskImage:

client/src/Components/design-elements/StatusLabel.tsx

@@ -1,19 +1,12 @@
 import Box from "@mui/material/Box";
 import { BaseBox } from "@/Components/design-elements";
 import Typography from "@mui/material/Typography";
-import Stack from "@mui/material/Stack";
 
 import type { MonitorStatus } from "@/Types/Monitor";
 import type { SxProps } from "@mui/material/styles";
-import {
-	getDockerStatePalette,
-	getStatusPalette,
-	getValuePalette,
-} from "@/Utils/MonitorUtils";
+import { getStatusPalette, getValuePalette } from "@/Utils/MonitorUtils";
 import { useTheme } from "@mui/material/styles";
 import { useTranslation } from "react-i18next";
-import type { DockerContainerState } from "@/Types/Check";
-import { SPACING } from "@/Utils/Theme/constants";
 
 export const ValueTypes = ["positive", "negative", "neutral"] as const;
 export type ValueType = (typeof ValueTypes)[number];
@@ -117,36 +110,3 @@ export const ColoredLabel = ({ text, color }: { text: string; color: string }) =
 		</BaseBox>
 	);
 };
-
-export const DockerStateLabel = ({
-	state,
-	name,
-	image,
-}: {
-	state: DockerContainerState;
-	name: string;
-	image: string;
-}) => {
-	const palette = getDockerStatePalette(state);
-	const theme = useTheme();
-
-	return (
-		<Stack
-			direction="row"
-			gap={SPACING.LG}
-			alignItems={"center"}
-		>
-			<Box
-				width={7}
-				height={7}
-				bgcolor={theme.palette[palette].light}
-				borderRadius="50%"
-				marginRight="5px"
-			/>
-			<Stack>
-				<Typography>{name}</Typography>
-				<Typography variant="body2">{image}</Typography>
-			</Stack>
-		</Stack>
-	);
-};

client/src/Components/design-elements/Table.tsx

@@ -52,7 +52,6 @@ type DataTableProps<T extends { id?: string | number; _id?: string | number }> =
 	emptyViewText?: string;
 	emptyViewPositive?: boolean;
 	getRowSx?: (row: T) => SxProps<Theme>;
-	isRowSelected?: (row: T) => boolean;
 };
 
 export function DataTable<
@@ -71,7 +70,6 @@ export function DataTable<
 	emptyViewText,
 	emptyViewPositive,
 	getRowSx,
-	isRowSelected,
 }: DataTableProps<T>) {
 	const theme = useTheme();
 	const [expanded, setExpanded] = useState<(string | number) | null>(null);
@@ -82,22 +80,6 @@ export function DataTable<
 
 	const isSmall = useMediaQuery(theme.breakpoints.down("md"));
 
-	const hasTextSelectionWithin = (element: Element) => {
-		const selection = window.getSelection();
-		if (!selection || selection.isCollapsed || !selection.toString().trim()) {
-			return false;
-		}
-		return (
-			selection.anchorNode !== null &&
-			element.contains(
-				selection.anchorNode.nodeType === Node.TEXT_NODE
-					? selection.anchorNode.parentNode
-					: selection.anchorNode
-			)
-		);
-	};
-	const isInteractive = Boolean(onRowClick) || expandableRows;
-
 	if (data.length === 0 || headers.length === 0) {
 		return (
 			<EmptyView
@@ -117,10 +99,7 @@ export function DataTable<
 					keys.push(key);
 					return (
 						<Stack
-							onClick={(e) => {
-								if (hasTextSelectionWithin(e.currentTarget)) return;
-								if (onRowClick) onRowClick(row);
-							}}
+							onClick={() => (onRowClick ? onRowClick(row) : null)}
 							spacing={theme.spacing(LAYOUT.XS)}
 							sx={{
 								borderStyle: "solid",
@@ -129,11 +108,6 @@ export function DataTable<
 								borderRadius: theme.shape.borderRadius,
 								padding: theme.spacing(LAYOUT.XS),
 								cursor: onRowClick ? "pointer" : "default",
-								...(onRowClick && {
-									"&:hover": {
-										backgroundColor: theme.palette.action.rowHover,
-									},
-								}),
 							}}
 							key={key}
 						>
@@ -217,7 +191,7 @@ export function DataTable<
 					"& :is(th)": {
 						backgroundColor: theme.palette.background.paper,
 						color: theme.palette.text.secondary,
-						fontWeight: 600,
+						fontWeight: 500,
 						textTransform: "uppercase",
 						letterSpacing: "0.08em",
 						padding: `${theme.spacing(SPACING.LG)} ${theme.spacing(LAYOUT.MD)}`,
@@ -253,29 +227,15 @@ export function DataTable<
 					{data.map((row) => {
 						const key = row.id || row._id || Math.random();
 						const isExpanded = expanded === key;
-						const selected = isRowSelected?.(row);
 
 						return (
 							<Fragment key={key}>
 								<TableRow
 									sx={{
-										cursor: isInteractive ? "pointer" : "default",
-										...(isInteractive && {
-											"&:hover .MuiTableCell-root": {
-												backgroundColor: selected
-													? theme.palette.action.selectedHover
-													: theme.palette.action.rowHover,
-											},
-										}),
-										...(selected && {
-											"& .MuiTableCell-root": {
-												backgroundColor: theme.palette.action.selected,
-											},
-										}),
+										cursor: onRowClick ? "pointer" : "default",
 										...(getRowSx?.(row) as object),
 									}}
-									onClick={(e) => {
-										if (hasTextSelectionWithin(e.currentTarget)) return;
+									onClick={() => {
 										if (expandableRows) handleExpand(row);
 										else if (onRowClick) onRowClick(row);
 									}}
@@ -332,12 +292,6 @@ interface TablePaginationActionsProps {
 	onPageChange: (event: React.MouseEvent<HTMLButtonElement>, newPage: number) => void;
 }
 
-const controlHoverSx = (theme: Theme): SxProps<Theme> => ({
-	"&:hover": {
-		backgroundColor: theme.palette.action.controlHover,
-	},
-});
-
 function TablePaginationActions(props: TablePaginationActionsProps) {
 	const theme = useTheme();
 	const { count, page, rowsPerPage, onPageChange } = props;
@@ -367,7 +321,6 @@ function TablePaginationActions(props: TablePaginationActionsProps) {
 				onClick={handleFirstPageButtonClick}
 				disabled={page === 0}
 				aria-label="first page"
-				sx={controlHoverSx(theme)}
 			>
 				{theme.direction === "rtl" ? (
 					<ChevronsRight
@@ -385,7 +338,6 @@ function TablePaginationActions(props: TablePaginationActionsProps) {
 				onClick={handleBackButtonClick}
 				disabled={page === 0}
 				aria-label="previous page"
-				sx={controlHoverSx(theme)}
 			>
 				{theme.direction === "rtl" ? (
 					<ChevronRight
@@ -403,7 +355,6 @@ function TablePaginationActions(props: TablePaginationActionsProps) {
 				onClick={handleNextButtonClick}
 				disabled={page >= Math.ceil(count / rowsPerPage) - 1}
 				aria-label="next page"
-				sx={controlHoverSx(theme)}
 			>
 				{theme.direction === "rtl" ? (
 					<ChevronLeft
@@ -421,7 +372,6 @@ function TablePaginationActions(props: TablePaginationActionsProps) {
 				onClick={handleLastPageButtonClick}
 				disabled={page >= Math.ceil(count / rowsPerPage) - 1}
 				aria-label="last page"
-				sx={controlHoverSx(theme)}
 			>
 				{theme.direction === "rtl" ? (
 					<ChevronsLeft
@@ -469,7 +419,6 @@ function HasMoreTablePaginationActions(props: HasMoreTablePaginationActionsProps
 				onClick={handleFirstPageButtonClick}
 				disabled={page === 0}
 				aria-label="first page"
-				sx={controlHoverSx(theme)}
 			>
 				{theme.direction === "rtl" ? (
 					<ChevronsRight
@@ -487,7 +436,6 @@ function HasMoreTablePaginationActions(props: HasMoreTablePaginationActionsProps
 				onClick={handleBackButtonClick}
 				disabled={page === 0}
 				aria-label="previous page"
-				sx={controlHoverSx(theme)}
 			>
 				{theme.direction === "rtl" ? (
 					<ChevronRight
@@ -505,7 +453,6 @@ function HasMoreTablePaginationActions(props: HasMoreTablePaginationActionsProps
 				onClick={handleNextButtonClick}
 				disabled={hasMore === false}
 				aria-label="next page"
-				sx={controlHoverSx(theme)}
 			>
 				{theme.direction === "rtl" ? (
 					<ChevronLeft
@@ -523,7 +470,6 @@ function HasMoreTablePaginationActions(props: HasMoreTablePaginationActionsProps
 				<IconButton
 					disabled={hasMore === false}
 					aria-label="next page"
-					sx={controlHoverSx(theme)}
 				>
 					<Ellipsis
 						size={20}

client/src/Components/design-elements/Tabs.tsx

@@ -1,8 +1,6 @@
 import MuiTabs from "@mui/material/Tabs";
 import type { TabsProps } from "@mui/material/Tabs";
 import { useTheme } from "@mui/material/styles";
-import { typographyLevels } from "@/Utils/Theme/Palette";
-import { INPUT_BASE_HEIGHT } from "@/Utils/Theme/constants";
 interface CustomTabsProps extends TabsProps {}
 
 export const Tabs = (props: CustomTabsProps) => {
@@ -10,7 +8,7 @@ export const Tabs = (props: CustomTabsProps) => {
 	return (
 		<MuiTabs
 			sx={{
-				minHeight: INPUT_BASE_HEIGHT,
+				minHeight: 34,
 				borderBottom: `1px solid ${theme.palette.divider}`,
 				"& .MuiTabs-indicator": {
 					backgroundColor: theme.palette.primary.main,
@@ -40,9 +38,9 @@ export const Tab = (props: CustomTabProps) => {
 			iconPosition="start"
 			sx={{
 				textTransform: "none",
-				fontSize: typographyLevels.m,
+				fontSize: 14,
 				fontWeight: 500,
-				minHeight: INPUT_BASE_HEIGHT,
+				minHeight: 34,
 				padding: theme.spacing(1, 0),
 				paddingBottom: 0,
 				minWidth: "auto",
@@ -50,6 +48,7 @@ export const Tab = (props: CustomTabProps) => {
 				color: theme.palette.text.secondary,
 				"&.Mui-selected": {
 					color: theme.palette.primary.main,
+					fontWeight: 600,
 				},
 				"&:hover": {
 					color: theme.palette.text.secondary,

client/src/Components/inputs/Button.tsx

@@ -1,7 +1,7 @@
 import Button from "@mui/material/Button";
 import type { ButtonProps } from "@mui/material/Button";
 import { useTheme, darken } from "@mui/material/styles";
-import { INPUT_BASE_HEIGHT, HOVER } from "@/Utils/Theme/constants";
+import { HOVER } from "@/Utils/Theme/constants";
 
 const PALETTE_COLORS = [
 	"primary",
@@ -43,8 +43,7 @@ export const ButtonInput = ({ sx, ...props }: ButtonProps) => {
 			{...props}
 			sx={{
 				textTransform: "none",
-				height: INPUT_BASE_HEIGHT,
-				lineHeight: 1.2,
+				height: 34,
 				fontWeight: 400,
 				borderRadius: 2,
 				whiteSpace: "nowrap",

client/src/Components/inputs/ColorPicker.tsx

@@ -4,7 +4,6 @@ import { typographyLevels } from "@/Utils/Theme/Palette";
 import { useTheme } from "@mui/material";
 import Stack from "@mui/material/Stack";
 import { FieldLabel } from "@/Components/inputs/FieldLabel";
-import { INPUT_BASE_HEIGHT } from "@/Utils/Theme/constants";
 
 interface ColorPickerProps extends MuiColorInputProps {
 	fieldLabel?: string;
@@ -19,7 +18,7 @@ export const ColorInput = ({ fieldLabel, required, ...props }: ColorPickerProps)
 			sx={{
 				"& .MuiOutlinedInput-root": {
 					borderRadius: theme.shape.borderRadius,
-					height: INPUT_BASE_HEIGHT,
+					height: 34,
 					fontSize: typographyLevels.base,
 				},
 				"& .MuiOutlinedInput-notchedOutline": {

client/src/Components/inputs/DatePicker.tsx

@@ -8,7 +8,6 @@ import { FieldLabel } from "./FieldLabel";
 import { Calendar } from "lucide-react";
 import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs";
 import { LocalizationProvider } from "@mui/x-date-pickers";
-import { INPUT_BASE_HEIGHT } from "@/Utils/Theme/constants";
 
 interface DatePickerComponentProps extends Omit<DatePickerProps<Dayjs>, "label"> {
 	fieldLabel?: string;
@@ -56,7 +55,7 @@ export const DatePickerComponent = ({
 								flexDirection: "row-reverse",
 							},
 							"& input": {
-								minHeight: INPUT_BASE_HEIGHT,
+								minHeight: 34,
 								p: 0,
 								pl: theme.spacing(3),
 								pr: theme.spacing(5),
@@ -67,9 +66,7 @@ export const DatePickerComponent = ({
 							},
 							"&:not(:has(.Mui-disabled)):not(:has(.Mui-error)) .MuiOutlinedInput-root:not(:has(input:focus)):hover fieldset":
 								{
-									borderColor: error
-										? theme.palette.error.main
-										: theme.palette.text.disabled,
+									borderColor: error ? theme.palette.error.main : theme.palette.divider,
 								},
 						},
 					},

client/src/Components/inputs/Select.tsx

@@ -6,7 +6,6 @@ import Stack from "@mui/material/Stack";
 import { FieldLabel } from "./FieldLabel";
 import { ChevronDown } from "lucide-react";
 import Typography from "@mui/material/Typography";
-import { INPUT_BASE_HEIGHT } from "@/Utils/Theme/constants";
 
 interface SelectInputProps<T> extends Omit<SelectProps<T>, "label"> {
 	fieldLabel?: string;
@@ -72,7 +71,7 @@ const SelectInputInner = <T,>(
 				/>
 			)}
 			sx={{
-				height: `${INPUT_BASE_HEIGHT}px`,
+				height: "34px",
 				"& .MuiSelect-select": {
 					display: "flex",
 					alignItems: "center",
@@ -84,6 +83,10 @@ const SelectInputInner = <T,>(
 				},
 				"& .MuiOutlinedInput-notchedOutline": {
 					borderRadius: theme.shape.borderRadius,
+					borderColor: theme.palette.divider,
+				},
+				"&:hover .MuiOutlinedInput-notchedOutline": {
+					borderColor: theme.palette.divider,
 				},
 				...props.sx,
 			}}

client/src/Components/inputs/TextInput.tsx

@@ -5,7 +5,7 @@ import { typographyLevels } from "@/Utils/Theme/Palette";
 import { useTheme } from "@mui/material/styles";
 import Stack from "@mui/material/Stack";
 import { FieldLabel } from "./FieldLabel";
-import { INPUT_BASE_HEIGHT, LAYOUT } from "@/Utils/Theme/constants";
+import { LAYOUT } from "@/Utils/Theme/constants";
 
 interface TextInputProps extends Omit<TextFieldProps, "label"> {
 	fieldLabel?: string;
@@ -22,10 +22,16 @@ export const TextInput = forwardRef<HTMLInputElement, TextInputProps>(function T
 		width: "100%",
 		"& .MuiOutlinedInput-root": {
 			borderRadius: theme.shape.borderRadius,
-			height: props.multiline ? "auto" : INPUT_BASE_HEIGHT,
+			height: props.multiline ? "auto" : 34,
 			fontSize: typographyLevels.base,
 			overflow: "hidden",
 		},
+		"& .MuiOutlinedInput-notchedOutline": {
+			borderColor: theme.palette.divider,
+		},
+		"&:hover .MuiOutlinedInput-notchedOutline": {
+			borderColor: theme.palette.divider,
+		},
 		"& .MuiFormHelperText-root": {
 			marginLeft: 0,
 			marginRight: 0,
@@ -33,7 +39,7 @@ export const TextInput = forwardRef<HTMLInputElement, TextInputProps>(function T
 		},
 		"& input:-webkit-autofill, & input:-webkit-autofill:hover, & input:-webkit-autofill:focus, & input:-webkit-autofill:active":
 			{
-				WebkitBoxShadow: `0 0 0 100px ${theme.palette.background.paper} inset !important`,
+				WebkitBoxShadow: `0 0 0 100px ${theme.palette.background.default} inset !important`,
 				WebkitTextFillColor: `${theme.palette.text.primary} !important`,
 				caretColor: theme.palette.text.primary,
 				transition: "background-color 5000s ease-in-out 0s",

client/src/Components/inputs/TimePicker.tsx

@@ -7,7 +7,6 @@ import Typography from "@mui/material/Typography";
 import { FieldLabel } from "./FieldLabel";
 import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs";
 import { LocalizationProvider } from "@mui/x-date-pickers";
-import { INPUT_BASE_HEIGHT } from "@/Utils/Theme/constants";
 
 interface TimePickerComponentProps extends Omit<MobileTimePickerProps<Dayjs>, "label"> {
 	fieldLabel?: string;
@@ -34,7 +33,7 @@ export const TimePickerComponent = ({
 						sx: {
 							width: "fit-content",
 							"& input": {
-								minHeight: INPUT_BASE_HEIGHT,
+								minHeight: 34,
 								p: 0,
 								px: theme.spacing(5),
 							},

client/src/Components/inputs/ToggleButton.tsx

@@ -4,7 +4,6 @@ import type { ToggleButtonProps } from "@mui/material/ToggleButton";
 import type { ToggleButtonGroupProps } from "@mui/material/ToggleButtonGroup";
 import { useTheme } from "@mui/material/styles";
 import { alpha } from "@mui/material/styles";
-import { INPUT_BASE_HEIGHT } from "@/Utils/Theme/constants";
 
 export const ToggleButtonInput = ({ sx, ...props }: ToggleButtonProps) => {
 	const theme = useTheme();
@@ -21,7 +20,7 @@ export const ToggleButtonInput = ({ sx, ...props }: ToggleButtonProps) => {
 			sx={{
 				px: 8,
 				textTransform: "none",
-				height: INPUT_BASE_HEIGHT,
+				height: 34,
 				fontWeight: 400,
 				whiteSpace: "nowrap",
 				textOverflow: "ellipsis",
@@ -35,6 +34,7 @@ export const ToggleButtonInput = ({ sx, ...props }: ToggleButtonProps) => {
 				"&.Mui-selected": {
 					backgroundColor: selectedBg,
 					color: theme.palette.text.primary,
+					fontWeight: 500,
 					"&:hover": {
 						backgroundColor: selectedHoverBg,
 					},

client/src/Components/monitors/ControlsFilter.tsx

@@ -9,11 +9,12 @@ import type { Tag } from "@/Types/Tag";
 import { Typography, useTheme } from "@mui/material";
 import { useTranslation } from "react-i18next";
 
-const types = ["http", "ping", "port", "game", "grpc", "websocket"];
+const types = ["http", "ping", "port", "docker", "game", "grpc", "websocket"];
 const typeDisplayNames: Record<string, string> = {
 	http: "HTTP",
 	ping: "Ping",
 	port: "Port",
+	docker: "Docker",
 	game: "Game",
 	grpc: "gRPC",
 	websocket: "WebSocket",

client/src/Components/monitors/HeaderMonitorControls.tsx

@@ -60,22 +60,20 @@ export const HeaderMonitorControls = ({
 				direction={{ xs: "column", md: "row" }}
 				gap={theme.spacing(2)}
 			>
-				{isAdmin && (
-					<Button
-						variant="contained"
-						color="secondary"
-						loading={isPosting}
-						startIcon={<Icon icon={Mail} />}
-						onClick={async () => {
-							await post(`/notifications/test/all`, { monitorId: monitor.id });
-						}}
-						sx={{
-							whiteSpace: "nowrap",
-						}}
-					>
-						{t("common.buttons.testNotifications")}
-					</Button>
-				)}
+				<Button
+					variant="contained"
+					color="secondary"
+					loading={isPosting}
+					startIcon={<Icon icon={Mail} />}
+					onClick={async () => {
+						await post(`/notifications/test/all`, { monitorId: monitor.id });
+					}}
+					sx={{
+						whiteSpace: "nowrap",
+					}}
+				>
+					{t("common.buttons.testNotifications")}
+				</Button>
 				<Button
 					variant="contained"
 					color="secondary"

client/src/Components/monitors/MonitorListPage.tsx

@@ -35,7 +35,7 @@ export const MonitorListPage = ({
 	headerKey,
 	page,
 	actionLink,
-	controller,
+	controller: c,
 	bulkActions,
 	showTypeFilter,
 	summaryProps,
@@ -48,14 +48,14 @@ export const MonitorListPage = ({
 	const theme = useTheme();
 	const isSmall = useMediaQuery(theme.breakpoints.down("md"));
 	const isAdmin = useIsAdmin();
-	const isLoading = controller.isLoading || Boolean(extraLoading);
+	const isLoading = c.isLoading || Boolean(extraLoading);
 
 	return (
 		<MonitorBasePageWithStates
 			headerKey={headerKey}
 			loading={isLoading}
-			error={controller.error || extraError}
-			totalCount={controller.effectiveTotalCount}
+			error={c.error || extraError}
+			totalCount={c.effectiveTotalCount}
 			page={page}
 			actionLink={actionLink}
 			priorityFallback={priorityFallback}
@@ -66,7 +66,7 @@ export const MonitorListPage = ({
 				isAdmin={isAdmin}
 			/>
 			<HeaderMonitorsSummary
-				summary={controller.summary}
+				summary={c.summary}
 				{...summaryProps}
 			/>
 			<Stack
@@ -78,27 +78,27 @@ export const MonitorListPage = ({
 					{...(showTypeFilter === false
 						? { showTypes: false }
 						: {
-								selectedTypes: controller.selectedTypes,
-								setSelectedTypes: controller.setSelectedTypes,
+								selectedTypes: c.selectedTypes,
+								setSelectedTypes: c.setSelectedTypes,
 							})}
-					selectedStatus={controller.selectedStatus}
-					setSelectedStatus={controller.setSelectedStatus}
-					selectedState={controller.selectedState}
-					setSelectedState={controller.setSelectedState}
-					tagOptions={controller.tags ?? []}
-					selectedTags={controller.selectedTags}
-					setSelectedTags={controller.setSelectedTags}
-					onClearFilters={controller.handleClearFilters}
+					selectedStatus={c.selectedStatus}
+					setSelectedStatus={c.setSelectedStatus}
+					selectedState={c.selectedState}
+					setSelectedState={c.setSelectedState}
+					tagOptions={c.tags ?? []}
+					selectedTags={c.selectedTags}
+					setSelectedTags={c.setSelectedTags}
+					onClearFilters={c.handleClearFilters}
 				/>
 				<TextField
 					placeholder={t("pages.uptime.filters.search.placeholder")}
-					value={controller.search}
+					value={c.search}
 					onChange={(event) => {
-						controller.setSearch(event.target.value);
+						c.setSearch(event.target.value);
 					}}
 				/>
 			</Stack>
-			{controller.selectedTags.length > 0 && (
+			{c.selectedTags.length > 0 && (
 				<Stack
 					direction={isSmall ? "column" : "row"}
 					alignItems={isSmall ? "flex-start" : "center"}
@@ -108,8 +108,8 @@ export const MonitorListPage = ({
 					<Typography color={theme.palette.text.secondary}>
 						{t("pages.uptime.filters.activeTags")}
 					</Typography>
-					{controller.selectedTags.map((tagId) => {
-						const tag = controller.tags?.find((t) => t.id === tagId);
+					{c.selectedTags.map((tagId) => {
+						const tag = c.tags?.find((t) => t.id === tagId);
 						if (!tag) return null;
 						return (
 							<ColoredLabel
@@ -123,20 +123,20 @@ export const MonitorListPage = ({
 			)}
 			{bulkActions && !isLoading && (
 				<BulkActionsBar
-					selectedCount={controller.selectedRows.length}
-					onCancel={controller.handleCancelSelection}
+					selectedCount={c.selectedRows.length}
+					onCancel={c.handleCancelSelection}
 				>
 					<Button
 						size="small"
 						startIcon={<Play size={16} />}
-						onClick={controller.handleBulkResume}
+						onClick={c.handleBulkResume}
 					>
 						{t("common.buttons.resume")}
 					</Button>
 					<Button
 						size="small"
 						startIcon={<Pause size={16} />}
-						onClick={controller.handleBulkPause}
+						onClick={c.handleBulkPause}
 					>
 						{t("common.buttons.pause")}
 					</Button>
@@ -144,12 +144,12 @@ export const MonitorListPage = ({
 			)}
 			{children}
 			<Dialog
-				open={controller.isDialogOpen}
+				open={c.isDialogOpen}
 				title={t("common.dialogs.delete.title")}
 				content={t("common.dialogs.delete.description")}
-				onConfirm={controller.handleConfirmDelete}
-				onCancel={controller.handleCancelDelete}
-				loading={controller.isDeleting}
+				onConfirm={c.handleConfirmDelete}
+				onCancel={c.handleCancelDelete}
+				loading={c.isDeleting}
 			/>
 		</MonitorBasePageWithStates>
 	);

client/src/Components/monitors/charts/ChartUtils.ts

@@ -0,0 +1,34 @@
+export const computeYAxisCap = (values: number[]): number | undefined => {
+	const sorted = values.slice().sort((a, b) => a - b);
+	if (sorted.length < 2) return undefined;
+	const p95 = sorted[Math.min(sorted.length - 1, Math.floor(sorted.length * 0.95))];
+	return p95 > 0 ? Math.ceil(p95 * 2) : undefined;
+};
+
+export const PHASE_KEYS = [
+	"avgDns",
+	"avgTcp",
+	"avgTls",
+	"avgRequest",
+	"avgFirstByte",
+	"avgDownload",
+] as const;
+
+export const PHASE_COLOR_KEYS = {
+	avgDns: "dns",
+	avgTcp: "tcp",
+	avgTls: "tls",
+	avgRequest: "request",
+	avgFirstByte: "firstByte",
+	avgDownload: "download",
+} as const;
+
+// i18n keys, resolved with t() at render
+export const PHASE_LABEL_KEYS: Record<(typeof PHASE_KEYS)[number], string> = {
+	avgDns: "common.charts.phases.dns",
+	avgTcp: "common.charts.phases.tcp",
+	avgTls: "common.charts.phases.tls",
+	avgRequest: "common.charts.phases.request",
+	avgFirstByte: "common.charts.phases.firstByte",
+	avgDownload: "common.charts.phases.download",
+};

client/src/Components/monitors/charts/ChartUtils.tsx

@@ -1,113 +0,0 @@
-export const computeYAxisCap = (values: number[]): number | undefined => {
-	const sorted = values.slice().sort((a, b) => a - b);
-	if (sorted.length < 2) return undefined;
-	const p95 = sorted[Math.min(sorted.length - 1, Math.floor(sorted.length * 0.95))];
-	return p95 > 0 ? Math.ceil(p95 * 2) : undefined;
-};
-
-export const PHASE_KEYS = [
-	"avgDns",
-	"avgTcp",
-	"avgTls",
-	"avgRequest",
-	"avgFirstByte",
-	"avgDownload",
-] as const;
-
-export const PHASE_COLOR_KEYS = {
-	avgDns: "dns",
-	avgTcp: "tcp",
-	avgTls: "tls",
-	avgRequest: "request",
-	avgFirstByte: "firstByte",
-	avgDownload: "download",
-} as const;
-
-// i18n keys, resolved with t() at render
-export const PHASE_LABEL_KEYS: Record<(typeof PHASE_KEYS)[number], string> = {
-	avgDns: "common.charts.phases.dns",
-	avgTcp: "common.charts.phases.tcp",
-	avgTls: "common.charts.phases.tls",
-	avgRequest: "common.charts.phases.request",
-	avgFirstByte: "common.charts.phases.firstByte",
-	avgDownload: "common.charts.phases.download",
-};
-
-export const AREA_COLORS = [
-	// Blues
-	"#3182bd", // Deep blue
-	"#6baed6", // Medium blue
-	"#9ecae1", // Light blue
-
-	// Greens
-	"#74c476", // Soft green
-	"#a1d99b", // Light green
-	"#c7e9c0", // Pale green
-
-	// Oranges
-	"#fdae6b", // Warm orange
-	"#fdd0a2", // Light orange
-	"#feedde", // Pale orange
-
-	// Purples
-	"#9467bd", // Lavender
-	"#a55194", // Deep magenta
-	"#c994c7", // Soft magenta
-
-	// Reds
-	"#ff9896", // Soft red
-	"#de2d26", // Deep red
-	"#fc9272", // Medium red
-
-	// Cyans/Teals
-	"#17becf", // Cyan
-	"#7fcdbb", // Teal
-	"#a1dab4", // Light teal
-
-	// Yellows
-	"#fec44f", // Mustard
-	"#fee391", // Light yellow
-	"#ffffd4", // Pale yellow
-
-	// Additional colors
-	"#e377c2", // Soft pink
-	"#bcbd22", // Olive
-	"#2ca02c", // Vibrant green
-];
-
-export const createGradient = ({
-	id,
-	startColor,
-	endColor,
-	startOpacity = 0.8,
-	endOpacity = 0,
-	direction = "vertical",
-}: {
-	id: string;
-	startColor: string;
-	endColor: string;
-	startOpacity?: number;
-	endOpacity?: number;
-	direction?: "vertical" | "horizontal";
-}) => (
-	<defs>
-		<linearGradient
-			id={id}
-			x1={direction === "vertical" ? "0" : "0"}
-			y1={direction === "vertical" ? "0" : "0"}
-			x2={direction === "vertical" ? "0" : "1"}
-			y2={direction === "vertical" ? "1" : "0"}
-		>
-			<stop
-				offset="0%"
-				stopColor={startColor}
-				stopOpacity={startOpacity}
-			/>
-			<stop
-				offset="100%"
-				stopColor={endColor}
-				stopOpacity={endOpacity}
-			/>
-		</linearGradient>
-	</defs>
-);

client/src/Components/monitors/charts/HistogramDockerContainer.tsx

@@ -1,132 +0,0 @@
-import { BaseChart, BaseBox } from "@/Components/design-elements";
-import { Area, AreaChart, CartesianGrid, ResponsiveContainer, Tooltip } from "recharts";
-import Typography from "@mui/material/Typography";
-
-// Types
-import type { DockerContainerStats } from "@/Types/Monitor";
-import type { TooltipProps } from "recharts";
-import type { NameType, ValueType } from "recharts/types/component/DefaultTooltipContent";
-import type { Theme } from "@mui/material/styles";
-import type { RootState } from "@/Types/state";
-
-// Hooks
-import { useTheme } from "@mui/material";
-import { Fragment, useId } from "react";
-import { useTranslation } from "react-i18next";
-import { useSelector } from "react-redux";
-
-// Utils
-import { createGradient } from "@/Components/monitors/charts/ChartUtils";
-import { tooltipDateFormatLookup, formatDateWithTz } from "@/Utils/TimeUtils";
-import type { DateRange } from "@/Types/Query";
-
-type DockerHistogramToolTipProps = TooltipProps<ValueType, NameType> & {
-	dataKey: string;
-	range: string;
-	theme: Theme;
-	uiTimezone: string;
-	valueFormatter: (value: number) => string;
-	labelKey: string;
-};
-
-const DockerHistogramToolTip = ({
-	dataKey,
-	active,
-	payload,
-	range,
-	theme,
-	uiTimezone,
-	valueFormatter,
-	labelKey,
-}: DockerHistogramToolTipProps) => {
-	const { t } = useTranslation();
-	if (!payload) return null;
-	if (!active) return null;
-	const format = tooltipDateFormatLookup(range);
-	const ts = payload[0].payload?._id ?? null;
-	const dataPoint = payload[0].payload?.[dataKey] ?? null;
-
-	return (
-		<BaseBox sx={{ py: theme.spacing(2), px: theme.spacing(4) }}>
-			<Typography>{formatDateWithTz(ts, format, uiTimezone)}</Typography>
-			<Typography>{t(labelKey, { value: valueFormatter(dataPoint) })}</Typography>
-		</BaseBox>
-	);
-};
-interface HistogramDockerContainerProps {
-	title: string;
-	rightTitle: string;
-	stats: DockerContainerStats;
-	dataKey: string;
-	strokeColor: string;
-	gradientStartColor: string;
-	range: DateRange;
-	formatter: (value: number) => string;
-	labelKey: string;
-}
-
-export const HistogramDockerContainer = ({
-	title,
-	rightTitle,
-	stats,
-	dataKey,
-	strokeColor,
-	gradientStartColor,
-	range,
-	formatter,
-	labelKey,
-}: HistogramDockerContainerProps) => {
-	const uniqueId = useId();
-	const theme = useTheme();
-	const gradientId = `gradient-${uniqueId}`;
-	const uiTimezone = useSelector((state: RootState) => state.ui.timezone);
-	return (
-		<BaseChart
-			icon="null"
-			title={title}
-			rightTitle={rightTitle}
-		>
-			<ResponsiveContainer
-				width="100%"
-				height={200}
-			>
-				<AreaChart data={stats.aggregate}>
-					<CartesianGrid
-						strokeWidth={1}
-						stroke={theme.palette.divider}
-						strokeOpacity={1}
-						fill="transparent"
-						vertical={false}
-					/>
-					<Fragment>
-						{createGradient({
-							id: gradientId,
-							startColor: gradientStartColor,
-							endColor: "transparent",
-							direction: "vertical",
-						})}
-						<Tooltip
-							content={(props) => (
-								<DockerHistogramToolTip
-									{...props}
-									range={range}
-									theme={theme}
-									uiTimezone={uiTimezone}
-									dataKey={dataKey}
-									valueFormatter={formatter}
-									labelKey={labelKey}
-								/>
-							)}
-						/>
-						<Area
-							dataKey={dataKey}
-							type="monotone"
-							stroke={strokeColor}
-							fill={`url(#${gradientId})`}
-						/>
-					</Fragment>
-				</AreaChart>
-			</ResponsiveContainer>
-		</BaseChart>
-	);
-};

client/src/Components/monitors/charts/HistogramInfrastructure.tsx

@@ -12,7 +12,85 @@ import { XTick } from "@/Components/monitors/charts/XTick";
 
 import { useTheme } from "@mui/material/styles";
 import type { HardwareCheckStats } from "@/Types/Monitor";
-import { AREA_COLORS, createGradient } from "@/Components/monitors/charts/ChartUtils";
+
+const AREA_COLORS = [
+	// Blues
+	"#3182bd", // Deep blue
+	"#6baed6", // Medium blue
+	"#9ecae1", // Light blue
+
+	// Greens
+	"#74c476", // Soft green
+	"#a1d99b", // Light green
+	"#c7e9c0", // Pale green
+
+	// Oranges
+	"#fdae6b", // Warm orange
+	"#fdd0a2", // Light orange
+	"#feedde", // Pale orange
+
+	// Purples
+	"#9467bd", // Lavender
+	"#a55194", // Deep magenta
+	"#c994c7", // Soft magenta
+
+	// Reds
+	"#ff9896", // Soft red
+	"#de2d26", // Deep red
+	"#fc9272", // Medium red
+
+	// Cyans/Teals
+	"#17becf", // Cyan
+	"#7fcdbb", // Teal
+	"#a1dab4", // Light teal
+
+	// Yellows
+	"#fec44f", // Mustard
+	"#fee391", // Light yellow
+	"#ffffd4", // Pale yellow
+
+	// Additional colors
+	"#e377c2", // Soft pink
+	"#bcbd22", // Olive
+	"#2ca02c", // Vibrant green
+];
+
+const createGradient = ({
+	id,
+	startColor,
+	endColor,
+	startOpacity = 0.8,
+	endOpacity = 0,
+	direction = "vertical",
+}: {
+	id: string;
+	startColor: string;
+	endColor: string;
+	startOpacity?: number;
+	endOpacity?: number;
+	direction?: "vertical" | "horizontal";
+}) => (
+	<defs>
+		<linearGradient
+			id={id}
+			x1={direction === "vertical" ? "0" : "0"}
+			y1={direction === "vertical" ? "0" : "0"}
+			x2={direction === "vertical" ? "0" : "1"}
+			y2={direction === "vertical" ? "1" : "0"}
+		>
+			<stop
+				offset="0%"
+				stopColor={startColor}
+				stopOpacity={startOpacity}
+			/>
+			<stop
+				offset="100%"
+				stopColor={endColor}
+				stopOpacity={endOpacity}
+			/>
+		</linearGradient>
+	</defs>
+);
 
 export const HistogramInfrastructure = ({
 	dateRange,

client/src/Components/sidebar/Menu.tsx

@@ -19,94 +19,68 @@ import {
 	Users,
 	Tag,
 	Waypoints,
-	Container,
 } from "lucide-react";
 export const getMenu = (t: Function) => {
 	return [
 		{
-			group: t("components.sidebar.menu.groups.monitoring"),
-			items: [
-				{
-					name: t("components.sidebar.menu.uptime"),
-					path: "uptime",
-					icon: <Icon icon={Globe} />,
-				},
-				{
-					name: t("components.sidebar.menu.docker"),
-					path: "docker",
-					icon: <Icon icon={Container} />,
-				},
-				{
-					name: t("components.sidebar.menu.infrastructure"),
-					path: "infrastructure",
-					icon: <Icon icon={Link} />,
-				},
-				{
-					name: t("components.sidebar.menu.pagespeed"),
-					path: "pagespeed",
-					icon: <Icon icon={Gauge} />,
-				},
-			],
+			name: t("components.sidebar.menu.uptime"),
+			path: "uptime",
+			icon: <Icon icon={Globe} />,
 		},
 		{
-			group: t("components.sidebar.menu.groups.alerting"),
-			items: [
-				{
-					name: t("components.sidebar.menu.incidents"),
-					path: "incidents",
-					icon: <Icon icon={AlertTriangle} />,
-				},
-				{
-					name: t("components.sidebar.menu.notifications"),
-					path: "notifications",
-					icon: <Icon icon={Bell} />,
-				},
-				{
-					name: t("components.sidebar.menu.maintenance"),
-					path: "maintenance",
-					icon: <Icon icon={Wrench} />,
-				},
-			],
+			name: t("components.sidebar.menu.pagespeed"),
+			path: "pagespeed",
+			icon: <Icon icon={Gauge} />,
 		},
 		{
-			group: t("components.sidebar.menu.groups.reporting"),
-			items: [
-				{
-					name: t("components.sidebar.menu.statusPages"),
-					path: "status",
-					icon: <Icon icon={Wifi} />,
-				},
-				{
-					name: t("components.sidebar.menu.checks"),
-					path: "checks",
-					icon: <Icon icon={FileText} />,
-				},
-				{
-					name: t("components.sidebar.menu.logs"),
-					path: "logs",
-					icon: <Icon icon={ScrollText} />,
-				},
-			],
+			name: t("components.sidebar.menu.infrastructure"),
+			path: "infrastructure",
+			icon: <Icon icon={Link} />,
 		},
 		{
-			group: t("components.sidebar.menu.groups.configuration"),
-			items: [
-				{
-					name: t("components.sidebar.menu.tags"),
-					path: "tags",
-					icon: <Icon icon={Tag} />,
-				},
-				{
-					name: t("components.sidebar.menu.proxies"),
-					path: "proxies",
-					icon: <Icon icon={Waypoints} />,
-				},
-				{
-					name: t("components.sidebar.menu.settings"),
-					path: "settings",
-					icon: <Icon icon={Settings} />,
-				},
-			],
+			name: t("components.sidebar.menu.notifications"),
+			path: "notifications",
+			icon: <Icon icon={Bell} />,
+		},
+		{
+			name: t("components.sidebar.menu.tags"),
+			path: "tags",
+			icon: <Icon icon={Tag} />,
+		},
+		{
+			name: t("components.sidebar.menu.proxies"),
+			path: "proxies",
+			icon: <Icon icon={Waypoints} />,
+		},
+		{
+			name: t("components.sidebar.menu.checks"),
+			path: "checks",
+			icon: <Icon icon={FileText} />,
+		},
+		{
+			name: t("components.sidebar.menu.incidents"),
+			path: "incidents",
+			icon: <Icon icon={AlertTriangle} />,
+		},
+		{
+			name: t("components.sidebar.menu.statusPages"),
+			path: "status",
+			icon: <Icon icon={Wifi} />,
+		},
+		{
+			name: t("components.sidebar.menu.maintenance"),
+			path: "maintenance",
+			icon: <Icon icon={Wrench} />,
+		},
+		{
+			name: t("components.sidebar.menu.logs"),
+			path: "logs",
+			icon: <Icon icon={ScrollText} />,
+		},
+		{
+			name: t("components.sidebar.menu.settings"),
+			icon: <Icon icon={Settings} />,
+			path: "settings",
 		},
 	];
 };

client/src/Components/sidebar/NavItem.tsx

@@ -25,10 +25,11 @@ export const NavItem = ({
 	const iconStroke = selected
 		? theme.palette.sidebar.accent
 		: theme.palette.text.secondary;
+
 	const buttonBgColor = selected ? theme.palette.action.selected : "transparent";
 	const buttonBgHoverColor = selected
-		? theme.palette.action.selectedHover
-		: theme.palette.action.rowHover;
+		? theme.palette.action.selected
+		: theme.palette.action.hover;
 	const fontWeight = selected ? 600 : 400;
 	return (
 		<Tooltip

client/src/Components/sidebar/index.tsx

@@ -1,12 +1,9 @@
 import { useEffect } from "react";
 import Backdrop from "@mui/material/Backdrop";
 import Stack from "@mui/material/Stack";
-import Box from "@mui/material/Box";
-import Typography from "@mui/material/Typography";
 import List from "@mui/material/List";
 import Divider from "@mui/material/Divider";
 import { LAYOUT } from "@/Utils/Theme/constants";
-import { typographyLevels } from "@/Utils/Theme/Palette";
 import { useSidebar } from "@/Hooks/useSidebar.js";
 import { Logo } from "@/Components/sidebar/Logo";
 import { getMenu, getAccountMenu } from "@/Components/sidebar/Menu";
@@ -32,7 +29,7 @@ export const Sidebar = () => {
 	const navigate = useNavigate();
 	const location = useLocation();
 	const { t } = useTranslation();
-	const { width, transition, transitionTiming, collapsed } = useSidebar();
+	const { width, transition, collapsed } = useSidebar();
 	const theme = useTheme();
 	const isSmall = useMediaQuery(theme.breakpoints.down("md"));
 	const menu = getMenu(t);
@@ -73,11 +70,11 @@ export const Sidebar = () => {
 				gap={theme.spacing(LAYOUT.SM)}
 				borderRight={`1px solid ${theme.palette.divider}`}
 				width={width}
-				bgcolor={theme.palette.background.paper}
 				sx={{
 					touchAction: "none",
 					transition: transition,
 					zIndex: 1000,
+					backdropFilter: "blur(8px)",
 				}}
 			>
 				<List
@@ -92,52 +89,17 @@ export const Sidebar = () => {
 						pt={theme.spacing(LAYOUT.MD)}
 						pb={theme.spacing(LAYOUT.MD)}
 					/>
-					{menu.map((group) => (
-						<Box key={group.group}>
-							<Box
-								position="relative"
-								overflow="hidden"
-							>
-								<Typography
-									variant="eyebrow"
-									component="div"
-									color={theme.palette.text.disabled}
-									fontSize={typographyLevels.s}
-									paddingLeft={theme.spacing(5)}
-									paddingTop={theme.spacing(LAYOUT.SM)}
-									paddingBottom={theme.spacing(LAYOUT.XXS)}
-									whiteSpace="nowrap"
-									sx={{
-										opacity: collapsed ? 0 : 1,
-										transition: `opacity ${transitionTiming}`,
-									}}
-								>
-									{group.group}
-								</Typography>
-								<Divider
-									sx={{
-										position: "absolute",
-										top: "50%",
-										left: 0,
-										right: 0,
-										opacity: collapsed ? 1 : 0,
-										transition: `opacity ${transitionTiming}`,
-									}}
-								/>
-							</Box>
-							{group.items.map((item) => {
-								const selected = location.pathname.startsWith(`/${item.path}`);
-								return (
-									<NavItem
-										key={item.path}
-										item={item}
-										selected={selected}
-										onClick={() => handleNavClick(item.path)}
-									/>
-								);
-							})}
-						</Box>
-					))}
+					{menu.map((item) => {
+						const selected = location.pathname.startsWith(`/${item.path}`);
+						return (
+							<NavItem
+								key={item.path}
+								item={item}
+								selected={selected}
+								onClick={() => handleNavClick(item.path)}
+							/>
+						);
+					})}
 				</List>
 				<StarPrompt />
 

client/src/Features/UI/uiSlice.ts

@@ -8,8 +8,7 @@ type TableName =
 	| "maintenance"
 	| "infrastructure"
 	| "logs"
-	| "pagespeed"
-	| "docker";
+	| "pagespeed";
 
 interface TableState {
 	rowsPerPage: number;
@@ -25,7 +24,6 @@ interface UIState {
 	team: TableState;
 	maintenance: TableState;
 	infrastructure: TableState;
-	docker: TableState;
 	logs: TableState;
 	sidebar: SidebarState;
 	mode: ThemeMode;
@@ -58,9 +56,6 @@ const initialState: UIState = {
 	infrastructure: {
 		rowsPerPage: 5,
 	},
-	docker: {
-		rowsPerPage: 5,
-	},
 	logs: {
 		rowsPerPage: 15,
 	},

client/src/Hooks/UseApi.ts

@@ -6,7 +6,7 @@ import { useState } from "react";
 import { useToast } from "@/Hooks/UseToast";
 import { logger } from "@/Utils/logger";
 
-export interface ApiResponse<T> {
+interface ApiResponse<T> {
 	success: boolean;
 	msg: string;
 	data: T;

client/src/Hooks/UseToast.ts

@@ -1,30 +1,27 @@
 import { toast, type ToastOptions } from "react-toastify";
-import { useMemo } from "react";
 
 export const useToast = () => {
-	return useMemo(() => {
-		const showToast = (message: string, options?: ToastOptions) => {
-			toast.dismiss();
-			const baseStyle: React.CSSProperties = {
-				whiteSpace: "nowrap",
-				overflow: "hidden",
-				textOverflow: "ellipsis",
-			};
-			toast(message, {
-				...options,
-				style: { ...baseStyle, ...(options?.style || {}) },
-			});
+	const showToast = (message: string, options?: ToastOptions) => {
+		toast.dismiss();
+		const baseStyle: React.CSSProperties = {
+			whiteSpace: "nowrap",
+			overflow: "hidden",
+			textOverflow: "ellipsis",
 		};
+		toast(message, {
+			...options,
+			style: { ...baseStyle, ...(options?.style || {}) },
+		});
+	};
 
-		const toastSuccess = (msg: string, opts?: ToastOptions) =>
-			showToast(msg, { ...opts, type: "success" });
-		const toastError = (msg: string, opts?: ToastOptions) =>
-			showToast(msg, { ...opts, type: "error" });
-		const toastInfo = (msg: string, opts?: ToastOptions) =>
-			showToast(msg, { ...opts, type: "info" });
-		const toastWarning = (msg: string, opts?: ToastOptions) =>
-			showToast(msg, { ...opts, type: "warning" });
+	const toastSuccess = (msg: string, opts?: ToastOptions) =>
+		showToast(msg, { ...opts, type: "success" });
+	const toastError = (msg: string, opts?: ToastOptions) =>
+		showToast(msg, { ...opts, type: "error" });
+	const toastInfo = (msg: string, opts?: ToastOptions) =>
+		showToast(msg, { ...opts, type: "info" });
+	const toastWarning = (msg: string, opts?: ToastOptions) =>
+		showToast(msg, { ...opts, type: "warning" });
 
-		return { showToast, toastSuccess, toastError, toastInfo, toastWarning };
-	}, []);
+	return { showToast, toastSuccess, toastError, toastInfo, toastWarning };
 };

client/src/Hooks/useMonitorForm.ts

@@ -77,13 +77,6 @@ export const getMonitorDefaults = (
 				...base,
 				type: "docker",
 				url: data?.url || "",
-				ignoreTlsErrors: data?.ignoreTlsErrors || false,
-				dockerTlsCa: data?.dockerTlsCa || "",
-				dockerTlsCert: data?.dockerTlsCert || "",
-				// The key is write-only; the API never returns it.
-				dockerTlsKey: "",
-				dockerTlsKeySet: data?.dockerTlsKeySet ?? false,
-				dockerLogsEnabled: data?.dockerLogsEnabled ?? false,
 			};
 			break;
 		case "game":

client/src/Hooks/useSidebar.ts

@@ -6,8 +6,7 @@ const SIDEBAR_WIDTH_VAR = 250;
 const SIDEBAR_COLLAPSED_WIDTH_VAR = 64;
 
 // Transition timing for sidebar width changes
-const SIDEBAR_TRANSITION_TIMING = "650ms cubic-bezier(0.36, -0.01, 0, 0.77)";
-const SIDEBAR_TRANSITION = `width ${SIDEBAR_TRANSITION_TIMING}`;
+const SIDEBAR_TRANSITION = "width 650ms cubic-bezier(0.36, -0.01, 0, 0.77)";
 
 export const useSidebar = () => {
 	const collapsed = useSelector(
@@ -20,7 +19,6 @@ export const useSidebar = () => {
 		expandedWidth: SIDEBAR_WIDTH_VAR,
 		width: collapsed ? SIDEBAR_COLLAPSED_WIDTH_VAR : SIDEBAR_WIDTH_VAR,
 		transition: SIDEBAR_TRANSITION,
-		transitionTiming: SIDEBAR_TRANSITION_TIMING,
 	};
 };
 

client/src/Pages/Account/components/HeaderTeamControls.tsx

@@ -59,12 +59,7 @@ export const HeaderTeamControls = ({
 				<Button
 					variant="contained"
 					color="primary"
-					startIcon={
-						<Icon
-							icon={Mail}
-							size={16}
-						/>
-					}
+					startIcon={<Icon icon={Mail} />}
 					onClick={onInviteClick}
 				>
 					{t("common.buttons.inviteMember")}
@@ -74,12 +69,7 @@ export const HeaderTeamControls = ({
 				<Button
 					variant="contained"
 					color="primary"
-					startIcon={
-						<Icon
-							icon={UserPlus}
-							size={16}
-						/>
-					}
+					startIcon={<Icon icon={UserPlus} />}
 					onClick={onAddMemberClick}
 				>
 					{t("common.buttons.addMember")}

client/src/Pages/Checks/index.tsx

@@ -17,14 +17,13 @@ import { useParams } from "react-router-dom";
 import { useGet } from "@/Hooks/UseApi";
 import type { Monitor } from "@/Types/Monitor";
 import type { ChecksSummary, ChecksResponse } from "@/Types/Check";
-import type { DateRange } from "@/Types/Query";
 
 const Checks = () => {
 	const { t } = useTranslation();
 	const { monitorId } = useParams<{ monitorId?: string }>();
 
 	const [selectedMonitor, setSelectedMonitor] = useState<string>(monitorId || "0");
-	const [dateRange, setDateRange] = useState<DateRange>("recent");
+	const [dateRange, setDateRange] = useState<string>("recent");
 	const [statusFilter, setStatusFilter] = useState<string>("down");
 	const [page, setPage] = useState<number>(0);
 	const [rowsPerPage, setRowsPerPage] = useState<number>(10);

client/src/Pages/CreateMonitor/index.tsx

@@ -50,7 +50,6 @@ import type { AppSettingsResponse } from "@/Types/Settings";
 import {
 	stepFieldsFor,
 	monitorStepCount,
-	isDockerTlsUrl,
 	type MonitorFormData,
 } from "@/Validation/monitor";
 import { FormNumberField } from "@/Components/inputs/forms/FormNumberField";
@@ -67,14 +66,6 @@ const httpMethodOptions = HttpMethods.map((method) => ({
 	label: method,
 }));
 
-const PEM_FIELD_ROWS = 6;
-
-// Hides the pasted key while the field is not focused. Ignored by browsers
-// without -webkit-text-security, which then show the key as plain text.
-const maskedInputSx = {
-	"&:not(.Mui-focused) textarea": { WebkitTextSecurity: "disc" },
-};
-
 interface GeneralSettingsConfig {
 	urlLabel: string;
 	urlPlaceholder: string;
@@ -127,8 +118,8 @@ const getGeneralSettingsConfig = (
 			showDnsRecordType: false,
 		},
 		docker: {
-			urlLabel: t("pages.createMonitor.form.general.option.dockerHost.label"),
-			urlPlaceholder: t("pages.createMonitor.form.general.option.dockerHost.placeholder"),
+			urlLabel: t("pages.createMonitor.form.general.option.container.label"),
+			urlPlaceholder: t("pages.createMonitor.form.general.option.container.placeholder"),
 			namePlaceholder: t("pages.createMonitor.form.general.option.name.placeholder"),
 			showUrl: true,
 			showProxy: false,
@@ -264,7 +255,6 @@ const CreateMonitorPage = () => {
 		const firstSegment = pathSegments[0];
 		if (firstSegment === "pagespeed") return "pagespeed";
 		if (firstSegment === "infrastructure") return "hardware";
-		if (firstSegment === "docker") return "docker";
 		return "uptime";
 	}, [location.pathname]);
 
@@ -274,9 +264,7 @@ const CreateMonitorPage = () => {
 			? "pagespeed"
 			: pageType === "hardware"
 				? "hardware"
-				: pageType === "docker"
-					? "docker"
-					: "http";
+				: "http";
 
 	const { data: existingMonitor, refetch: refetchMonitor } = useGet<Monitor>(
 		isEditMode ? `/monitors/${monitorId}` : null
@@ -309,7 +297,6 @@ const CreateMonitorPage = () => {
 	const showStep = (step: number) => isEditMode || currentStep === step;
 
 	const watchedType = watch("type") as MonitorType;
-	const watchedUrl = watch("url") as string;
 	const watchedMethod = watch("method") as HttpMethod | undefined;
 	const watchedProxyMode = watch("proxyMode") as ProxyMode | undefined;
 	const watchedUseAdvancedMatching = watch("useAdvancedMatching") as boolean;
@@ -344,8 +331,6 @@ const CreateMonitorPage = () => {
 		[watchedType, t]
 	);
 
-	const pemInputSx = { fontFamily: theme.typography.fontFamilyMonospace };
-
 	const { post, loading: isCreating } = usePost<MonitorFormData, Monitor>();
 	const { patch, loading: isUpdating } = usePatch<MonitorFormData, Monitor>();
 	const isSubmitting = isCreating || isUpdating;
@@ -388,8 +373,6 @@ const CreateMonitorPage = () => {
 				navigate("/pagespeed");
 			} else if (pageType === "hardware") {
 				navigate("/infrastructure");
-			} else if (pageType === "docker") {
-				navigate("/docker");
 			} else {
 				navigate("/uptime");
 			}
@@ -701,64 +684,6 @@ const CreateMonitorPage = () => {
 					/>
 				)}
 
-				{showStep(0) && watchedType === "docker" && isDockerTlsUrl(watchedUrl) && (
-					<ConfigBox
-						title={t("pages.createMonitor.form.dockerTls.title")}
-						subtitle={t("pages.createMonitor.form.dockerTls.description")}
-						rightContent={
-							<Stack spacing={theme.spacing(LAYOUT.MD)}>
-								<FormTextField
-									name="dockerTlsCa"
-									multiline
-									rows={PEM_FIELD_ROWS}
-									fieldLabel={t("pages.createMonitor.form.dockerTls.option.ca.label")}
-									placeholder={t(
-										"pages.createMonitor.form.dockerTls.option.ca.placeholder"
-									)}
-									slotProps={{ input: { sx: pemInputSx } }}
-								/>
-								<FormTextField
-									name="dockerTlsCert"
-									multiline
-									rows={PEM_FIELD_ROWS}
-									fieldLabel={t("pages.createMonitor.form.dockerTls.option.cert.label")}
-									placeholder={t(
-										"pages.createMonitor.form.dockerTls.option.cert.placeholder"
-									)}
-									slotProps={{ input: { sx: pemInputSx } }}
-								/>
-								<FormTextField
-									name="dockerTlsKey"
-									multiline
-									rows={PEM_FIELD_ROWS}
-									fieldLabel={t("pages.createMonitor.form.dockerTls.option.key.label")}
-									placeholder={t(
-										"pages.createMonitor.form.dockerTls.option.key.placeholder"
-									)}
-									helperText={
-										existingMonitor?.dockerTlsKeySet
-											? t("pages.createMonitor.form.dockerTls.option.key.stored")
-											: undefined
-									}
-									autoComplete="off"
-									slotProps={{ input: { sx: { ...pemInputSx, ...maskedInputSx } } }}
-								/>
-								<FormSwitchField
-									name="ignoreTlsErrors"
-									label={t("pages.createMonitor.form.dockerTls.option.ignoreTls.label")}
-								/>
-								<Typography
-									component="span"
-									color={theme.palette.text.secondary}
-									sx={{ opacity: 0.8 }}
-								>
-									{t("pages.createMonitor.form.dockerTls.option.ignoreTls.description")}
-								</Typography>
-							</Stack>
-						}
-					/>
-				)}
-
 				{showStep(1) && (
 					<ConfigBox
 						title={t("pages.createMonitor.form.frequency.title")}
@@ -898,19 +823,6 @@ const CreateMonitorPage = () => {
 					/>
 				)}
 
-				{showStep(1) && watchedType === "docker" && (
-					<ConfigBox
-						title={t("pages.createMonitor.form.dockerLogs.title")}
-						subtitle={t("pages.createMonitor.form.dockerLogs.description")}
-						rightContent={
-							<FormSwitchField
-								name="dockerLogsEnabled"
-								label={t("pages.createMonitor.form.dockerLogs.option.enabled.label")}
-							/>
-						}
-					/>
-				)}
-
 				{showStep(2) &&
 					(watchedType === "http" ||
 						watchedType === "grpc" ||

client/src/Pages/Docker/ContainerDetails/Components/HeaderLogs.tsx

@@ -1,69 +0,0 @@
-import Stack from "@mui/material/Stack";
-import Typography from "@mui/material/Typography";
-import { Dot } from "@/Components/design-elements";
-
-// Hooks
-import { useEffect, useState } from "react";
-import { useTheme } from "@mui/material";
-import { useTranslation } from "react-i18next";
-
-// Utils
-import { LAYOUT, SPACING } from "@/Utils/Theme/constants";
-import { MS_PER_SECOND, MS_PER_MINUTE } from "@/Utils/TimeUtils";
-
-interface HeaderLogsProps {
-	lines: number;
-	loading: boolean;
-	lastUpdatedAt: number | null;
-}
-
-export const HeaderLogs = ({ lines, loading, lastUpdatedAt }: HeaderLogsProps) => {
-	const theme = useTheme();
-	const { t } = useTranslation();
-	const [now, setNow] = useState(() => Date.now());
-
-	useEffect(() => {
-		if (lastUpdatedAt === null) return;
-		setNow(Date.now());
-		const id = window.setInterval(() => setNow(Date.now()), MS_PER_SECOND);
-		return () => window.clearInterval(id);
-	}, [lastUpdatedAt]);
-
-	const renderStatus = () => {
-		if (loading) return t("pages.docker.container.logs.loading");
-		if (lastUpdatedAt === null) return null;
-		const ageMs = Math.max(0, now - lastUpdatedAt);
-		return ageMs < MS_PER_MINUTE
-			? t("pages.docker.container.logs.updatedSecondsAgo", {
-					count: Math.floor(ageMs / MS_PER_SECOND),
-				})
-			: t("pages.docker.container.logs.updatedMinutesAgo", {
-					count: Math.floor(ageMs / MS_PER_MINUTE),
-				});
-	};
-
-	return (
-		<Stack
-			direction="row"
-			alignItems="center"
-			gap={LAYOUT.MD}
-		>
-			<Typography>
-				{t("pages.docker.container.logs.recentLines", { count: lines })}
-			</Typography>
-			<Stack
-				direction="row"
-				alignItems="center"
-				gap={SPACING.SM}
-			>
-				{lastUpdatedAt !== null && !loading && (
-					<Dot
-						color={theme.palette.success.main}
-						size="md"
-					/>
-				)}
-				<Typography color={theme.palette.text.secondary}>{renderStatus()}</Typography>
-			</Stack>
-		</Stack>
-	);
-};

client/src/Pages/Docker/ContainerDetails/Components/RowLog.tsx

@@ -1,78 +0,0 @@
-import Grid from "@mui/material/Grid";
-import Typography from "@mui/material/Typography";
-import Box from "@mui/material/Box";
-import Stack from "@mui/material/Stack";
-import Divider from "@mui/material/Divider";
-import { Fragment } from "react";
-
-// Hooks
-import { useTheme } from "@mui/material";
-import { useSelector } from "react-redux";
-import { useTranslation } from "react-i18next";
-
-// Utils
-import type { DockerLogRow } from "@/Utils/MonitorUtils";
-import { LAYOUT, SPACING } from "@/Utils/Theme/constants";
-import { formatDateWithTz } from "@/Utils/TimeUtils";
-import type { RootState } from "@/store";
-
-export const RowLog = ({ row }: { row: DockerLogRow }) => {
-	const theme = useTheme();
-	const uiTimezone = useSelector((state: RootState) => state.ui.timezone);
-	const { t } = useTranslation();
-
-	return (
-		<Fragment>
-			<Grid
-				container
-				spacing={{ xs: 0, md: LAYOUT.MD }}
-				py={{ xs: LAYOUT.LG, md: 0 }}
-			>
-				<Grid size={{ xs: 12, md: "auto" }}>
-					<Typography
-						fontFamily="monospace"
-						color={theme.palette.text.secondary}
-					>
-						{formatDateWithTz(row.ts, "MMM D HH:mm:ss", uiTimezone)}
-					</Typography>
-				</Grid>
-				<Grid size={{ xs: 12, md: "grow" }}>
-					<Typography
-						fontFamily={"monospace"}
-						whiteSpace={{ xs: "pre-wrap", md: "nowrap" }}
-						sx={{
-							overflowWrap: { xs: "anywhere", md: "normal" },
-						}}
-					>
-						<Box
-							component={"span"}
-							color={
-								row.stream === "stderr"
-									? theme.palette.error.main
-									: theme.palette.success.main
-							}
-						>
-							{row.stream}
-						</Box>
-						: {row.text}
-					</Typography>
-				</Grid>
-			</Grid>
-			{row.gapBefore ? (
-				<Stack
-					width="100%"
-					direction="row"
-					alignItems={"center"}
-					py={SPACING.MD}
-				>
-					<Typography pr={SPACING.MD}>
-						{t("pages.docker.container.logs.skipped")}
-					</Typography>
-					<Divider sx={{ flex: 1 }} />
-				</Stack>
-			) : (
-				<Divider sx={{ display: { xs: "block", md: "none" } }} />
-			)}
-		</Fragment>
-	);
-};

client/src/Pages/Docker/ContainerDetails/Components/StatBoxes.tsx

@@ -1,54 +0,0 @@
-import Stack from "@mui/material/Stack";
-import { StatBox } from "@/Components/design-elements";
-
-// Types
-
-// Hooks
-import { useTheme } from "@mui/material";
-import { useTranslation } from "react-i18next";
-import type { DockerContainerInfo } from "@/Types/Check";
-
-// Utils
-import { formatDuration } from "@/Utils/TimeUtils";
-import { getDockerPalette } from "@/Utils/MonitorUtils";
-
-export const DockerContainerStatusBoxes = ({
-	container,
-}: {
-	container: DockerContainerInfo | undefined;
-}) => {
-	const { t } = useTranslation();
-	const theme = useTheme();
-
-	if (!container) return null;
-
-	const { state, restartCount, health } = container;
-	const startedAt = container.startedAt ?? "0";
-	const runningFor = Date.now() - new Date(startedAt).getTime();
-	const palette = getDockerPalette(state);
-	return (
-		<Stack
-			direction="row"
-			gap={theme.spacing(8)}
-			flexWrap={"wrap"}
-		>
-			<StatBox
-				title={t("common.labels.state")}
-				subtitle={state}
-				palette={palette}
-			/>
-			<StatBox
-				title={t("common.labels.uptime")}
-				subtitle={formatDuration(runningFor)}
-			/>
-			<StatBox
-				title={t("common.labels.restarts")}
-				subtitle={String(restartCount ?? 0)}
-			/>
-			<StatBox
-				title={t("common.labels.health")}
-				subtitle={health}
-			/>
-		</Stack>
-	);
-};

client/src/Pages/Docker/ContainerDetails/TabLogs.tsx

@@ -1,271 +0,0 @@
-// Components
-import Stack from "@mui/material/Stack";
-import Typography from "@mui/material/Typography";
-import { BaseBox, EmptyState } from "@/Components/design-elements";
-import { Button } from "@/Components/inputs";
-import { HeaderLogs } from "@/Pages/Docker/ContainerDetails/Components/HeaderLogs";
-import { RowLog } from "@/Pages/Docker/ContainerDetails/Components/RowLog";
-
-// Types
-import type { DockerContainerLogsResponse } from "@/Types/Monitor";
-import type { DockerLog } from "@/Types/Check";
-import type { ApiResponse } from "@/Hooks/UseApi";
-
-// Hooks
-import {
-	useState,
-	useEffect,
-	useLayoutEffect,
-	useMemo,
-	useRef,
-	useCallback,
-} from "react";
-import { useTheme } from "@mui/material";
-import { useTranslation } from "react-i18next";
-import { useToast } from "@/Hooks/UseToast";
-import { useIsAdmin } from "@/Hooks/useIsAdmin";
-
-// Utils
-import { get } from "@/Utils/ApiClient";
-import { LAYOUT } from "@/Utils/Theme/constants";
-import { flattenDockerLogs } from "@/Utils/MonitorUtils";
-
-interface TabLogsProps {
-	monitorId?: string;
-	containerName?: string;
-	enabled: boolean;
-}
-
-const SCROLL_PIN_THRESHOLD_PX = 8;
-const TAIL_POLL_MS = 10_000;
-const SCROLLBAR_SIZE = 14;
-
-const isScrolledToBottom = (el: HTMLElement) =>
-	el.scrollHeight - el.scrollTop - el.clientHeight <= SCROLL_PIN_THRESHOLD_PX;
-
-const fetchLogs = async (url: string, params: { before?: string; after?: string }) => {
-	const res = await get<ApiResponse<DockerContainerLogsResponse>>(url, { params });
-	return res.data.data;
-};
-
-export const TabLogs = ({ monitorId, containerName, enabled }: TabLogsProps) => {
-	const theme = useTheme();
-	const { t } = useTranslation();
-	const { toastError } = useToast();
-	const isAdmin = useIsAdmin();
-
-	// logs is newest-first, matching the API and what flattenDockerLogs expects.
-	const [logs, setLogs] = useState<DockerLog[]>([]);
-	const [olderExhausted, setOlderExhausted] = useState(false);
-	const [loadingInitial, setLoadingInitial] = useState(false);
-	const [loadingOlder, setLoadingOlder] = useState(false);
-	const [lastUpdatedAt, setLastUpdatedAt] = useState<number | null>(null);
-
-	const logsUrl =
-		isAdmin && enabled && monitorId && containerName
-			? `/monitors/docker/details/${encodeURIComponent(monitorId)}/containers/${encodeURIComponent(containerName)}/logs`
-			: null;
-
-	const newestCursor = logs[0]?.checkedAt;
-	const oldestCursor = logs[logs.length - 1]?.checkedAt;
-
-	// Initial page. Resets everything when the container changes.
-	useEffect(() => {
-		setLogs([]);
-		setOlderExhausted(false);
-		if (!logsUrl) return;
-		let cancelled = false;
-		setLoadingInitial(true);
-		fetchLogs(logsUrl, {})
-			.then((page) => {
-				if (cancelled) return;
-				setLogs(page.logs);
-				setOlderExhausted(page.nextCursor === null);
-				setLastUpdatedAt(Date.now());
-			})
-			.catch(() => {
-				if (cancelled) return;
-				toastError(t("pages.docker.container.logs.loadError"));
-			})
-			.finally(() => {
-				if (!cancelled) setLoadingInitial(false);
-			});
-		return () => {
-			cancelled = true;
-		};
-	}, [logsUrl, t, toastError]);
-
-	const newestCursorRef = useRef(newestCursor);
-	newestCursorRef.current = newestCursor;
-
-	useEffect(() => {
-		if (!logsUrl) return;
-		let inFlight = false;
-		const tick = async () => {
-			if (inFlight || document.hidden) return;
-			inFlight = true;
-			try {
-				const cursor = newestCursorRef.current;
-				const page = await fetchLogs(logsUrl, cursor ? { after: cursor } : {});
-				if (page.logs.length > 0) setLogs((prev) => [...page.logs, ...prev]);
-				setLastUpdatedAt(Date.now());
-			} catch (err: unknown) {
-				console.error(err);
-			} finally {
-				inFlight = false;
-			}
-		};
-		const id = window.setInterval(tick, TAIL_POLL_MS);
-		document.addEventListener("visibilitychange", tick);
-		return () => {
-			window.clearInterval(id);
-			document.removeEventListener("visibilitychange", tick);
-		};
-	}, [logsUrl]);
-
-	const rows = useMemo(() => flattenDockerLogs(logs), [logs]);
-
-	const logBoxRef = useRef<HTMLDivElement>(null);
-	const pinnedToBottom = useRef(true);
-	const prependAnchor = useRef<{ scrollHeight: number; scrollTop: number } | null>(null);
-
-	// Always pin to bottom when container/monitor changes
-	useLayoutEffect(() => {
-		pinnedToBottom.current = true;
-	}, [monitorId, containerName]);
-
-	// Rows changed: restore position after a prepend, otherwise honour the pin
-	useLayoutEffect(() => {
-		const el = logBoxRef.current;
-		if (!el) return;
-		const anchor = prependAnchor.current;
-		if (anchor) {
-			prependAnchor.current = null;
-			el.scrollTop = el.scrollHeight - anchor.scrollHeight + anchor.scrollTop;
-			return;
-		}
-		if (pinnedToBottom.current) el.scrollTop = el.scrollHeight;
-	}, [rows]);
-
-	const handleScroll = useCallback((event: React.UIEvent<HTMLDivElement>) => {
-		pinnedToBottom.current = isScrolledToBottom(event.currentTarget);
-	}, []);
-
-	const loadOlder = useCallback(async () => {
-		if (!logsUrl || !oldestCursor || loadingOlder) return;
-		setLoadingOlder(true);
-		try {
-			const page = await fetchLogs(logsUrl, { before: oldestCursor });
-			const el = logBoxRef.current;
-			if (el)
-				prependAnchor.current = {
-					scrollHeight: el.scrollHeight,
-					scrollTop: el.scrollTop,
-				};
-			setLogs((prev) => [...prev, ...page.logs]);
-			setOlderExhausted(page.nextCursor === null);
-		} catch {
-			toastError(t("pages.docker.container.logs.loadOlderError"));
-		} finally {
-			setLoadingOlder(false);
-		}
-	}, [logsUrl, oldestCursor, loadingOlder, t, toastError]);
-
-	if (!isAdmin) {
-		return (
-			<EmptyState
-				title={t("pages.docker.container.logs.forbidden.title")}
-				description={t("pages.docker.container.logs.forbidden.description")}
-			/>
-		);
-	}
-
-	if (!enabled) {
-		return (
-			<EmptyState
-				title={t("pages.docker.container.logs.disabled.title")}
-				description={t("pages.docker.container.logs.disabled.description")}
-				actionText={t("pages.docker.container.logs.disabled.action")}
-				actionTo={`/docker/configure/${monitorId}`}
-			/>
-		);
-	}
-
-	if (lastUpdatedAt !== null && rows.length === 0) {
-		return (
-			<EmptyState
-				title={t("pages.docker.container.logs.empty.title")}
-				description={t("pages.docker.container.logs.empty.description")}
-			/>
-		);
-	}
-
-	return (
-		<Stack gap={LAYOUT.MD}>
-			<HeaderLogs
-				lines={rows.length}
-				loading={loadingInitial}
-				lastUpdatedAt={lastUpdatedAt}
-			/>
-			<BaseBox
-				ref={logBoxRef}
-				onScroll={handleScroll}
-				minHeight={240}
-				maxHeight="50vh"
-				overflow="auto"
-				padding={LAYOUT.MD}
-				sx={{
-					overflowAnchor: "none",
-					scrollbarWidth: "auto",
-					scrollbarColor: "#11715b rgba(0,0,0,0.15)",
-					"&::-webkit-scrollbar": {
-						display: "block",
-						width: `${SCROLLBAR_SIZE}px`,
-						height: `${SCROLLBAR_SIZE}px`,
-					},
-					"&::-webkit-scrollbar-track": {
-						background: "rgba(0,0,0,0.15)",
-						borderRadius: "2px",
-					},
-					"&::-webkit-scrollbar-thumb": {
-						background: "#11715b",
-						borderRadius: "2px",
-					},
-					"&::-webkit-scrollbar-button": { display: "none" },
-				}}
-			>
-				{rows.length > 0 && (
-					<Stack
-						direction="row"
-						justifyContent="center"
-						pb={LAYOUT.MD}
-					>
-						{olderExhausted ? (
-							<Typography color={theme.palette.text.secondary}>
-								{t("pages.docker.container.logs.noOlder")}
-							</Typography>
-						) : (
-							<Button
-								variant="contained"
-								disabled={loadingOlder}
-								onClick={loadOlder}
-							>
-								{loadingOlder
-									? t("pages.docker.container.logs.loadingOlder")
-									: t("pages.docker.container.logs.loadOlder")}
-							</Button>
-						)}
-					</Stack>
-				)}
-				{rows.map((row) => {
-					return (
-						<RowLog
-							key={row.key}
-							row={row}
-						/>
-					);
-				})}
-			</BaseBox>
-		</Stack>
-	);
-};

client/src/Pages/Docker/ContainerDetails/TabOverview.tsx

@@ -1,126 +0,0 @@
-// Components
-import Grid from "@mui/material/Grid";
-import Stack from "@mui/material/Stack";
-import { HistogramDockerContainer } from "@/Components/monitors/charts/HistogramDockerContainer";
-
-// Hooks
-import { Typography, useTheme } from "@mui/material";
-import { useTranslation } from "react-i18next";
-import useMediaQuery from "@mui/material/useMediaQuery";
-
-// Types
-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 } from "@/Utils/FormatUtils";
-import prettyBytes from "pretty-bytes";
-import { BaseBox } from "@/Components/design-elements";
-import { dedupeDockerPorts, getDockerMountLabel } from "@/Utils/MonitorUtils";
-import type { DateRange } from "@/Types/Query";
-
-const getChartConfigs = (theme: Theme, t: TFunction, stats: DockerContainerStats) => [
-	{
-		title: t("common.charts.labels.cpuUsage"),
-		key: "avgCpuPct",
-		color: theme.palette.success.main,
-		rightTitle: formatPercentage(stats?.latest?.container.cpuPct || 0),
-		formatter: formatPercentage,
-		labelKey: "common.charts.histogram.avgCpuUsage",
-	},
-	{
-		title: t("common.charts.labels.memoryUsage"),
-		key: "avgMemoryUsedBytes",
-		color: theme.palette.primary.main,
-		rightTitle: prettyBytes(stats?.latest?.container.memoryUsedBytes || 0),
-		formatter: prettyBytes,
-		labelKey: "common.charts.histogram.avgMemoryUsage",
-	},
-];
-
-export const TabOverview = ({
-	stats,
-	range,
-}: {
-	stats: DockerContainerStats;
-	range: DateRange;
-}) => {
-	const theme = useTheme();
-	const { t } = useTranslation();
-	const isSmall = useMediaQuery(theme.breakpoints.down("md"));
-	const { ports, mounts } = stats?.latest?.container ?? {};
-	const dedupedPorts = dedupeDockerPorts(ports ?? []);
-	return (
-		<Grid
-			container
-			spacing={LAYOUT.MD}
-		>
-			{getChartConfigs(theme, t, stats).map((config) => {
-				return (
-					<Grid
-						key={config.key}
-						size={isSmall ? 12 : 6}
-					>
-						<HistogramDockerContainer
-							title={config.title}
-							rightTitle={config.rightTitle}
-							stats={stats}
-							dataKey={config.key}
-							strokeColor={config.color}
-							gradientStartColor={config.color}
-							range={range}
-							formatter={config.formatter}
-							labelKey={config.labelKey}
-						/>
-					</Grid>
-				);
-			})}
-			<Grid size={isSmall ? 12 : 6}>
-				<BaseBox
-					padding={LAYOUT.MD}
-					minHeight={200}
-				>
-					<Typography
-						variant="eyebrow"
-						color={theme.palette.text.secondary}
-						textTransform={"uppercase"}
-					>
-						Ports
-					</Typography>
-					<Stack>
-						{dedupedPorts?.map((port) => {
-							return (
-								<Typography
-									key={`${port.publicPort}/${port.privatePort}`}
-								>{`${port.hostIp}:${port.publicPort} -> ${port.privatePort}/${port.protocol}`}</Typography>
-							);
-						})}
-					</Stack>
-				</BaseBox>
-			</Grid>
-			<Grid size={isSmall ? 12 : 6}>
-				<BaseBox
-					padding={LAYOUT.MD}
-					minHeight={200}
-				>
-					<Typography
-						variant="eyebrow"
-						color={theme.palette.text.secondary}
-						textTransform={"uppercase"}
-					>
-						Volumes
-					</Typography>
-					<Stack>
-						{mounts?.map((mount) => {
-							return (
-								<Typography key={`${mount.source}/${mount.destination}`}>
-									{`${getDockerMountLabel(mount)} -> ${mount.destination}`}
-								</Typography>
-							);
-						})}
-					</Stack>
-				</BaseBox>
-			</Grid>
-		</Grid>
-	);
-};

client/src/Pages/Docker/ContainerDetails/index.tsx

@@ -1,89 +0,0 @@
-// Components
-import { BasePage, Tabs, Tab, DockerStateLabel } from "@/Components/design-elements";
-import { TabOverview } from "@/Pages/Docker/ContainerDetails/TabOverview";
-import { TabLogs } from "@/Pages/Docker/ContainerDetails/TabLogs";
-
-// Hooks
-import { useParams } from "react-router-dom";
-import { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { useGet } from "@/Hooks/UseApi";
-import type { DockerContainerResponse } from "@/Types/Monitor";
-import { DockerContainerStatusBoxes } from "@/Pages/Docker/ContainerDetails/Components/StatBoxes";
-import type { DateRange } from "@/Types/Query";
-import { HeaderTimeRange } from "@/Components/common";
-interface DockerContainerDetailsProps {
-	open?: "overview" | "logs";
-}
-
-const TAB_MAP = {
-	overview: 0,
-	logs: 1,
-} as const;
-
-const DockerDetailsPage = ({ open = "overview" }: DockerContainerDetailsProps) => {
-	const [activeTab, setActiveTab] = useState<number>(TAB_MAP[open]);
-	const [dateRange, setDateRange] = useState<DateRange>("recent");
-	const { monitorId, containerName } = useParams<{
-		monitorId: string;
-		containerName: string;
-	}>();
-	const { t } = useTranslation();
-
-	const containerDetailsUrl = monitorId
-		? `/monitors/docker/details/${monitorId}/containers/${containerName}?dateRange=${dateRange}`
-		: null;
-
-	const { data: containerData } = useGet<DockerContainerResponse>(
-		containerDetailsUrl,
-		{},
-		{ refreshInterval: 10000, keepPreviousData: true }
-	);
-
-	const monitor = containerData?.monitor;
-	if (!monitor) return null;
-
-	const stats = containerData.stats;
-
-	const container = stats?.latest?.container;
-	if (!container) return null;
-
-	const { state, name, image } = container;
-
-	return (
-		<BasePage headerKey="docker.container">
-			<DockerStateLabel
-				state={state}
-				name={name}
-				image={image}
-			/>
-			<DockerContainerStatusBoxes container={container} />
-			<HeaderTimeRange
-				dateRange={dateRange}
-				setDateRange={setDateRange}
-			/>
-			<Tabs
-				value={activeTab}
-				onChange={(_, newValue: number) => setActiveTab(newValue)}
-			>
-				<Tab label={t("pages.docker.container.tabs.overview")} />
-				<Tab label={t("pages.docker.container.tabs.logs")} />
-			</Tabs>
-			{activeTab === 0 && (
-				<TabOverview
-					stats={stats}
-					range={dateRange}
-				/>
-			)}
-			{activeTab === 1 && (
-				<TabLogs
-					monitorId={monitorId}
-					containerName={containerName}
-					enabled={monitor.dockerLogsEnabled ?? false}
-				/>
-			)}
-		</BasePage>
-	);
-};
-
-export default DockerDetailsPage;

client/src/Pages/Docker/HostDetails/Components/DockerContainersTable.tsx

@@ -1,123 +0,0 @@
-import Box from "@mui/material/Box";
-import Typography from "@mui/material/Typography";
-import { DockerStateLabel, Table } from "@/Components/design-elements";
-// Hooks
-import { useTranslation } from "react-i18next";
-import useMediaQuery from "@mui/material/useMediaQuery";
-import { useTheme } from "@mui/material/styles";
-import { useNavigate } from "react-router-dom";
-
-// Types
-import type { Header } from "@/Components/design-elements/Table";
-import type { DockerContainerInfo } from "@/Types/Check";
-
-// Utils
-import { formatPercentage } from "@/Utils/FormatUtils";
-
-interface DockerContainersTableProps {
-	monitorId: string | undefined;
-	containers: DockerContainerInfo[];
-	onRowClick?: (container: DockerContainerInfo) => void;
-}
-
-export const DockerContainersTable = ({
-	monitorId,
-	containers,
-}: DockerContainersTableProps) => {
-	const { t } = useTranslation();
-	const theme = useTheme();
-	const isSmall = useMediaQuery(theme.breakpoints.down("md"));
-	const navigate = useNavigate();
-
-	const getHeaders = () => {
-		// const renderSortIcon = (isActive: boolean) => (
-		// 	<Box
-		// 		width={16}
-		// 		display="inline-flex"
-		// 		justifyContent="center"
-		// 	>
-		// 		{isActive ? (
-		// 			sortOrder === "asc" ? (
-		// 				<ArrowUp size={16} />
-		// 			) : (
-		// 				<ArrowDown size={16} />
-		// 			)
-		// 		) : null}
-		// 	</Box>
-		// );
-		const headers: Header<DockerContainerInfo>[] = [
-			{
-				id: "container",
-				content: t("pages.docker.host.table.headers.container"),
-				render: (row) => {
-					return (
-						<DockerStateLabel
-							state={row.state}
-							name={row.name}
-							image={row.image}
-						/>
-					);
-				},
-			},
-			{
-				id: "status",
-				content: t("common.table.headers.status"),
-				render: (row) => {
-					return <Typography>{row.state}</Typography>;
-				},
-			},
-			{
-				id: "health",
-				content: t("common.labels.health"),
-				render: (row) => {
-					return <Typography>{row.health}</Typography>;
-				},
-			},
-			{
-				id: "cpu",
-				content: t("pages.docker.host.table.headers.cpu"),
-				render: (row) => {
-					return <Typography>{formatPercentage(row.cpuPct ?? 0)}</Typography>;
-				},
-			},
-			{
-				id: "memory",
-				content: t("pages.docker.host.table.headers.memory"),
-				render: (row) => {
-					return <Typography>{formatPercentage(row.memoryPct ?? 0)}</Typography>;
-				},
-			},
-			{
-				id: "restarts",
-				content: t("common.labels.restarts"),
-				render: (row) => {
-					return <Typography>{row.restartCount}</Typography>;
-				},
-			},
-		];
-		return headers;
-	};
-
-	let headers = getHeaders();
-
-	if (isSmall) {
-		headers = headers.filter((h) => h.id !== "histogram");
-	}
-
-	return (
-		<Box>
-			<Table
-				headers={headers}
-				data={containers}
-				onRowClick={(row) => {
-					navigate(`/docker/host/${monitorId}/container/${row.name}`);
-				}}
-				// getRowSx={(row) => ({
-				// 	backgroundColor: isRowSelected(row.id)
-				// 		? theme.palette.action.selected
-				// 		: "inherit",
-				// })}
-			/>
-		</Box>
-	);
-};

client/src/Pages/Docker/HostDetails/Components/StatBoxes.tsx

@@ -1,47 +0,0 @@
-import Stack from "@mui/material/Stack";
-import { StatBox } from "@/Components/design-elements";
-
-// Types
-import type { DockerStats } from "@/Types/Monitor";
-
-// Hooks
-import { useTheme } from "@mui/material";
-import { useTranslation } from "react-i18next";
-
-// Utils
-
-export const DockerStatusBoxes = ({ stats }: { stats: DockerStats | undefined }) => {
-	const { t } = useTranslation();
-	const theme = useTheme();
-
-	if (!stats) return null;
-
-	const { total, running, stopped, unhealthy } = stats.latest?.summary ?? {};
-
-	return (
-		<Stack
-			direction="row"
-			gap={theme.spacing(8)}
-			flexWrap={"wrap"}
-		>
-			<StatBox
-				title={t("pages.docker.host.statBoxes.containers")}
-				subtitle={String(total)}
-			/>
-			<StatBox
-				title={t("pages.docker.host.statBoxes.running")}
-				subtitle={String(running)}
-			/>
-
-			<StatBox
-				title={t("pages.docker.host.statBoxes.stopped")}
-				subtitle={String(stopped)}
-			/>
-
-			<StatBox
-				title={t("pages.docker.host.statBoxes.unhealthy")}
-				subtitle={String(unhealthy)}
-			/>
-		</Stack>
-	);
-};

client/src/Pages/Docker/HostDetails/index.tsx

@@ -1,55 +0,0 @@
-import { BasePage } from "@/Components/design-elements";
-import { HeaderMonitorControls, MonitorStatBoxes } from "@/Components/monitors";
-import { DockerStatusBoxes } from "@/Pages/Docker/HostDetails/Components/StatBoxes";
-
-// Types
-import type { DockerDetailsResponse } from "@/Types/Monitor";
-
-// Hooks
-import { useGet } from "@/Hooks/UseApi";
-import { useIsAdmin } from "@/Hooks/useIsAdmin";
-import { useParams } from "react-router-dom";
-import { DockerContainersTable } from "@/Pages/Docker/HostDetails/Components/DockerContainersTable";
-
-const DockerHostDetailsPage = () => {
-	const { monitorId } = useParams<{ monitorId: string }>();
-	const isAdmin = useIsAdmin();
-
-	// The containers list renders the latest check only, so no date range is
-	// offered; the endpoint's dateRange param only shapes the aggregate buckets.
-	const monitorDetailsUrl = monitorId ? `/monitors/docker/details/${monitorId}` : null;
-
-	const { data: monitorDetailsData, refetch: refetchMonitor } =
-		useGet<DockerDetailsResponse>(
-			monitorDetailsUrl,
-			{},
-			{ refreshInterval: 10000, keepPreviousData: true }
-		);
-
-	const monitor = monitorDetailsData?.monitor;
-	const monitorStats = monitorDetailsData?.monitorStats ?? null;
-	const stats = monitorDetailsData?.stats;
-	const containers = stats?.latest?.containers ?? [];
-
-	return (
-		<BasePage>
-			<HeaderMonitorControls
-				path="docker"
-				monitor={monitor}
-				isAdmin={isAdmin}
-				refetch={refetchMonitor}
-			/>
-			<MonitorStatBoxes
-				monitor={monitor}
-				monitorStats={monitorStats}
-			/>
-			<DockerStatusBoxes stats={stats} />
-			<DockerContainersTable
-				monitorId={monitorId}
-				containers={containers}
-			/>
-		</BasePage>
-	);
-};
-
-export default DockerHostDetailsPage;

client/src/Pages/Docker/Monitors/Components/DockerMonitorsTable.tsx

@@ -1,343 +0,0 @@
-import Box from "@mui/material/Box";
-import Stack from "@mui/material/Stack";
-import Typography from "@mui/material/Typography";
-import {
-	Table,
-	Pagination,
-	StatusLabel,
-	ColoredLabel,
-} from "@/Components/design-elements";
-import { SPACING } from "@/Utils/Theme/constants";
-import type { Header } from "@/Components/design-elements/Table";
-import { ActionsMenu, type ActionMenuItem } from "@/Components/actions-menu";
-import { ArrowUp, ArrowDown } from "lucide-react";
-
-import { useTranslation } from "react-i18next";
-import useMediaQuery from "@mui/material/useMediaQuery";
-import { useTheme } from "@mui/material/styles";
-import { useNavigate } from "react-router-dom";
-import { usePost } from "@/Hooks/UseApi";
-
-import type { Monitor } from "@/Types/Monitor";
-import type { Tag } from "@/Types/Tag";
-import type { DockerContainerSummary } from "@/Types/Check";
-import { Checkbox } from "@/Components/inputs";
-
-const summaryOf = (monitor: Monitor): DockerContainerSummary | undefined => {
-	const recentChecks = monitor.recentChecks ?? [];
-	return recentChecks[recentChecks.length - 1]?.containerSummary;
-};
-
-interface DockerMonitorsTableProps {
-	monitors: Monitor[];
-	tags: Tag[];
-	refetch: () => void;
-	setSelectedMonitor: (monitor: Monitor | null) => void;
-	sortField: string;
-	setSortField: (field: string) => void;
-	sortOrder: "asc" | "desc";
-	setSortOrder: (order: "asc" | "desc") => void;
-	count: number;
-	page: number;
-	setPage: (page: number) => void;
-	rowsPerPage: number;
-	setRowsPerPage: (rowsPerPage: number) => void;
-	selectedRows?: string[];
-	onSelectionChange?: (selected: string[]) => void;
-}
-
-export const DockerMonitorsTable = ({
-	monitors,
-	tags,
-	refetch,
-	setSelectedMonitor,
-	sortField,
-	setSortField,
-	sortOrder,
-	setSortOrder,
-	count,
-	page,
-	setPage,
-	rowsPerPage,
-	setRowsPerPage,
-	selectedRows = [],
-	onSelectionChange,
-}: DockerMonitorsTableProps) => {
-	const { t } = useTranslation();
-	const theme = useTheme();
-	const isSmall = useMediaQuery(theme.breakpoints.down("md"));
-	const navigate = useNavigate();
-	const { post } = usePost<Record<string, never>, Monitor>();
-
-	const selectedSet = new Set(selectedRows);
-	const isAllSelected =
-		monitors.length > 0 && monitors.every((m) => selectedSet.has(m.id));
-	const isSomeSelected = selectedRows.length > 0 && !isAllSelected;
-
-	const handleSelectAll = (checked: boolean) => {
-		onSelectionChange?.(checked ? monitors.map((m) => m.id) : []);
-	};
-
-	const handleSelectRow = (id: string, checked: boolean) => {
-		if (!onSelectionChange) return;
-		onSelectionChange(
-			checked ? [...selectedRows, id] : selectedRows.filter((rowId) => rowId !== id)
-		);
-	};
-
-	const isRowSelected = (id: string) => selectedSet.has(id);
-
-	const handlePageChange = (
-		_e: React.MouseEvent<HTMLButtonElement> | null,
-		newPage: number
-	) => {
-		setPage(newPage);
-	};
-
-	const handleRowsPerPageChange = (
-		e: React.ChangeEvent<HTMLTextAreaElement | HTMLInputElement>
-	) => {
-		const value = Number(e.target.value);
-		setPage(0);
-		setRowsPerPage(value);
-	};
-
-	const handleSort = (e: React.MouseEvent, field: string) => {
-		e.preventDefault();
-		e.stopPropagation();
-		if (sortField === field) {
-			const newOrder = sortOrder === "asc" ? "desc" : "asc";
-			setSortOrder(newOrder);
-		} else {
-			setSortField(field);
-			setSortOrder("asc");
-		}
-		refetch();
-	};
-
-	const getActions = (monitor: Monitor): ActionMenuItem[] => {
-		return [
-			{
-				id: 2,
-				label: t("pages.common.monitors.actions.details"),
-				action: () => {
-					navigate(`${monitor.id}`);
-				},
-			},
-			{
-				id: 3,
-				label: t("pages.common.monitors.actions.incidents"),
-				action: () => {
-					navigate(`/incidents?monitorId=${monitor.id}`);
-				},
-			},
-			{
-				id: 4,
-				label: t("pages.common.monitors.actions.configure"),
-				action: () => {
-					navigate(`/docker/configure/${monitor.id}`);
-				},
-			},
-			{
-				id: 6,
-				label:
-					monitor.isActive === false
-						? t("common.buttons.resume")
-						: t("common.buttons.pause"),
-				action: async () => {
-					await post(`/monitors/pause/${monitor.id}`, {});
-					refetch();
-				},
-				closeMenu: true,
-			},
-			{
-				id: 7,
-				label: (
-					<Typography color={theme.palette.error.main}>
-						{t("common.buttons.delete")}
-					</Typography>
-				),
-				action: () => {
-					setSelectedMonitor(monitor);
-				},
-				closeMenu: true,
-			},
-		];
-	};
-
-	const getHeaders = () => {
-		const renderSortIcon = (isActive: boolean) => (
-			<Box
-				width={16}
-				display="inline-flex"
-				justifyContent="center"
-			>
-				{isActive ? (
-					sortOrder === "asc" ? (
-						<ArrowUp size={16} />
-					) : (
-						<ArrowDown size={16} />
-					)
-				) : null}
-			</Box>
-		);
-		const headers: Header<Monitor>[] = [
-			{
-				id: "selection",
-				content: (
-					<Checkbox
-						aria-label={t("pages.common.monitors.actions.selectAll")}
-						indeterminate={isSomeSelected}
-						checked={isAllSelected}
-						onChange={(e) => handleSelectAll(e.target.checked)}
-					/>
-				),
-				hideMobileLabel: true,
-				render: (row) => (
-					<Checkbox
-						aria-label={t("pages.common.monitors.actions.selectMonitor", {
-							name: row.name,
-						})}
-						checked={isRowSelected(row.id)}
-						onChange={(e) => {
-							handleSelectRow(row.id, e.target.checked);
-						}}
-						onClick={(e) => e.stopPropagation()}
-					/>
-				),
-				onClick: (e) => e?.stopPropagation(),
-			},
-			{
-				id: "name",
-				align: "left",
-				mobileLabel: t("pages.docker.table.headers.host"),
-				content: (
-					<Typography
-						component="div"
-						display="inline-flex"
-						alignItems="center"
-						gap={theme.spacing(4)}
-						onClick={(e) => handleSort(e, "name")}
-						sx={{ cursor: "pointer" }}
-					>
-						{t("pages.docker.table.headers.host")}
-						{renderSortIcon(sortField === "name")}
-					</Typography>
-				),
-				render: (row) => {
-					return (
-						<Stack>
-							<Typography variant="body2">{row.name}</Typography>
-							<Typography
-								variant="caption"
-								color={theme.palette.text.secondary}
-							>
-								{row.url}
-							</Typography>
-						</Stack>
-					);
-				},
-			},
-			{
-				id: "status",
-				mobileLabel: t("common.table.headers.status"),
-				content: (
-					<Stack
-						gap={theme.spacing(4)}
-						direction={"row"}
-						justifyContent={"center"}
-						alignItems={"center"}
-						onClick={(e) => handleSort(e, "status")}
-						sx={{ cursor: "pointer" }}
-					>
-						<Box width={theme.spacing(8)} />
-						{t("common.table.headers.status")}
-						{renderSortIcon(sortField === "status")}
-					</Stack>
-				),
-				render: (row) => {
-					return <StatusLabel status={row.status} />;
-				},
-			},
-			{
-				id: "containers",
-				content: t("pages.docker.table.headers.containers"),
-				render: (row) => {
-					const summary = summaryOf(row);
-					return (
-						<Typography variant="body2">
-							{summary
-								? t("pages.docker.table.containersRunning", {
-										running: summary.running,
-										total: summary.total,
-									})
-								: "—"}
-						</Typography>
-					);
-				},
-			},
-			{
-				id: "tags",
-				content: t("common.table.headers.tags"),
-				render: (row) => {
-					if (row.tags.length === 0) return "-";
-					return (
-						<Stack
-							justifyContent={"center"}
-							direction={isSmall ? "column" : "row"}
-							gap={theme.spacing(SPACING.LG)}
-						>
-							{row.tags.map((tagId) => {
-								const fullTag = tags.find((t) => t.id === tagId);
-								if (!fullTag) return null;
-								return (
-									<ColoredLabel
-										key={fullTag.id}
-										text={fullTag.name}
-										color={fullTag.color}
-									/>
-								);
-							})}
-						</Stack>
-					);
-				},
-			},
-
-			{
-				id: "actions",
-				content: t("common.table.headers.actions"),
-				render: (row) => {
-					return <ActionsMenu items={getActions(row)} />;
-				},
-			},
-		];
-		return headers;
-	};
-
-	let headers = getHeaders();
-
-	if (isSmall) {
-		headers = headers.filter((h) => h.id !== "histogram");
-	}
-	return (
-		<Box>
-			<Table
-				headers={headers}
-				data={monitors}
-				onRowClick={(row) => {
-					navigate(`/docker/host/${row.id}`);
-				}}
-				isRowSelected={(row) => isRowSelected(row.id)}
-			/>
-			<Pagination
-				component="div"
-				count={count}
-				page={page}
-				rowsPerPage={rowsPerPage}
-				onPageChange={handlePageChange}
-				onRowsPerPageChange={handleRowsPerPageChange}
-				itemsOnPage={monitors.length}
-			/>
-		</Box>
-	);
-};

client/src/Pages/Docker/Monitors/index.tsx

@@ -1,44 +0,0 @@
-import { MonitorListPage } from "@/Components/monitors";
-import { DockerMonitorsTable } from "@/Pages/Docker/Monitors/Components/DockerMonitorsTable";
-import { useMonitorListController } from "@/Hooks/useMonitorListController";
-
-const DockerMonitorsPage = () => {
-	const c = useMonitorListController({
-		types: ["docker"],
-		checksLimit: 25,
-		refreshInterval: 5000,
-		rowsPerPageTable: "docker",
-		rowsPerPageDefault: 10,
-	});
-
-	return (
-		<MonitorListPage
-			headerKey="docker"
-			page="docker"
-			actionLink="/docker/create"
-			controller={c}
-			bulkActions
-			showTypeFilter={false}
-		>
-			<DockerMonitorsTable
-				monitors={c.monitors || []}
-				tags={c.tags || []}
-				refetch={c.refetch}
-				setSelectedMonitor={c.setSelectedMonitor}
-				count={c.count || 0}
-				page={c.page}
-				setPage={c.setPage}
-				rowsPerPage={c.rowsPerPage}
-				sortField={c.sortField}
-				setSortField={c.setSortField}
-				sortOrder={c.sortOrder}
-				setSortOrder={c.setSortOrder}
-				setRowsPerPage={c.handleSetRowsPerPage}
-				selectedRows={c.selectedRows}
-				onSelectionChange={c.setSelectedRows}
-			/>
-		</MonitorListPage>
-	);
-};
-
-export default DockerMonitorsPage;

client/src/Pages/Incidents/Components/CardSummary.tsx

@@ -30,7 +30,6 @@ const SummaryItem = ({ icon, label, value }: SummaryItemProps) => {
 				direction="row"
 				alignItems="center"
 				gap={theme.spacing(2)}
-				sx={{ "& svg": { color: theme.palette.text.secondary } }}
 			>
 				{icon}
 				<Typography variant="body1">{label}</Typography>
@@ -144,10 +143,7 @@ const SummaryIncidentItem = ({ incident }: { incident: IncidentSummaryItem }) =>
 					gap: theme.spacing(2),
 				}}
 			>
-				<Icon
-					icon={Globe}
-					color={theme.palette.text.secondary}
-				/>
+				<Icon icon={Globe} />
 				<Typography
 					variant="body1"
 					fontWeight={500}

client/src/Pages/Incidents/index.tsx

@@ -20,7 +20,6 @@ import { useState, useEffect, useMemo } from "react";
 import { useParams } from "react-router-dom";
 import type { Incident, IncidentsResponse, IncidentSummary } from "@/Types/Incident";
 import type { Monitor } from "@/Types/Monitor";
-import type { DateRange } from "@/Types/Query";
 import { useTheme } from "@mui/material";
 
 const IncidentsPage = () => {
@@ -31,7 +30,7 @@ const IncidentsPage = () => {
 	// Filter state
 	const [selectedMonitor, setSelectedMonitor] = useState(monitorId || "0");
 	const [filter, setFilter] = useState("all");
-	const [dateRange, setDateRange] = useState<DateRange>("recent");
+	const [dateRange, setDateRange] = useState("recent");
 	const [page, setPage] = useState(0);
 	const [rowsPerPage, setRowsPerPage] = useState(10);
 	const [activeIncidentsPage, setActiveIncidentsPage] = useState(0);

client/src/Pages/Infrastructure/Details/Components/Charts.tsx

@@ -12,7 +12,7 @@ const formatTemp = (value: number) => `${value.toFixed(0)}°C`;
 const getChartConfigs = (theme: any, checks: HardwareCheckStats[], t: any) => {
 	return [
 		{
-			title: t("common.charts.labels.memoryUsage"),
+			title: t("pages.infrastructure.charts.labels.memory"),
 			type: "memory",
 			dataKeys: ["avgMemoryUsage"],
 			strokeColor: theme.palette.primary.main,
@@ -22,7 +22,7 @@ const getChartConfigs = (theme: any, checks: HardwareCheckStats[], t: any) => {
 			idx: null,
 		},
 		{
-			title: t("common.charts.labels.cpuUsage"),
+			title: t("pages.infrastructure.charts.labels.cpu"),
 			type: "cpu",
 			dataKeys: ["avgCpuUsage"],
 			strokeColor: theme.palette.success.main,

client/src/Pages/Infrastructure/Details/Components/ChartsNetwork.tsx

@@ -63,42 +63,19 @@ const getChartConfigs = (
 	return configs;
 };
 
-// Loopback / bridge names Capture reports when it can only observe the
-// container's own network namespace.
+// Loopback / bridge names Capture sees when it can only observe the container's
+// own network namespace. When ALL reported interfaces match this set we assume
+// the "no real interfaces visible" case and surface the notice.
 const CONTAINER_ONLY_IFACE_NAMES = new Set(["lo", "lo0", "docker0"]);
 
-// Below this, an interface is carrying no traffic worth charting. Real host
-// NICs sit orders of magnitude above it; a container's veth sits at or near
-// zero.
-const IDLE_INTERFACE_BYTES_PER_SECOND = 1024;
-
-const interfaceIsIdle = (checks: HardwareCheckStats[], name: string): boolean =>
-	checks.every((check) => {
-		const iface = check.net?.find((candidate) => candidate.name === name);
-		if (!iface) {
-			return true;
-		}
-		return (
-			(iface.bytesSentPerSecond || 0) < IDLE_INTERFACE_BYTES_PER_SECOND &&
-			(iface.deltaBytesRecv || 0) < IDLE_INTERFACE_BYTES_PER_SECOND
-		);
-	});
-
 const onlyContainerVisibleInterfaces = (checks: HardwareCheckStats[]): boolean => {
 	const named = new Set<string>();
 	checks.forEach((c) => c.net?.forEach((iface) => named.add(iface.name)));
-	if (named.size === 0) {
-		return false;
+	if (named.size === 0) return false;
+	for (const name of named) {
+		if (!CONTAINER_ONLY_IFACE_NAMES.has(name)) return false;
 	}
-
-	const names = [...named];
-	if (names.every((name) => CONTAINER_ONLY_IFACE_NAMES.has(name))) {
-		return true;
-	}
-	if (!names.some((name) => CONTAINER_ONLY_IFACE_NAMES.has(name))) {
-		return false;
-	}
-	return names.every((name) => interfaceIsIdle(checks, name));
+	return true;
 };
 
 export const InfraNetworkCharts = ({

client/src/Pages/Infrastructure/Details/Components/Gauges.tsx

@@ -8,8 +8,6 @@ import { useTheme } from "@mui/material";
 import useMediaQuery from "@mui/material/useMediaQuery";
 import type { CheckSnapshot } from "@/Types/Check";
 
-const GAUGE_MAX_WIDTH = 260;
-
 export const InfraDetailsGauges = ({
 	snapshot,
 }: {
@@ -28,42 +26,37 @@ export const InfraDetailsGauges = ({
 			direction={isSmall ? "column" : "row"}
 			spacing={theme.spacing(8)}
 			alignItems={"stretch"}
-			flexWrap={"wrap"}
-			useFlexGap
 		>
 			<DetailGauge
 				title={t("pages.infrastructure.gauges.memory.title")}
-				maxWidth={GAUGE_MAX_WIDTH}
+				maxWidth={260}
 				progress={(snapshot?.memory?.usage_percent || 0) * 100}
 				upperLabel={t("pages.infrastructure.gauges.memory.upperLabel")}
 				upperValue={prettyBytes(snapshot?.memory?.used_bytes || 0)}
 				lowerLabel={t("pages.infrastructure.gauges.memory.lowerLabel")}
 				lowerValue={prettyBytes(snapshot?.memory?.total_bytes || 0)}
-				flexBasis={isSmall ? "auto" : GAUGE_MAX_WIDTH}
 			/>
 			<DetailGauge
 				title={t("pages.infrastructure.gauges.cpu.title")}
-				maxWidth={GAUGE_MAX_WIDTH}
+				maxWidth={260}
 				progress={(snapshot?.cpu?.usage_percent || 0) * 100}
 				upperLabel={t("pages.infrastructure.gauges.cpu.upperLabel")}
 				upperValue={getFrequency(snapshot?.cpu?.current_frequency || 0)}
 				lowerLabel={t("pages.infrastructure.gauges.cpu.lowerLabel")}
 				lowerValue={getFrequency(snapshot?.cpu?.frequency || 0)}
-				flexBasis={isSmall ? "auto" : GAUGE_MAX_WIDTH}
 			/>
 			{snapshot?.disk?.map((disk, idx) => {
 				return (
 					<DetailGauge
-						key={disk?.device || `disk-${idx}`}
+						key={disk?.device || 0 + idx}
 						// title={`Disk ${idx} usage`}
 						title={t("pages.infrastructure.gauges.disk.title", { idx })}
-						maxWidth={GAUGE_MAX_WIDTH}
+						maxWidth={260}
 						progress={(disk.usage_percent || 0) * 100}
 						upperLabel={t("pages.infrastructure.gauges.disk.upperLabel")}
 						upperValue={prettyBytes(disk?.used_bytes || 0)}
 						lowerLabel={t("pages.infrastructure.gauges.disk.lowerLabel")}
 						lowerValue={prettyBytes(disk?.total_bytes || 0)}
-						flexBasis={isSmall ? "auto" : GAUGE_MAX_WIDTH}
 					/>
 				);
 			})}

client/src/Pages/Infrastructure/Details/index.tsx

@@ -10,7 +10,6 @@ import { useGet } from "@/Hooks/UseApi";
 import type { HardwareDetailsResponse } from "@/Types/Monitor";
 import { useIsAdmin } from "@/Hooks/useIsAdmin";
 import { useTranslation } from "react-i18next";
-import type { DateRange } from "@/Types/Query";
 
 const InfrastructureDetails = () => {
 	const { t } = useTranslation();
@@ -18,7 +17,7 @@ const InfrastructureDetails = () => {
 
 	const { monitorId } = useParams<{ monitorId: string }>();
 
-	const [dateRange, setDateRange] = useState<DateRange>("recent");
+	const [dateRange, setDateRange] = useState<string>("recent");
 	const [selectedTab, setSelectedTab] = useState<number>(0);
 
 	const monitorDetailsUrl = useMemo(() => {

client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable.tsx

@@ -331,7 +331,11 @@ export const InfraMonitorsTable = ({
 				onRowClick={(row) => {
 					navigate(`/infrastructure/${row.id}`);
 				}}
-				isRowSelected={(row) => isRowSelected(row.id)}
+				getRowSx={(row) => ({
+					backgroundColor: isRowSelected(row.id)
+						? theme.palette.action.selected
+						: "inherit",
+				})}
 			/>
 			<Pagination
 				component="div"

client/src/Pages/Maintenance/create/index.tsx

@@ -1,8 +1,7 @@
 import Stack from "@mui/material/Stack";
-import Typography from "@mui/material/Typography";
 import { logger } from "@/Utils/logger";
 import { SPACING, LAYOUT } from "@/Utils/Theme/constants";
-import { BasePage, ColoredLabel, ConfigBox } from "@/Components/design-elements";
+import { BasePage, ConfigBox } from "@/Components/design-elements";
 import { Button } from "@/Components/inputs";
 
 import { useTheme } from "@mui/material";
@@ -16,7 +15,6 @@ import { useGet, usePost, usePatch } from "@/Hooks/UseApi";
 import { mutate } from "swr";
 import { useParams, useNavigate } from "react-router-dom";
 import type { Monitor } from "@/Types/Monitor";
-import type { Tag } from "@/Types/Tag";
 import { useForm, FormProvider } from "react-hook-form";
 import { useEffect } from "react";
 import { zodResolver } from "@hookform/resolvers/zod/dist/zod.js";
@@ -43,7 +41,6 @@ const CreateMaintenanceWindowPage = () => {
 	);
 
 	const { data: monitors } = useGet<Monitor[]>("/monitors/team");
-	const { data: tags } = useGet<Tag[]>("/tags/team");
 
 	const { post, loading: isPosting } = usePost();
 	const { patch, loading: isPatching } = usePatch();
@@ -206,26 +203,6 @@ const CreateMaintenanceWindowPage = () => {
 								"pages.maintenanceWindow.form.startTime.monitors.option.addMonitors.label"
 							)}
 							options={monitors ?? []}
-							renderOptionContent={(monitor) => (
-								<Stack
-									direction="row"
-									alignItems="center"
-									gap={theme.spacing(2)}
-									flexWrap="wrap"
-								>
-									<Typography>{monitor.name}</Typography>
-									{monitor.tags.map((tagId) => {
-										const tag = tags?.find(({ id }) => id === tagId);
-										return tag ? (
-											<ColoredLabel
-												key={tag.id}
-												text={tag.name}
-												color={tag.color}
-											/>
-										) : null;
-									})}
-								</Stack>
-							)}
 						/>
 					}
 				/>

client/src/Pages/NotFound/index.tsx

@@ -1,4 +1,4 @@
-import NotFoundSvg from "@/assets/Images/sushi_404.svg?react";
+import NotFoundSvg from "@/assets/Images/sushi_404.svg";
 import { Button } from "@/Components/inputs";
 import Box from "@mui/material/Box";
 import Stack from "@mui/material/Stack";
@@ -36,11 +36,10 @@ const NotFoundPage = ({ title, desc }: NotFoundProps) => {
 				alignItems="center"
 			>
 				<Box
-					component={NotFoundSvg}
-					role="img"
-					aria-label="404"
-					width="100%"
-					maxHeight="25rem"
+					component="img"
+					src={NotFoundSvg}
+					alt="404"
+					maxHeight={"25rem"}
 				/>
 				<Typography
 					component="h1"

client/src/Pages/Notifications/create/index.tsx

@@ -126,7 +126,6 @@ const NotificationsCreatePage = () => {
 				{watchedType !== "matrix" &&
 					watchedType !== "telegram" &&
 					watchedType !== "pushover" &&
-					watchedType !== "signalgrid" &&
 					watchedType !== "twilio" &&
 					watchedType !== "ntfy" && (
 						<ConfigBox
@@ -202,31 +201,6 @@ const NotificationsCreatePage = () => {
 						}
 					/>
 				)}
-				{watchedType === "signalgrid" && (
-					<ConfigBox
-						title={t("pages.notifications.form.signalgrid.title")}
-						subtitle={t("pages.notifications.form.signalgrid.description")}
-						rightContent={
-							<Stack spacing={theme.spacing(8)}>
-								<FormTextField
-									name="accessToken"
-									fieldLabel={t("pages.notifications.form.signalgrid.optionClientKey")}
-									placeholder={t(
-										"pages.notifications.form.signalgrid.placeholderClientKey"
-									)}
-								/>
-
-								<FormTextField
-									name="address"
-									fieldLabel={t("pages.notifications.form.signalgrid.optionChannel")}
-									placeholder={t(
-										"pages.notifications.form.signalgrid.placeholderChannel"
-									)}
-								/>
-							</Stack>
-						}
-					/>
-				)}
 				{watchedType === "twilio" && (
 					<ConfigBox
 						title={t("pages.notifications.form.twilio.title")}

client/src/Pages/PageSpeed/Details/index.tsx

@@ -15,13 +15,12 @@ import { useGet } from "@/Hooks/UseApi";
 import { useParams } from "react-router-dom";
 import { useTheme } from "@mui/material";
 import { useState, useMemo } from "react";
-import type { DateRange } from "@/Types/Query";
 
 const PageSpeedDetails = () => {
 	const { monitorId } = useParams();
 	const isAdmin = useIsAdmin();
 	const theme = useTheme();
-	const [dateRange, setDateRange] = useState<DateRange>("day");
+	const [dateRange, setDateRange] = useState<string>("day");
 
 	const monitorDetailsUrl = useMemo(() => {
 		if (!monitorId) {

client/src/Pages/StatusPage/Create/Components/HeaderConfigStatusControls.tsx

@@ -25,12 +25,7 @@ export const HeaderConfigStatusControls = ({
 			<Button
 				variant="contained"
 				color="error"
-				startIcon={
-					<Icon
-						icon={Trash}
-						size={16}
-					/>
-				}
+				startIcon={<Icon icon={Trash} />}
 				onClick={onDelete}
 			>
 				{translate.t("common.buttons.delete")}

client/src/Pages/StatusPage/Status/Components/HeaderStatusPageControls.tsx

@@ -77,12 +77,7 @@ export const HeaderStatusPageControls = ({
 				<Button
 					variant="contained"
 					color="secondary"
-					startIcon={
-						<Icon
-							icon={Settings}
-							size={16}
-						/>
-					}
+					startIcon={<Icon icon={Settings} />}
 					onClick={() => navigate(`/status/configure/${statusPage.url}`)}
 				>
 					{t("common.buttons.configure")}

client/src/Pages/StatusPage/Status/themes/shared/BaseStatusPage.tsx

@@ -211,7 +211,6 @@ export const BaseStatusPage = ({
 							>
 								<Icon
 									icon={TriangleAlert}
-									size={20}
 									color={theme.palette.warning.main}
 								/>
 								<Typography>

client/src/Pages/StatusPage/Status/themes/shared/fontStacks.ts

@@ -1,5 +1,5 @@
 export const SANS_STACK =
-	'-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif';
+	'-apple-system, BlinkMacSystemFont, "Inter", "Segoe UI", Roboto, sans-serif';
 
 export const BOLD_SANS_STACK = `ui-sans-serif, ${SANS_STACK}`;
 

client/src/Pages/Uptime/Details/index.tsx

@@ -31,7 +31,6 @@ import type { RootState } from "@/Types/state";
 import { formatDateWithTz } from "@/Utils/TimeUtils";
 import { t } from "i18next";
 import { Typography } from "@mui/material";
-import type { DateRange } from "@/Types/Query";
 
 const certificateDateFormat = "MMM D, YYYY h A";
 
@@ -54,7 +53,7 @@ const UptimeDetailsPage = () => {
 	const [rowsPerPage, setRowsPerPage] = useState<number>(5);
 	const [geoPage, setGeoPage] = useState<number>(0);
 	const [geoRowsPerPage, setGeoRowsPerPage] = useState<number>(5);
-	const [dateRange, setDateRange] = useState<DateRange>("recent");
+	const [dateRange, setDateRange] = useState<string>("recent");
 	const [selectedLocation, setSelectedLocation] = useState<GeoContinent>("NA");
 
 	const monitorDetailsUrl = useMemo(() => {

client/src/Pages/Uptime/Monitors/Components/UptimeMonitorsTable.tsx

@@ -350,7 +350,11 @@ export const MonitorTable = ({
 				onRowClick={(row) => {
 					navigate(`/uptime/${row.id}`);
 				}}
-				isRowSelected={(row) => isRowSelected(row.id)}
+				getRowSx={(row) => ({
+					backgroundColor: isRowSelected(row.id)
+						? theme.palette.action.selected
+						: "inherit",
+				})}
 			/>
 			<Pagination
 				component="div"

client/src/Pages/Uptime/Monitors/index.tsx

@@ -4,7 +4,7 @@ import { MonitorTable } from "@/Pages/Uptime/Monitors/Components/UptimeMonitorsT
 import { useMonitorListController } from "@/Hooks/useMonitorListController";
 
 const UptimeMonitorsPage = () => {
-	const monitorListController = useMonitorListController({
+	const c = useMonitorListController({
 		types: "selectable",
 		checksLimit: 25,
 		refreshInterval: 5000,
@@ -17,25 +17,25 @@ const UptimeMonitorsPage = () => {
 			headerKey="uptime"
 			page="uptime"
 			actionLink="/uptime/create"
-			controller={monitorListController}
+			controller={c}
 			bulkActions
 		>
 			<MonitorTable
-				monitors={monitorListController.monitors || []}
-				tags={monitorListController.tags || []}
-				refetch={monitorListController.refetch}
-				setSelectedMonitor={monitorListController.setSelectedMonitor}
-				count={monitorListController.count || 0}
-				page={monitorListController.page}
-				setPage={monitorListController.setPage}
-				rowsPerPage={monitorListController.rowsPerPage}
-				sortField={monitorListController.sortField}
-				setSortField={monitorListController.setSortField}
-				sortOrder={monitorListController.sortOrder}
-				setSortOrder={monitorListController.setSortOrder}
-				setRowsPerPage={monitorListController.handleSetRowsPerPage}
-				selectedRows={monitorListController.selectedRows}
-				onSelectionChange={monitorListController.setSelectedRows}
+				monitors={c.monitors || []}
+				tags={c.tags || []}
+				refetch={c.refetch}
+				setSelectedMonitor={c.setSelectedMonitor}
+				count={c.count || 0}
+				page={c.page}
+				setPage={c.setPage}
+				rowsPerPage={c.rowsPerPage}
+				sortField={c.sortField}
+				setSortField={c.setSortField}
+				sortOrder={c.sortOrder}
+				setSortOrder={c.setSortOrder}
+				setRowsPerPage={c.handleSetRowsPerPage}
+				selectedRows={c.selectedRows}
+				onSelectionChange={c.setSelectedRows}
 			/>
 		</MonitorListPage>
 	);

client/src/Routes/index.tsx

@@ -20,11 +20,6 @@ import PageSpeedDetails from "@/Pages/PageSpeed/Details/";
 import Infrastructure from "@/Pages/Infrastructure/Monitors";
 import InfrastructureDetails from "@/Pages/Infrastructure/Details";
 
-// Docker
-import Docker from "@/Pages/Docker/Monitors";
-import DockerHostDetails from "@/Pages/Docker/HostDetails";
-import DockerDetails from "@/Pages/Docker/ContainerDetails";
-
 // Checks
 import Checks from "@/Pages/Checks";
 
@@ -144,26 +139,6 @@ const Routes = () => {
 					path="infrastructure/:monitorId"
 					element={<InfrastructureDetails />}
 				/>
-				<Route
-					path="docker"
-					element={<Docker />}
-				/>
-				<Route
-					path="docker/create"
-					element={<CreateMonitor />}
-				/>
-				<Route
-					path="/docker/configure/:monitorId"
-					element={<CreateMonitor />}
-				/>
-				<Route
-					path="docker/host/:monitorId/container/:containerName"
-					element={<DockerDetails />}
-				/>
-				<Route
-					path="docker/host/:monitorId"
-					element={<DockerHostDetails />}
-				/>
 				<Route
 					path="checks/:monitorId?"
 					element={<Checks />}

client/src/Types/Check.ts

@@ -119,90 +119,6 @@ export interface CheckTimings {
 	};
 }
 
-// Mirrors DockerContainerSummary in server/src/types/network.ts.
-export interface DockerContainerSummary {
-	total: number;
-	running: number;
-	stopped: number;
-	unhealthy: number;
-}
-
-// Mirrors DockerContainerStates in server/src/types/network.ts.
-export const DockerContainerStates = [
-	"created",
-	"running",
-	"paused",
-	"restarting",
-	"removing",
-	"exited",
-	"dead",
-] as const;
-export type DockerContainerState = (typeof DockerContainerStates)[number];
-
-export const DockerHealthStatuses = ["healthy", "unhealthy", "starting", "none"] as const;
-export type DockerHealthStatus = (typeof DockerHealthStatuses)[number];
-
-export const DockerPortProtocols = ["tcp", "udp", "sctp"] as const;
-export type DockerPortProtocol = (typeof DockerPortProtocols)[number];
-
-export interface DockerContainerPort {
-	privatePort: number;
-	protocol: DockerPortProtocol;
-	publicPort?: number;
-	hostIp?: string;
-}
-
-export interface DockerContainerMount {
-	type: string;
-	name?: string;
-	source: string;
-	destination: string;
-	mode: string;
-	rw: boolean;
-}
-
-export const DockerLogStreams = ["stdout", "stderr"] as const;
-export type DockerLogStream = (typeof DockerLogStreams)[number];
-
-export interface DockerLogLine {
-	ts: string;
-	stream: DockerLogStream;
-	text: string;
-}
-
-export interface DockerLog {
-	id: string;
-	metadata: {
-		monitorId: string;
-		teamId: string;
-		containerId: string;
-		containerName: string;
-	};
-	lines: DockerLogLine[];
-	gap: boolean;
-	checkedAt: string;
-	expiry: string;
-	createdAt: string;
-	updatedAt: string;
-}
-
-export interface DockerContainerInfo {
-	id: string;
-	name: string;
-	image: string;
-	state: DockerContainerState;
-	status: string;
-	health: DockerHealthStatus;
-	cpuPct?: number;
-	memoryUsedBytes?: number;
-	memoryLimitBytes?: number;
-	memoryPct?: number;
-	restartCount?: number;
-	startedAt?: string;
-	ports?: DockerContainerPort[];
-	mounts?: DockerContainerMount[];
-}
-
 export interface Check {
 	id: string;
 	metadata: CheckMetadata;
@@ -217,7 +133,6 @@ export interface Check {
 	host?: CheckHostInfo;
 	errors?: CheckErrorInfo[];
 	capture?: CheckCaptureInfo;
-	containerSummary?: DockerContainerSummary;
 	net?: CheckNetworkInterfaceInfo[];
 	accessibility?: number;
 	bestPractices?: number;
@@ -372,7 +287,6 @@ export type CheckSnapshot = Pick<
 	memory?: SnapshotMemoryInfo;
 	disk?: SnapshotDiskInfo[];
 	host?: SnapshotHostInfo;
-	containerSummary?: DockerContainerSummary;
 };
 export interface HasResponseTime {
 	responseTime: number;

client/src/Types/Monitor.ts

@@ -3,9 +3,6 @@ import type {
 	CheckSnapshot,
 	GroupedUptimeCheck,
 	DailyCheckBucket,
-	DockerContainerInfo,
-	DockerContainerSummary,
-	DockerLog,
 } from "@/Types/Check";
 import type { PageSpeedGroupedCheck } from "@/Types/Check";
 import type { GeoContinent } from "@/Types/GeoCheck";
@@ -33,6 +30,7 @@ export type MonitorType = (typeof MonitorTypes)[number];
 export const SelectableMonitorTypes = [
 	"http",
 	"ping",
+	"docker",
 	"port",
 	"game",
 	"grpc",
@@ -159,10 +157,6 @@ export interface Monitor {
 	geoCheckEnabled?: boolean;
 	geoCheckLocations?: GeoContinent[];
 	geoCheckInterval?: number;
-	dockerLogsEnabled?: boolean;
-	dockerTlsCa?: string;
-	dockerTlsCert?: string;
-	dockerTlsKeySet?: boolean;
 	dnsServer?: string;
 	dnsRecordType?: DnsRecordType;
 	recentChecks: CheckSnapshot[];
@@ -275,62 +269,6 @@ export interface HardwareDetailsResponse {
 	monitorStats: MonitorStats | null;
 }
 
-export interface DockerStatsBucket {
-	_id: string;
-	avgResponseTime: number | null;
-	upCount: number;
-	totalCount: number;
-	avgRunning: number | null;
-	avgTotal: number | null;
-	avgUnhealthy: number | null;
-}
-
-export interface DockerStats {
-	aggregateData: {
-		totalChecks: number;
-	};
-	upChecks: {
-		totalChecks: number;
-	};
-	aggregate: DockerStatsBucket[];
-	latest: {
-		containers: DockerContainerInfo[];
-		summary?: DockerContainerSummary;
-		checkedAt: string;
-	} | null;
-}
-
-export interface DockerDetailsResponse {
-	monitor: Monitor;
-	stats: DockerStats;
-	monitorStats: MonitorStats | null;
-}
-export interface DockerContainerStatsBucket {
-	_id: string;
-	avgCpuPct: number | null;
-	avgMemoryUsedBytes: number | null;
-	avgMemoryPct: number | null;
-	minRestartCount: number | null;
-	maxRestartCount: number | null;
-}
-
-export interface DockerContainerStats {
-	aggregate: DockerContainerStatsBucket[];
-	restartsInRange: number;
-	latest: {
-		container: DockerContainerInfo;
-		checkedAt: string;
-	} | null;
-}
-export interface DockerContainerResponse {
-	monitor: Monitor;
-	stats: DockerContainerStats;
-}
-
-export interface DockerContainerLogsResponse {
-	logs: DockerLog[];
-	nextCursor: string | null;
-}
 export interface Game {
 	name: string;
 	options?: {

client/src/Types/Notification.ts

@@ -9,7 +9,6 @@ export const NotificationChannels = [
 	"teams",
 	"telegram",
 	"pushover",
-	"signalgrid",
 	"twilio",
 	"ntfy",
 ] as const;

client/src/Types/Query.ts

@@ -1,2 +0,0 @@
-export const DateRanges = ["recent", "hour", "day", "week", "month", "all"] as const;
-export type DateRange = (typeof DateRanges)[number];

client/src/Utils/MonitorUtils.ts

@@ -1,14 +1,6 @@
 import type { MonitorStatus, MonitorType } from "@/Types/Monitor";
 import type { PaletteKey } from "@/Utils/Theme/Theme";
 import type { ValueType } from "@/Components/design-elements/StatusLabel";
-import {
-	DockerLogStreams,
-	type DockerContainerMount,
-	type DockerContainerPort,
-	type DockerContainerState,
-	type DockerLog,
-	type DockerLogLine,
-} from "@/Types/Check";
 
 export const getMonitorPath = (type: MonitorType): string => {
 	const pathMap: Record<MonitorType, string> = {
@@ -20,7 +12,7 @@ export const getMonitorPath = (type: MonitorType): string => {
 		websocket: "uptime",
 		dns: "uptime",
 		unknown: "uptime",
-		docker: "docker",
+		docker: "uptime",
 		hardware: "infrastructure",
 		pagespeed: "pagespeed",
 	};
@@ -40,14 +32,6 @@ export const getStatusPalette = (status: MonitorStatus): PaletteKey => {
 	return "warning";
 };
 
-export const getDockerPalette = (dockerState: DockerContainerState): PaletteKey => {
-	if (dockerState === "created") return "success";
-	if (dockerState === "running") return "success";
-	if (dockerState === "dead") return "error";
-	if (dockerState === "exited") return "error";
-	return "warning";
-};
-
 export const getValuePalette = (value: ValueType): PaletteKey => {
 	const paletteMap: Record<ValueType, PaletteKey> = {
 		positive: "success",
@@ -57,19 +41,6 @@ export const getValuePalette = (value: ValueType): PaletteKey => {
 	return paletteMap[value];
 };
 
-export const getDockerStatePalette = (state: DockerContainerState): PaletteKey => {
-	const paletteMap: Record<DockerContainerState, PaletteKey> = {
-		paused: "warning",
-		created: "warning",
-		running: "success",
-		restarting: "warning",
-		removing: "warning",
-		exited: "error",
-		dead: "error",
-	};
-	return paletteMap[state];
-};
-
 export const getStatusColor = (status: MonitorStatus, theme: any): string => {
 	if (status === "up") {
 		return theme.palette.success.light;
@@ -126,64 +97,3 @@ export const formatUrl = (url: string, maxLength: number = 55) => {
 		? `${strippedUrl.slice(0, maxLength)}…`
 		: strippedUrl;
 };
-
-export const dedupeDockerPorts = (
-	ports: DockerContainerPort[]
-): DockerContainerPort[] => {
-	return ports.filter((port) => {
-		// Discard ipv6 wildcards
-		if (port.hostIp !== "::") return port;
-
-		const isDuplicate = ports.some((otherPort) => {
-			if (otherPort.hostIp !== "0.0.0.0") return false;
-
-			return (
-				otherPort.privatePort === port.privatePort &&
-				otherPort.protocol === port.protocol &&
-				otherPort.publicPort === port.publicPort
-			);
-		});
-		return !isDuplicate;
-	});
-};
-
-const isAnonymousVolumeName = (name: string): boolean => /^[0-9a-f]{64}$/.test(name);
-
-export const getDockerMountLabel = (mount: DockerContainerMount) => {
-	if (mount.type === "volume" && mount.name)
-		return isAnonymousVolumeName(mount.name) ? mount.name.slice(0, 12) : mount.name;
-	if (mount.source) return mount.source;
-	return mount.type;
-};
-
-export const DockerLogStreamFilters = ["all", ...DockerLogStreams] as const;
-export type DockerLogStreamFilter = (typeof DockerLogStreamFilters)[number];
-
-export interface DockerLogRow extends DockerLogLine {
-	key: string;
-	gapBefore: boolean; // This signifies lines skipped
-}
-
-export const flattenDockerLogs = (logs: DockerLog[]): DockerLogRow[] => {
-	const rows: DockerLogRow[] = [];
-	for (const log of [...logs].reverse()) {
-		log.lines.forEach((line: DockerLogLine, idx: number) => {
-			rows.push({ ...line, key: `${log.id}:${idx}`, gapBefore: idx === 0 && log.gap });
-		});
-	}
-	return rows;
-};
-
-export const filterDockerLogRows = (
-	rows: DockerLogRow[],
-	stream: DockerLogStreamFilter,
-	query: string
-): DockerLogRow[] => {
-	const normalizedQuery = query.trim().toLowerCase();
-	return rows.filter((row) => {
-		return (
-			(stream === "all" || row.stream === stream) &&
-			(normalizedQuery === "" || row.text.toLowerCase().includes(normalizedQuery))
-		);
-	});
-};

client/src/Utils/Theme/Palette.ts

@@ -1,5 +1,4 @@
 import { alpha } from "@mui/material/styles";
-import { HOVER } from "@/Utils/Theme/constants";
 
 const typographyBase = 13;
 
@@ -18,20 +17,6 @@ export const colors = {
 	gray700: "#313131",
 	gray900: "#151518",
 	gray850: "#1c1c21",
-	ink900: "#101917",
-	ink600: "#55635C",
-	ink400: "#7C8983",
-	surface50: "#F6F8F7",
-	rule200: "#C7D2CC",
-	successMain: "#0D6049",
-	errorMain: "#A02B24",
-	warningMain: "#8C5806",
-	inkDark900: "#ECEFED",
-	inkDark600: "#A3ADA8",
-	ruleDark: "#3A4642",
-	successDark: "#4BC49E",
-	errorDark: "#E8837A",
-	warningDark: "#E0A458",
 	brandGreen: "#13715B",
 	brandGreenLight: "#4DAF94",
 	green200: "#ECF7F2",
@@ -54,34 +39,9 @@ export const lightPalette = {
 	primary: {
 		main: colors.brandGreen,
 	},
-	action: {
-		rowHover: alpha(colors.gray900, HOVER.ROW),
-		controlHover: alpha(colors.gray900, HOVER.CONTROL),
-		selected: alpha(colors.brandGreen, 0.06),
-		selectedHover: alpha(colors.brandGreen, 0.1),
-	},
 	secondary: {
 		main: colors.gray200,
 	},
-	background: {
-		default: colors.surface50,
-		paper: "#FFFFFF",
-	},
-	text: {
-		primary: colors.ink900,
-		secondary: colors.ink600,
-		disabled: colors.ink400,
-	},
-	divider: colors.rule200,
-	success: {
-		main: colors.successMain,
-	},
-	error: {
-		main: colors.errorMain,
-	},
-	warning: {
-		main: colors.warningMain,
-	},
 	sidebar: {
 		accent: colors.brandGreen,
 	},
@@ -104,13 +64,6 @@ export const lightPalette = {
 export const darkPalette = {
 	primary: {
 		main: colors.brandGreen,
-		light: colors.brandGreenLight,
-	},
-	action: {
-		rowHover: alpha("#FFFFFF", HOVER.ROW),
-		controlHover: alpha("#FFFFFF", HOVER.CONTROL),
-		selected: alpha(colors.brandGreenLight, 0.07),
-		selectedHover: alpha(colors.brandGreenLight, 0.11),
 	},
 	secondary: {
 		main: colors.gray700,
@@ -119,21 +72,6 @@ export const darkPalette = {
 		default: colors.gray900,
 		paper: colors.gray850,
 	},
-	text: {
-		primary: colors.inkDark900,
-		secondary: colors.inkDark600,
-		disabled: colors.ink400,
-	},
-	divider: colors.ruleDark,
-	success: {
-		main: colors.successDark,
-	},
-	error: {
-		main: colors.errorDark,
-	},
-	warning: {
-		main: colors.warningDark,
-	},
 	sidebar: {
 		accent: colors.brandGreenLight,
 	},

client/src/Utils/Theme/Theme.ts

@@ -13,11 +13,6 @@ declare module "@mui/material/styles" {
 		eyebrow?: React.CSSProperties;
 		fontFamilyMonospace?: string;
 	}
-	interface TypeAction {
-		rowHover: string;
-		controlHover: string;
-		selectedHover: string;
-	}
 	interface Palette {
 		sidebar: { accent: string };
 		rowStatus: { running: string; paused: string };
@@ -58,7 +53,7 @@ export type PaletteKey = {
 	[K in keyof Theme["palette"]]: Theme["palette"][K] extends { main: any } ? K : never;
 }[keyof Theme["palette"]];
 
-const fontFamilyPrimary = '"Geist Variable", system-ui, sans-serif';
+const fontFamilyPrimary = "system-ui, sans-serif";
 const fontFamilyMonospace =
 	'ui-monospace, SFMono-Regular, "SF Mono", Menlo, Consolas, "Liberation Mono", monospace';
 const shadow =
@@ -86,13 +81,11 @@ export const theme = (mode: string, palette: any) =>
 			fontSize: typographyLevels.base,
 			h1: {
 				fontSize: typographyLevels.xxl,
-				fontWeight: 700,
-				letterSpacing: "-0.015em",
+				fontWeight: 500,
 			},
 			h2: {
 				fontSize: typographyLevels.l,
-				fontWeight: 600,
-				letterSpacing: "-0.01em",
+				fontWeight: 400,
 			},
 			body1: {
 				fontSize: typographyLevels.m,
@@ -134,11 +127,7 @@ export const theme = (mode: string, palette: any) =>
 				styleOverrides: {
 					root: ({ theme }) => ({
 						"&.Mui-focusVisible": {
-							outline: `1px solid ${
-								theme.palette.mode === "dark"
-									? theme.palette.primary.light
-									: theme.palette.primary.main
-							}`,
+							outline: `1px solid ${theme.palette.primary.main}`,
 							outlineOffset: 2,
 						},
 					}),
@@ -192,38 +181,18 @@ export const theme = (mode: string, palette: any) =>
 					}),
 				},
 			},
+
 			MuiOutlinedInput: {
 				styleOverrides: {
-					input: {
-						paddingTop: 0,
-						paddingBottom: 0,
-						height: "100%",
-					},
 					root: ({ theme }) => ({
-						"& .MuiSelect-select": {
-							paddingTop: 0,
-							paddingBottom: 0,
-							display: "flex",
-							alignItems: "center",
-							minHeight: "unset",
-						},
-						"& .MuiOutlinedInput-notchedOutline": {
-							borderColor: theme.palette.divider,
-							transition: "border-color 0.15s ease",
-						},
-						"&:hover:not(.Mui-focused):not(.Mui-disabled) .MuiOutlinedInput-notchedOutline":
-							{
-								borderColor: theme.palette.text.disabled,
-							},
-						"&.Mui-focused .MuiOutlinedInput-notchedOutline": {
+						"&:hover .MuiOutlinedInput-notchedOutline": {
 							borderColor:
 								theme.palette.mode === "dark"
-									? theme.palette.primary.light
-									: theme.palette.primary.main,
-							borderWidth: 2,
+									? "rgba(255, 255, 255, 0.23)"
+									: theme.palette.text.primary,
 						},
-						"&.Mui-error .MuiOutlinedInput-notchedOutline": {
-							borderColor: theme.palette.error.main,
+						"&.Mui-focused .MuiOutlinedInput-notchedOutline": {
+							borderColor: palette.primary.main,
 						},
 					}),
 				},

client/src/Utils/Theme/constants.ts

@@ -18,10 +18,6 @@ export const LAYOUT = {
 	XXL: 16,
 } as const;
 
-export const INPUT_BASE_HEIGHT = 32; // Height for inputs/controls
-
 export const HOVER = {
 	DARKEN: 0.06, // This is a coefficient for darkening function
-	ROW: 0.025, // Overlay alpha for hoverable rows and cards
-	CONTROL: 0.05, // Stronger overlay for controls nested inside a hoverable row
 } as const;