refactor(monitors): update visibility toggle logic and labels for clarity

Address review feedback on #744:
- clamp DATABASE_POOL_MAX to >= 1 and DATABASE_POOL_MIN to <= max so bad
  env values can not produce a pool that fails every acquire
- healthcheck redis probe checks client status before PING so commands are
  not queued indefinitely while redis is down (maxRetriesPerRequest is null)
- probe() clears its timeout timer once the check settles
- error.html shows only the status code, not the error message
- docs: correct SQLite default to kener.sqlite.db to match knexfile

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

.agents/skills/ss-shadcn-svelte/SKILL.md

@@ -0,0 +1,123 @@
+---
+name: ss-shadcn-svelte
+description: >
+  Use shadcn-svelte components in SvelteKit projects. Detects whether the current project is a SvelteKit
+  app with shadcn-svelte installed, lists available components, and provides access to full component
+  documentation via the official llms.txt. Helps choose the right UI components for the job — buttons,
+  forms, dialogs, tables, charts, and more — following shadcn-svelte best practices.
+  Use this skill whenever the user is working in a SvelteKit project and wants to: add UI components,
+  build forms, create dialogs or modals, add a data table, use a date picker, build a sidebar or
+  navigation, add charts, use a combobox or select, create an alert or toast notification, or generally
+  build UI with pre-built accessible components. Also trigger when the user mentions "shadcn", "shadcn-svelte",
+  "bits-ui", or asks about available components in their Svelte project.
+---
+
+# shadcn-svelte — Component-Aware Svelte UI Assistant
+
+Use the right shadcn-svelte components when building UI in SvelteKit projects. This skill detects your project setup, shows what's available, and gives you access to full component documentation.
+
+## Prerequisites
+
+The project must be a SvelteKit app with shadcn-svelte initialized:
+
+```bash
+# Initialize shadcn-svelte in an existing SvelteKit project
+npx shadcn-svelte@latest init
+```
+
+## How to use
+
+### Step 1: Detect project setup
+
+Run the detection script to verify this is a SvelteKit project with shadcn-svelte and see which components are already installed:
+
+```bash
+bash <skill-path>/scripts/detect.sh .
+```
+
+This will:
+- Confirm it's a SvelteKit project (checks for `svelte.config.js/ts` and `@sveltejs/kit` in package.json)
+- Confirm shadcn-svelte is installed (checks for `components.json`, `bits-ui`, or `shadcn-svelte` in package.json)
+- List all currently installed components in the project's UI directory
+- Provide the documentation URL
+
+If the script exits with code 1, the project either isn't SvelteKit or doesn't have shadcn-svelte — do not proceed with shadcn-svelte components in that case.
+
+### Step 2: Read the component documentation
+
+The full component documentation for LLMs is available at:
+
+```
+https://www.shadcn-svelte.com/llms.txt
+```
+
+Fetch this URL to get a structured index of all available components organized by category, with links to individual component documentation pages (in `.md` format).
+
+When you need to use a specific component, read its individual documentation page from the links provided in `llms.txt`. Each component doc includes:
+- Import statements and usage examples
+- Available props, events, and slots
+- Variants and configuration options
+- Accessibility information
+
+### Step 3: Use the right component for the job
+
+When building UI, follow this decision process:
+
+1. **Run detection** to confirm shadcn-svelte is available and see installed components
+2. **Fetch llms.txt** to see all available components
+3. **Read the specific component docs** for the components you plan to use
+4. **Check if the component is installed** — if not, add it:
+   ```bash
+   npx shadcn-svelte@latest add <component-name>
+   ```
+5. **Import and use the component** following the documentation patterns
+
+### Component categories
+
+shadcn-svelte components are organized into these categories:
+
+| Category | Components |
+|----------|-----------|
+| **Layout** | Aspect Ratio, Collapsible, Resizable, Scroll Area, Separator, Sidebar |
+| **Form & Input** | Button, Calendar, Checkbox, Combobox, Date Picker, Input, Input OTP, Label, Radio Group, Range Calendar, Select, Slider, Switch, Textarea, Toggle, Toggle Group |
+| **Data Display** | Accordion, Avatar, Badge, Card, Carousel, Chart, Table, Data Table |
+| **Feedback** | Alert, Alert Dialog, Progress, Skeleton, Sonner (Toast) |
+| **Overlay** | Context Menu, Dialog, Drawer, Dropdown Menu, Hover Card, Menubar, Popover, Sheet, Tooltip |
+| **Navigation** | Breadcrumb, Command, Pagination, Tabs |
+| **Typography** | Typography |
+
+### Adding new components
+
+```bash
+# Add a single component
+npx shadcn-svelte@latest add button
+
+# Add multiple components
+npx shadcn-svelte@latest add button card dialog
+
+# List all available components
+npx shadcn-svelte@latest add
+```
+
+### Import patterns
+
+Components are typically imported from the project's `$lib/components/ui` directory:
+
+```svelte
+<script lang="ts">
+  import { Button } from "$lib/components/ui/button";
+  import * as Card from "$lib/components/ui/card";
+  import * as Dialog from "$lib/components/ui/dialog";
+</script>
+```
+
+Some components use namespace imports (with `* as`) when they have multiple sub-components (Card, Dialog, Sheet, Table, etc.), while simpler components use named imports (Button, Input, Badge, etc.).
+
+## Important guidelines
+
+- **Always run detection first** before suggesting shadcn-svelte components
+- **Always read component docs** before using a component — don't guess at props or patterns
+- **Check installed components** and add missing ones before importing
+- **Use the project's configured path** — the components directory may vary based on `components.json` configuration
+- **Follow Svelte 5 patterns** — shadcn-svelte uses runes (`$state`, `$derived`, `$effect`) and snippet-based composition
+- **Prefer composition** — shadcn-svelte components are designed to be composed together, not used as monolithic blocks

.agents/skills/ss-shadcn-svelte/scripts/detect.sh

@@ -0,0 +1,111 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# detect.sh — Check if the current project is a SvelteKit project with shadcn-svelte installed.
+# Exits 0 and prints component info if detected, exits 1 otherwise.
+
+PROJECT_DIR="${1:-.}"
+
+# Resolve to absolute path
+PROJECT_DIR="$(cd "$PROJECT_DIR" && pwd)"
+
+# --- Step 1: Check for SvelteKit ---
+
+SVELTEKIT=false
+
+# Check for svelte.config.js or svelte.config.ts
+if [[ -f "$PROJECT_DIR/svelte.config.js" ]] || [[ -f "$PROJECT_DIR/svelte.config.ts" ]]; then
+    SVELTEKIT=true
+fi
+
+# Also verify package.json has @sveltejs/kit
+if [[ -f "$PROJECT_DIR/package.json" ]]; then
+    if grep -q '"@sveltejs/kit"' "$PROJECT_DIR/package.json" 2>/dev/null; then
+        SVELTEKIT=true
+    fi
+fi
+
+if [[ "$SVELTEKIT" != "true" ]]; then
+    echo "NOT_SVELTEKIT"
+    echo "This is not a SvelteKit project. No svelte.config.js/ts found and @sveltejs/kit is not in package.json."
+    exit 1
+fi
+
+# --- Step 2: Check for shadcn-svelte ---
+
+SHADCN=false
+
+# Check for components.json (shadcn-svelte config file)
+if [[ -f "$PROJECT_DIR/components.json" ]]; then
+    # Verify it's actually a shadcn config (has $schema or style field)
+    if grep -qE '"(\$schema|style)"' "$PROJECT_DIR/components.json" 2>/dev/null; then
+        SHADCN=true
+    fi
+fi
+
+# Check for bits-ui in package.json (core dependency of shadcn-svelte)
+if [[ -f "$PROJECT_DIR/package.json" ]]; then
+    if grep -q '"bits-ui"' "$PROJECT_DIR/package.json" 2>/dev/null; then
+        SHADCN=true
+    fi
+fi
+
+# Check for shadcn-svelte in package.json
+if [[ -f "$PROJECT_DIR/package.json" ]]; then
+    if grep -q '"shadcn-svelte"' "$PROJECT_DIR/package.json" 2>/dev/null; then
+        SHADCN=true
+    fi
+fi
+
+if [[ "$SHADCN" != "true" ]]; then
+    echo "NO_SHADCN_SVELTE"
+    echo "SvelteKit project detected, but shadcn-svelte is not installed."
+    echo "Install it with: npx shadcn-svelte@latest init"
+    exit 1
+fi
+
+# --- Step 3: Gather installed components ---
+
+echo "DETECTED"
+echo "SvelteKit project with shadcn-svelte detected."
+echo ""
+
+# Check which components are already installed by scanning the components directory
+COMPONENTS_DIR=""
+
+# Try to read the components alias from components.json
+if [[ -f "$PROJECT_DIR/components.json" ]]; then
+    # Extract the aliases.components path
+    ALIAS_PATH=$(grep -o '"components"[[:space:]]*:[[:space:]]*"[^"]*"' "$PROJECT_DIR/components.json" | head -1 | sed 's/.*"components"[[:space:]]*:[[:space:]]*"//' | sed 's/"//')
+
+    if [[ -n "$ALIAS_PATH" ]]; then
+        # Resolve $lib to src/lib
+        RESOLVED_PATH="${ALIAS_PATH//\$lib/src/lib}"
+        if [[ -d "$PROJECT_DIR/$RESOLVED_PATH/ui" ]]; then
+            COMPONENTS_DIR="$PROJECT_DIR/$RESOLVED_PATH/ui"
+        fi
+    fi
+fi
+
+# Fallback: check common locations
+if [[ -z "$COMPONENTS_DIR" ]]; then
+    for dir in "src/lib/components/ui" "src/lib/ui" "src/components/ui"; do
+        if [[ -d "$PROJECT_DIR/$dir" ]]; then
+            COMPONENTS_DIR="$PROJECT_DIR/$dir"
+            break
+        fi
+    done
+fi
+
+if [[ -n "$COMPONENTS_DIR" ]] && [[ -d "$COMPONENTS_DIR" ]]; then
+    echo "Installed components (in $COMPONENTS_DIR):"
+    for comp_dir in "$COMPONENTS_DIR"/*/; do
+        if [[ -d "$comp_dir" ]]; then
+            comp_name=$(basename "$comp_dir")
+            echo "  - $comp_name"
+        fi
+    done
+    echo ""
+fi
+
+echo "Documentation: https://www.shadcn-svelte.com/llms.txt"

.claude/settings.json

@@ -0,0 +1,5 @@
+{
+  "enabledPlugins": {
+    "frontend-design@claude-plugins-official": true
+  }
+}

.claude/skills/code-context/SKILL.md

@@ -1,250 +0,0 @@
----
-name: code-context
-description: Persistent code architecture documentation via a `.codecontext/` folder.
-user-invokable: false
-metadata:
-    category: architecture
----
-
-# Code Architecture Documentation Skill
-
-Use this skill to **read architecture docs before work** and **document architecture after work** using the `.codecontext/` folder.
-
-`.codecontext/` is a living architecture reference — it helps new developers onboard and coding agents pick up where previous sessions left off. It is **NOT** a session log, changelog, or task diary.
-
----
-
-## What Belongs in `.codecontext/`
-
-Only document **architecture-level knowledge** that would take significant effort to rediscover by reading code alone.
-
-### Include
-
-- **Code architecture** — how modules/components are structured, layered, and why
-- **Code flow** — request lifecycle, data flow between layers, event/cron pipelines
-- **Component relationships** — which modules depend on each other, call chains, shared state
-- **Edge cases and gotchas** — non-obvious behaviors, race conditions, ordering constraints
-- **Design decisions and rationale** — why a pattern was chosen over alternatives
-- **Integration points** — how external services, databases, queues connect
-- **Invariants and constraints** — rules that must hold (e.g., "timestamps are always UTC seconds", "all DB access goes through db singleton")
-- **Error handling patterns** — how errors propagate, retry logic, fallback behavior
-- **Key file map** — which files own which responsibilities (only when non-obvious)
-
-### Exclude
-
-- Session logs, changelogs, or diary-style entries
-- What files were changed in a specific task
-- Raw terminal output or build logs
-- Code snippets (reference file paths + line ranges instead)
-- Obvious facts that can be inferred from reading one file
-- Task status, TODO lists, or progress tracking
-- Anything already covered in README, AGENTS.md, or inline comments
-
----
-
-## Trigger Conditions
-
-Run this skill at the **start and end** of any coding task that touches architecture:
-
-- Feature implementations spanning multiple files/modules
-- Refactors that change module boundaries or data flow
-- Bug fixes that reveal non-obvious system behavior
-- New integrations or service connections
-- Discovery of undocumented edge cases or invariants
-- **After any agent run** — if the agent explored, read, or traced code to understand how part of the codebase works, that understanding must be captured (see Phase C)
-
-**Skip** for trivial changes (typo fixes, single-line edits, style-only changes).
-
----
-
-## Phase A — Read Architecture Docs (Before Acting)
-
-### A1) Discover docs
-
-```bash
-ls .codecontext/
-```
-
-If `.codecontext/` does not exist, continue the task and create it in Phase B.
-
-### A2) Find relevant docs
-
-```bash
-grep -ril "<domain keyword>" .codecontext/
-```
-
-Use keywords from the feature area you are working on (e.g., "alerting", "auth", "monitors", "cron").
-
-### A3) Read and apply
-
-Read only relevant files. Extract:
-
-- Architecture constraints that affect your implementation
-- Code flow you need to hook into or extend
-- Edge cases to preserve or handle
-- Integration points to respect
-
-If existing docs conflict with current code, trust the code — update docs in Phase B.
-
----
-
-## Phase B — Document Architecture (Before Ending)
-
-Only write/update docs if the task revealed architecture knowledge worth preserving.
-
-### B1) Decide what to document
-
-Ask: _"Would a new developer or future agent need to re-discover this to work in this area?"_
-
-If yes, proceed. If no, skip Phase B entirely.
-
-Then apply this filter to **every sentence** before writing:
-
-> "Does this sentence describe how the code is structured, a design decision, or a constraint that would change how someone writes future code in this area?"
-
-If no → cut it. This is the line between architecture documentation and a session diary.
-
-### B2) Write architecture documentation
-
-Structure each doc as a **reference document**, not a session diary.
-
-Template (use only the sections that apply):
-
-```markdown
-# <Domain/Feature Area>
-
-## Overview
-
-Brief description of what this area does and its role in the system.
-
-## Architecture
-
-How the components are structured, key abstractions, layers.
-
-## Code Flow
-
-Step-by-step flow for the primary operations (e.g., "How a monitor check executes").
-
-## Key Files
-
-| File                 | Responsibility |
-| -------------------- | -------------- |
-| `src/lib/server/...` | Does X         |
-
-## Edge Cases and Gotchas
-
-- Non-obvious behavior 1
-- Constraint that must be preserved
-
-## Design Decisions
-
-- Why X was chosen over Y (if non-obvious)
-```
-
-Not all sections are required — include only what is relevant. Keep each doc under **300 lines**.
-
-### B3) Pick target file
-
-```bash
-ls .codecontext/
-grep -ril "<topic keyword>" .codecontext/
-```
-
-| Condition                       | Action                           |
-| ------------------------------- | -------------------------------- |
-| Existing doc covers this domain | Update/rewrite relevant sections |
-| Different domain                | Create new file                  |
-| No match                        | Create new file                  |
-
-When updating, **replace outdated sections** rather than appending session entries. The doc should always read as a clean, current architecture reference.
-
-### B4) Persist
-
-```bash
-mkdir -p .codecontext
-```
-
-Create or overwrite the file so it reads as a standalone reference:
-
-```bash
-cat > .codecontext/<domain>.md
-```
-
----
-
-## Phase C — Capture Agent Understanding (After Any Agent Run)
-
-After completing any task (coding, debugging, research, exploration), review what you learned about the codebase during the session and persist anything not already documented.
-
-### C1) Identify new understanding
-
-Reflect on what you discovered during this session:
-
-- How does a feature/module actually work? (code flow, data transformations, call chains)
-- What patterns or conventions did you observe across multiple files?
-- What dependencies or relationships between modules did you trace?
-- What surprised you or was non-obvious? (hidden side effects, implicit ordering, shared state)
-- What constraints or invariants did you discover that aren't documented anywhere?
-
-### C2) Check if already documented
-
-```bash
-ls .codecontext/
-grep -ril "<keyword>" .codecontext/
-```
-
-Read matching files. If the understanding is already captured accurately, skip. If partially captured, update the relevant sections.
-
-### C3) Write or update docs
-
-Apply the same quality filters from Phase B (B1 architecture filter). Then:
-
-- If the understanding maps to an existing `.codecontext/` file, update the relevant sections
-- If it covers a new domain area, create a new file following the B2 template and naming rules
-- Merge your new understanding with existing content — do not duplicate or contradict
-
-### C4) Scope
-
-This phase applies even when:
-
-- The task was **read-only** (research, exploration, answering questions about code)
-- The task was a **bug investigation** that didn't result in a fix
-- The agent **traced code flow** to understand behavior before making changes
-- The agent **read multiple files** to understand how a feature works
-
-This phase does **NOT** apply when:
-
-- The agent only touched a single file and learned nothing non-obvious
-- The understanding is already fully captured in existing `.codecontext/` docs
-- The session was trivial (formatting, typo fix, config change)
-
----
-
-## Naming Rules
-
-- Name by domain/feature area: `alerting.md`, `auth.md`, `monitor-execution.md`, `incident-lifecycle.md`
-- Use kebab-case for multi-word topics
-- Never use generic names: `notes.md`, `misc.md`, `context.md`, `session-1.md`
-- One file per bounded domain — split if a file exceeds ~300 lines
-
----
-
-## Fast Checklist
-
-Before coding:
-
-- [ ] Checked `.codecontext/` for relevant architecture docs
-- [ ] Applied constraints and patterns from existing docs
-
-Before finishing:
-
-- [ ] Every sentence passed the B1 architecture filter
-- [ ] Documented any new architecture knowledge discovered
-- [ ] Updated outdated docs if current code contradicts them
-- [ ] Doc reads as a clean architecture reference, not a session log
-
-After any agent run:
-
-- [ ] Reviewed what was learned about the codebase during this session
-- [ ] Checked if that understanding is already in `.codecontext/`
-- [ ] Persisted any new architectural knowledge (even from read-only/research sessions)

.claude/skills/ss-shadcn-svelte

@@ -0,0 +1 @@
+../../.agents/skills/ss-shadcn-svelte

.codecontext/database-migrations.md

@@ -1,46 +0,0 @@
-# Database & Migrations
-
-## Overview
-
-Kener uses **Knex.js** as a database abstraction layer supporting three engines: **SQLite** (default, via `better-sqlite3`), **PostgreSQL** (`pg`), and **MySQL** (`mysql2`). The engine is selected at runtime from the `DATABASE_URL` environment variable prefix (`sqlite://`, `postgresql://`, `mysql://`).
-
-## Architecture
-
-### Connection & Config
-
-| File                              | Responsibility                                             |
-| --------------------------------- | ---------------------------------------------------------- |
-| `knexfile.ts`                     | Parses `DATABASE_URL`, selects client, exports Knex config |
-| `src/lib/server/db/db.ts`         | Singleton Knex instance — all app code imports from here   |
-| `src/lib/server/db/dbimpl.js`     | High-level DB methods (wraps repositories)                 |
-| `src/lib/server/db/repositories/` | Per-domain query classes extending `BaseRepository`        |
-
-### Repository Pattern
-
-Each repository lives in `src/lib/server/db/repositories/<domain>.ts`, extends `BaseRepository` (which receives the Knex instance), and exposes typed async methods. Queries use Knex query builder — never raw SQL (except index creation wrapped in try/catch).
-
-### Migrations
-
-Migrations live in `migrations/` as TypeScript files with naming convention `YYYYMMDDHHMMSS_<description>.ts`.
-
-Key patterns observed across all existing migrations:
-
-- **Idempotency guards**: `knex.schema.hasTable` / `knex.schema.hasColumn` before `createTable` / `alterTable`.
-- **Column types**: Knex abstractions only (`.string()`, `.integer()`, `.text()`, `.float()`). No raw DDL.
-- **Defaults**: `.defaultTo()` + `.notNullable()` for YES/NO string flags (e.g., `is_hidden`, `is_owner`).
-- **Data seeding in migrations**: Standard Knex query builder (`.orderBy().first()`, `.update()`) — works on all three engines.
-- **Index creation**: Wrapped in `try/catch` because `CREATE INDEX IF NOT EXISTS` isn't portable.
-- **PostgreSQL insert returning**: Some repos branch on `GetDbType() === "postgresql"` to use `.returning("*")`, with fallback to re-read by inserted ID for SQLite/MySQL.
-
-## Edge Cases and Gotchas
-
-- SQLite requires `useNullAsDefault: true` in Knex config.
-- PostgreSQL `INSERT ... RETURNING *` is not supported by SQLite/MySQL — branch on `GetDbType()`.
-- `knex.fn.now()` is the portable way to set timestamps; never use `NOW()` or `datetime('now')`.
-- String-based YES/NO flags (not booleans) are the project convention for flag columns.
-
-## Design Decisions
-
-- **YES/NO strings over booleans**: Consistent with existing `is_hidden`, `include_degraded_in_downtime`, etc. Avoids SQLite boolean quirks.
-- **hasColumn guard in migrations**: Allows re-running migrations safely without failure on already-applied columns.
-- **Owner flag (`is_owner`)**: Set during migration on the first user by `id ASC`. Only one user should be owner; enforced at application level, not DB constraint.

.github/copilot-api-instructions.md

@@ -24,18 +24,29 @@ src/routes/(api)/api/
 - **Repository**: `src/lib/server/db/repositories/*.ts` - Database operations
 - **DbImpl**: `src/lib/server/db/dbimpl.ts` - Bindings for repository methods
 
+### Current Locals (set by middleware in `hooks.server.ts`)
+```typescript
+interface Locals {
+  user?: SessionUser;                // Auth session
+  monitor?: MonitorRecordTyped;      // /api/monitors/:monitor_tag/*
+  incident?: IncidentRecord;         // /api/incidents/:incident_id/*
+  maintenance?: MaintenanceRecord;   // /api/maintenances/:maintenance_id/*
+  page?: PageRecord;                 // /api/pages/:page_path/*
+}
+```
+
 ## Naming Conventions
 
 ### Use snake_case for API payloads
 ```typescript
-// ✅ Correct
+// Correct
 interface CreateMonitorRequest {
   monitor_tag: string;
   start_date_time: number;
   duration_seconds: number;
 }
 
-// ❌ Wrong
+// Wrong
 interface CreateMonitorRequest {
   monitorTag: string;
   startDateTime: number;
@@ -251,7 +262,7 @@ export const DELETE: RequestHandler = async ({ locals }) => {
 
   // Delete related records first (cascade)
   await db.deleteResourceRelatedRecords(resource.id);
-  
+
   // Delete the resource itself
   await db.deleteResource(resource.id);
 
@@ -275,8 +286,8 @@ const normalizedTs = GetMinuteStartTimestampUTC(body.start_date_time);
 const now = GetNowTimestampUTC();
 
 // For optional timestamp with fallback
-const timestamp = body.timestamp !== undefined 
-  ? GetMinuteStartTimestampUTC(body.timestamp) 
+const timestamp = body.timestamp !== undefined
+  ? GetMinuteStartTimestampUTC(body.timestamp)
   : GetMinuteStartNowTimestampUTC();
 ```
 
@@ -300,8 +311,8 @@ if (typeof body.count !== "number" || isNaN(body.count) || body.count <= 0) {
 ```typescript
 const VALID_STATUSES = ["ACTIVE", "INACTIVE"];
 if (body.status && !VALID_STATUSES.includes(body.status)) {
-  return json({ 
-    error: { code: "BAD_REQUEST", message: `status must be one of: ${VALID_STATUSES.join(", ")}` } 
+  return json({
+    error: { code: "BAD_REQUEST", message: `status must be one of: ${VALID_STATUSES.join(", ")}` }
   }, { status: 400 });
 }
 ```
@@ -311,8 +322,8 @@ if (body.status && !VALID_STATUSES.includes(body.status)) {
 if (body.monitor_tag) {
   const monitor = await db.getMonitorByTag(body.monitor_tag);
   if (!monitor) {
-    return json({ 
-      error: { code: "BAD_REQUEST", message: `Monitor with tag '${body.monitor_tag}' not found` } 
+    return json({
+      error: { code: "BAD_REQUEST", message: `Monitor with tag '${body.monitor_tag}' not found` }
     }, { status: 400 });
   }
 }
@@ -324,7 +335,7 @@ if (body.items !== undefined) {
   if (!Array.isArray(body.items)) {
     return json({ error: { code: "BAD_REQUEST", message: "items must be an array" } }, { status: 400 });
   }
-  
+
   for (const item of body.items) {
     if (!item.tag || typeof item.tag !== "string") {
       return json({ error: { code: "BAD_REQUEST", message: "Each item must have a valid tag" } }, { status: 400 });

.github/copilot-instructions.md

@@ -2,25 +2,37 @@
 
 ## Project Overview
 
-Kener is an open-source status page application built with **SvelteKit 2.x** (**Svelte 5**) and **Node.js**, and is migrating to a **TypeScript-first** codebase. It provides real-time monitoring, uptime tracking, incident management, and customizable dashboards.
+Kener is an open-source status page application built with **SvelteKit 2.x** (**Svelte 5**) and **Node.js/Express**. It is a **TypeScript-first** codebase providing real-time monitoring, uptime tracking, incident management, and customizable dashboards.
 
 ## Architecture
 
-### Entry Points
-- **`main.js`** - Production server entry: Express + SvelteKit handler + cron scheduler
-- **`src/lib/server/startup.js`** - Cron job scheduler for monitors (runs every minute)
+### Dual Process Model
+
+In development, `npm run dev` runs two parallel processes:
+1. **SvelteKit dev server** (`vite dev`) - serves the frontend with HMR
+2. **Cron scheduler** (`vite-node src/lib/server/startup.ts`) - runs monitor checks, maintenance scheduling, daily cleanup
+
+In production, **`scripts/main.ts`** is the single entry point: Express server + SvelteKit handler + migrations + seeds + scheduler startup. Built output runs via `node build/main.js`.
 
 ### Route Groups (SvelteKit)
 - **`(kener)/`** - Public status page routes
 - **`(manage)/`** - Admin dashboard (requires authentication)
 - **`(embed)/`** - Embeddable widgets
 - **`(docs)/`** - Documentation pages
+- **`(api)/`** - SvelteKit API routes
+- **`(account)/`** - Account/auth pages
+- **`(ext)/`** - External integrations
+- **`(assets)/`** - Asset serving
 
 ### Core Server Components
-- **`src/lib/server/controllers/controller.js`** - Main business logic (~1700 lines), handles monitors, incidents, auth, email
-- **`src/lib/server/db/dbimpl.js`** - Database abstraction layer using Knex.js
-- **`src/lib/server/services/`** - Monitor type implementations: API, Ping, TCP, DNS, SSL, SQL, Heartbeat, GameDig, Group
-- **`src/lib/server/cron-minute.js`** - Per-monitor cron execution logic
+- **`src/lib/server/controllers/`** - Domain-split controllers (18 TypeScript files): `apiController.ts`, `incidentController.ts`, `monitorsController.ts`, `maintenanceController.ts`, `pagesController.ts`, `userController.ts`, `dashboardController.ts`, `emailController.ts`, `siteDataController.ts`, `validators.ts`, etc.
+- **`src/lib/server/db/dbimpl.ts`** - Database abstraction layer using Knex.js with repository composition pattern
+- **`src/lib/server/db/repositories/`** - Domain-driven repositories: `monitors.ts`, `incidents.ts`, `maintenances.ts`, `pages.ts`, `users.ts`, `alerts.ts`, `monitoring.ts`, `images.ts`, `subscriptionSystem.ts`, `emailTemplateConfig.ts`, `monitorAlertConfig.ts`, `site-data.ts`
+- **`src/lib/server/services/`** - Monitor type implementations (all TypeScript): `apiCall.ts`, `pingCall.ts`, `tcpCall.ts`, `dnsCall.ts`, `sslCall.ts`, `sqlCall.ts`, `heartbeatCall.ts`, `gamedigCall.ts`, `groupCall.ts`, `grpcCall.ts`, `noneCall.ts`
+- **`src/lib/server/schedulers/`** - Scheduling via `croner`: `appScheduler.ts`, `monitorSchedulers.ts`, `maintenanceScheduler.ts`, `dailyCleanup.ts`, `shutdown.ts`
+- **`src/lib/server/queues/`** - Job queues via **BullMQ** + **Redis**: `monitorExecuteQueue.ts`, `monitorResponseQueue.ts`, `alertingQueue.ts`, `emailQueue.ts`, `subscriberQueue.ts`
+- **`src/lib/server/api-server/`** - Express-side API handlers with file-based routing (directory/method pattern: e.g., `monitor-bar/get.ts`)
+- **`src/lib/server/cron-minute.ts`** - Per-monitor cron execution logic
 
 ### Database
 - Supports SQLite (default), PostgreSQL, MySQL via **Knex.js**
@@ -28,83 +40,97 @@ Kener is an open-source status page application built with **SvelteKit 2.x** (**
 - Migrations in `/migrations/`, seeds in `/seeds/`
 - Run migrations: `npm run migrate` or auto-runs on `npm start`
 
+### Build System
+`npm run build` is a two-step process:
+1. `scripts/build-sveltekit.js` - Vite build of SvelteKit app (optionally with `--with-docs`)
+2. `scripts/build-server.js` - esbuild bundles `scripts/main.ts` into `build/main.js`
+
 ## Development Commands
 
 ```bash
-npm run dev        # Start dev server with hot reload + cron scheduler
-npm run build      # Production build
-npm run preview    # Preview production build
-npm run check      # Typecheck + Svelte checks (uses tsconfig)
+npm run dev          # Start dev server (SvelteKit + cron scheduler in parallel)
+npm run build        # Production build (SvelteKit then esbuild server bundle)
+npm run start        # Run production build (node build/main.js)
+npm run check        # Svelte + TypeScript type checking
+npm run prettify     # Format all files with Prettier
+npm run migrate      # Run database migrations via Knex
+npm run seed         # Run database seeds
 ```
 
 ## Key Patterns
 
 ### Svelte 5 + TypeScript conventions
-- Prefer **TypeScript** for new/modified code (`.ts`, and `.svelte` with `lang="ts"`).
-- Prefer **Svelte 5 runes** for component state/effects in new code (e.g. `$state`, `$derived`, `$effect`).
-- Prefer Svelte 5 props via `$props()` in new components. Keep existing `export let` props where already used to avoid churn.
-- For SvelteKit route typing, prefer generated `$types` (e.g. `import type { PageServerLoad } from './$types'`).
-- Avoid packages that hard-require Svelte 4 (they can break or force `--legacy-peer-deps`).
+- Use **TypeScript** for all code (`.ts`, and `.svelte` with `lang="ts"`).
+- Use **Svelte 5 runes** (`$state`, `$derived`, `$effect`, `$props()`) in components.
+- For SvelteKit route typing, use generated `$types` (e.g. `import type { PageServerLoad } from './$types'`).
+- Avoid packages that hard-require Svelte 4.
 
 ### Monitor Types
-Defined in `src/lib/server/services/service.js`. Each type has its own implementation file:
-```javascript
-// Supported: API, PING, TCP, DNS, GROUP, SSL, SQL, HEARTBEAT, GAMEDIG
+Defined in `src/lib/server/services/service.ts`. Each type has its own implementation file:
+```typescript
+// Supported: API, PING, TCP, DNS, GROUP, SSL, SQL, HEARTBEAT, GAMEDIG, GRPC, NONE
 ```
 
 ### Status Constants
-Use constants from `src/lib/server/constants`:
-```javascript
-import { UP, DOWN, DEGRADED, MAINTENANCE, NO_DATA } from "./constants";
+Use constants from `src/lib/global-constants.ts`:
+```typescript
+// In Svelte/client code:
+import { UP, DOWN, DEGRADED, MAINTENANCE, NO_DATA } from "$lib/global-constants";
+
+// In server code (use relative path):
+import { UP, DOWN, DEGRADED, MAINTENANCE, NO_DATA } from "./global-constants";
 ```
 
 ### API Authentication
 APIs use Bearer token auth verified via `VerifyAPIKey()`:
-```javascript
-import { VerifyAPIKey } from "$lib/server/controllers/controller.js";
+```typescript
+import { VerifyAPIKey } from "$lib/server/controllers/apiController";
 ```
 
 ### Database Queries
 Always use the db singleton, never instantiate Knex directly:
-```javascript
+```typescript
 import db from "$lib/server/db/db";
 const monitor = await db.getMonitorByTag(tag);
 ```
 
 ### Timestamps
-All timestamps are **UTC seconds** (not milliseconds). Use helpers from `src/lib/server/tool.js`:
-```javascript
-import { GetMinuteStartNowTimestampUTC, GetNowTimestampUTC } from "./tool";
+All timestamps are **UTC seconds** (not milliseconds). Use helpers from `src/lib/server/tool.ts`:
+```typescript
+import { GetMinuteStartTimestampUTC, GetNowTimestampUTC } from "$lib/server/tool";
 ```
 
 ### i18n
-Locales are in `src/lib/locales/`. Add new translations by creating `{code}.json` and updating `locales.json`.
+21 locale files in `src/lib/locales/` (en, de, fr, es, hi, ja, ko, zh-CN, zh-TW, pt-BR, ru, etc.). Add new translations by creating `{code}.json` and updating `locales.json`.
 
 ## UI Components
 
-Uses **shadcn-svelte** components in `src/lib/components/ui/`. Import pattern:
-```javascript
+Uses **shadcn-svelte** components in `src/lib/components/ui/` (40+ components). Import pattern:
+```typescript
 import { Button } from "$lib/components/ui/button";
 ```
 
-Styling: **TailwindCSS** with HSL CSS variables for theming (see `tailwind.config.js`).
+Styling: **Tailwind CSS v4** with CSS-based configuration (no `tailwind.config.js`). Theme uses HSL CSS variables defined in `src/routes/layout.css`.
 
 ## Environment Variables
 
-Required in `.env`:
-- `KENER_SECRET_KEY` - JWT secret for auth
+Required:
+- `KENER_SECRET_KEY` - Secret key for auth
 - `ORIGIN` - Site URL (e.g., `http://localhost:3000`)
-- `DATABASE_URL` - Database connection string
+- `REDIS_URL` - Redis connection string (required for BullMQ job queues)
 
 Optional:
+- `DATABASE_URL` - Database connection string (defaults to SQLite)
 - `KENER_BASE_PATH` - Base path for reverse proxy
+- `PORT` - Server port (default 3000)
 - `RESEND_API_KEY` / `RESEND_SENDER_EMAIL` - Email notifications
 
 ## File Conventions
 
 - Server-only code: `src/lib/server/`
 - Shared utilities: `src/lib/` (except `server/`)
-- Route data loading: `+page.server.ts` / `+layout.server.ts` (and client-side `+page.ts` / `+layout.ts` when needed)
+- Client utilities: `src/lib/client/`
+- Route data loading: `+page.server.ts` / `+layout.server.ts`
 - API endpoints: `+server.ts` files returning `json()`
 
 ## Types & Interfaces
@@ -112,29 +138,7 @@ Optional:
 Place types and interfaces in the appropriate folder based on where they are used:
 
 - **`src/lib/types/`** - Shared types (safe to import from both server and client code). Use for domain models, DTOs, API response types, and anything needed on both sides.
-- **`src/lib/server/types/`** - Server-only types. Use for DB models, internal service types, auth/session types, and anything that uses `$env/static/private` or Node-only APIs.
-- **`src/lib/client/types/`** - Client-only types. Use for UI-specific types, component prop types, and anything that relies on browser/DOM APIs.
+- **`src/lib/server/types/`** - Server-only types (`db.ts`, `auth.ts`, `monitor.ts`, `api-server.ts`). Use for DB models, internal service types, auth/session types.
+- **`src/lib/client/types/`** - Client-only types (`ui.ts`). Use for UI-specific types, component prop types.
 
 Always use `import type { ... }` when importing types to avoid accidental runtime imports.
-
-# Other skills
-
-Read files in .claude/skills for more instructions on specific tasks or file types.
-
-## Code Architecture Documentation (MUST)
-
-For every coding task that touches architecture (multi-file features, refactors, new integrations):
-
-1. **Before edits**
-	- Read and apply `.claude/skills/code-context/SKILL.md`.
-	- Load relevant architecture docs from `.codecontext/` when present.
-
-2. **Before finishing the response**
-	- If the task revealed new architecture knowledge (code flow, edge cases, component relationships, design decisions), write/update a `.codecontext/*.md` entry as a clean reference doc.
-	- Skip if the task was trivial (typo fixes, single-line edits).
-
-3. **Final response contract**
-	- Include a short line: `Context loaded: ...`
-	- Include a short line: `Context updated: ...`
-
-`.codecontext/` documents **code architecture only** — not session logs, changelogs, or task summaries.

.prettierignore

@@ -19,4 +19,5 @@ config/static/*
 !config/static/.kener
 **/*.yaml
 **/*.yml
-.github/
+.github/
+src/lib/components/ui

AGENTS.md

@@ -38,23 +38,3 @@ When the user asks to write or edit documentation, follow the skill file:
 - `.claude/skills/documentation-writer/SKILL.md`
 
 This is mandatory for docs-related tasks. Prioritize short, clear, action-oriented docs and avoid bloat.
-
-## Code architecture docs skill - Important for all tasks
-
-Always try to use the code-context skill at the start and end of coding sessions:
-
-- `.claude/skills/code-context/SKILL.md`
-
-## Code architecture enforcement (mandatory)
-
-The code-context skill is not optional. Agents MUST do both:
-
-1. **Before coding**: load relevant architecture docs from `.codecontext/`.
-2. **Before final response**: if the task revealed new architecture knowledge (code flow, edge cases, component relationships), update or create a `.codecontext/*.md` entry. Skip if the task was trivial.
-
-Required output evidence in the final response:
-
-- `Context loaded:` list of `.codecontext` files read (or `none found`).
-- `Context updated:` exact `.codecontext` file path written (or `skipped — no architecture changes`).
-
-The `.codecontext/` folder documents **code architecture only** — not session logs, changelogs, or task summaries.

CLAUDE.md

@@ -4,7 +4,7 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 
 ## What is Kener?
 
-Kener is an open-source status page application built with **SvelteKit 2.x (Svelte 5)** and **Node.js/Express**. It provides real-time monitoring, uptime tracking, incident management, and customizable dashboards. The codebase is migrating to **TypeScript-first**.
+Kener is an open-source status page application built with **SvelteKit 2.x (Svelte 5)** and **Node.js/Express**. It is a **TypeScript-first** codebase providing real-time monitoring, uptime tracking, incident management, and customizable dashboards.
 
 ## Development Commands
 
@@ -51,7 +51,7 @@ In production, `scripts/main.ts` is the single entry point: Express server + Sve
 
 Each monitor type has a dedicated implementation in `src/lib/server/services/`:
 
-- Types: API, Ping, TCP, DNS, SSL, SQL, Heartbeat, GameDig, Group
+- Types: API, Ping, TCP, DNS, SSL, SQL, Heartbeat, GameDig, Group, gRPC, None
 - Scheduled via `src/lib/server/schedulers/` using `croner`
 - Job queues managed with **BullMQ** + **Redis** (`src/lib/server/queues/`)
 
@@ -83,21 +83,21 @@ All timestamps are **UTC seconds** (not milliseconds). Use helpers from `src/lib
 
 ### Status Constants
 
-#### When svelte code
+Constants are exported as a **default export** from `src/lib/global-constants.ts`:
 
 ```typescript
-import { UP, DOWN, DEGRADED, MAINTENANCE, NO_DATA } from "$lib/server/global-constants.ts"
-```
+// In Svelte/client code or SvelteKit routes:
+import GC from "$lib/global-constants"
+// Usage: GC.UP, GC.DOWN, GC.DEGRADED, GC.MAINTENANCE, GC.NO_DATA
 
-#### When server code use directory traversal
-
-```typescript
-import { UP, DOWN, DEGRADED, MAINTENANCE, NO_DATA } from "./global-constants.ts"
+// In server code (use relative path):
+import GC from "../../global-constants.js"
+// Usage: GC.UP, GC.DOWN, etc.
 ```
 
 ### API Authentication
 
-APIs use Bearer token auth: `import { VerifyAPIKey } from "$lib/server/controllers/controller.js"`
+APIs use Bearer token auth: `import { VerifyAPIKey } from "$lib/server/controllers/apiController"`
 
 ### Types Location
 
@@ -111,8 +111,8 @@ Locale files in `src/lib/locales/`. Add translations by creating `{code}.json` a
 
 ## Environment Variables
 
-Required: `KENER_SECRET_KEY`, `ORIGIN`, `DATABASE_URL`
-Optional: `KENER_BASE_PATH`, `PORT` (default 3000), `RESEND_API_KEY`, `RESEND_SENDER_EMAIL`
+Required: `KENER_SECRET_KEY`, `ORIGIN`, `REDIS_URL`
+Optional: `DATABASE_URL` (defaults to SQLite), `KENER_BASE_PATH`, `PORT` (default 3000), `RESEND_API_KEY`, `RESEND_SENDER_EMAIL`
 
 ## Skills
 
@@ -121,4 +121,17 @@ Read `.claude/skills/` for specialized instructions on:
 - **svelte-code-writer** - Svelte component creation/editing
 - **documentation-writer** - Editing docs in `src/routes/(docs)/docs/content/`
 - **tailwindcss** - Tailwind CSS v4 patterns
-- **code-context** - Architecture documentation in `.codecontext/`
+
+## Agent skills
+
+### Issue tracker
+
+Issues and PRDs are tracked in GitHub Issues for `rajnandan1/kener`. See `docs/agents/issue-tracker.md`.
+
+### Triage labels
+
+Triage uses the default mattpocock/skills label vocabulary. See `docs/agents/triage-labels.md`.
+
+### Domain docs
+
+This repo uses a single-context domain-doc layout. See `docs/agents/domain.md`.

CONTEXT.md

@@ -0,0 +1,49 @@
+# Kener
+
+An open-source status page application providing real-time monitoring, uptime tracking, incident management, and customizable dashboards.
+
+## Language
+
+### Monitoring
+
+**Monitor**:
+A single check against a service, with a unique tag, a type (API, Ping, TCP, DNS, SSL, SQL, Heartbeat, GameDig, Group, gRPC, None), and a status (ACTIVE or otherwise).
+_Avoid_: Check, probe, service
+
+**Inactive Monitor**:
+A monitor that is not checked at all: the scheduler drops its job and no monitoring data is collected until it is made ACTIVE again. Independent of visibility (see Hidden Monitor).
+_Avoid_: Disabled monitor, paused monitor
+
+**Hidden Monitor**:
+A monitor excluded from all status pages while remaining fully checked and alerted. Independent of ACTIVE/INACTIVE.
+_Avoid_: Invisible monitor, private monitor
+
+**Group Monitor**:
+A monitor whose status is derived from other monitors via a weighted score (UP=1, DEGRADED=0.5, DOWN=0; maintenance counts as UP). A group cannot contain another group.
+_Avoid_: Monitor group, composite monitor
+
+**Member**:
+A monitor belonging to a Group Monitor, carrying a weight and a position in the execution order. Membership is an explicit stored list, never a dynamic rule (e.g. tag wildcards).
+_Avoid_: Child monitor, sub-monitor
+
+**Weight**:
+A member's share of the group score, between 0 and 1. Weights across a group's members must sum to 1. Any membership change (add or remove) redistributes all weights equally; manual tuning happens after membership is settled.
+
+**Execution Order**:
+The stored order in which a Group Monitor's members are checked before aggregation. Manually arranged, not derived.
+
+**Eligible Monitor**:
+A monitor that may become a Member: ACTIVE, not a Group Monitor, and not the group being edited itself.
+
+**Stale Member**:
+A Member whose monitor is no longer an Eligible Monitor (paused or deleted after being added). It remains a Member until explicitly removed, but is excluded from the group score.
+
+### Maintenance
+
+**Maintenance**:
+A recurring maintenance definition: title, description, an RRULE schedule, a duration, and affected monitors. Identified by its own id.
+_Avoid_: Maintenance window, maintenance event (that's an occurrence, see below)
+
+**Maintenance Event**:
+A single occurrence of a Maintenance, generated from its RRULE: a concrete start/end time with a lifecycle status (SCHEDULED → READY → ONGOING → COMPLETED). Has its own id, independent of the Maintenance id. The public maintenance page is keyed by Maintenance Event id.
+_Avoid_: Occurrence, maintenance instance

Dockerfile

@@ -135,6 +135,7 @@ ARG KENER_BASE_PATH=
 ENV NODE_ENV=production \
     PORT=${PORT} \
     KENER_BASE_PATH=${KENER_BASE_PATH} \
+    BODY_SIZE_LIMIT=3M \
     TZ=UTC \
     # Required so Node can import .ts migration/seed files at runtime
     NODE_OPTIONS="--experimental-strip-types"
@@ -162,6 +163,7 @@ COPY --chown=node:node --from=builder /app/seeds ./seeds
 COPY --chown=node:node --from=builder /app/src/lib/server/db/seedSiteData.ts      ./src/lib/server/db/seedSiteData.ts
 COPY --chown=node:node --from=builder /app/src/lib/server/db/seedMonitorData.ts   ./src/lib/server/db/seedMonitorData.ts
 COPY --chown=node:node --from=builder /app/src/lib/server/db/seedPagesData.ts     ./src/lib/server/db/seedPagesData.ts
+COPY --chown=node:node --from=builder /app/src/lib/allPerms.ts                   ./src/lib/allPerms.ts
 COPY --chown=node:node --from=builder /app/src/lib/server/templates/general       ./src/lib/server/templates/general
 
 # Locale JSON files (read at runtime by server-side i18n)

README.md

@@ -20,6 +20,7 @@
   <a href="https://github.com/rajnandan1/kener/actions/workflows/publish-images.yml"><img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/rajnandan1/kener/publish-images.yml" /></a>
   <a href="https://github.com/rajnandan1/kener/commit/HEAD"><img src="https://img.shields.io/github/last-commit/rajnandan1/kener/main" alt="" /></a>
   <a href="https://github.com/rajnandan1/kener/issues"><img alt="GitHub issues" src="https://img.shields.io/github/issues/rajnandan1/kener.svg" /></a>
+  <a href="https://deepwiki.com/rajnandan1/kener"><img alt="Ask DeepWiki" src="https://deepwiki.com/badge.svg" /></a>
 </p>
 
 <p align="center">
@@ -46,6 +47,14 @@
 | [🌍 Live Server](https://kener.ing) | [🎉 Quick Start](https://kener.ing/docs/v4/getting-started/quick-start) | [🗄 Documentation](https://kener.ing/docs/v4/getting-started/introduction) |
 | ----------------------------------- | ----------------------------------------------------------------------- | -------------------------------------------------------------------------- |
 
+<p align="center">
+
+[![Deploy on Railway](https://railway.com/button.svg)](https://railway.com/deploy/spSvic?referralCode=1Pn7vs&utm_medium=integration&utm_source=template&utm_campaign=generic)
+[![Deploy on Zeabur](https://zeabur.com/button.svg)](https://zeabur.com/templates/1YRTMI?referralCode=rajnandan1)
+[![Deploy to Render](https://render.com/images/deploy-to-render-button.svg)](https://render.com/deploy?repo=https%3A%2F%2Fgithub.com%2Frajnandan1%2Fkener)
+
+</p>
+
 ## What is Kener?
 
 **Kener** is a sleek and lightweight status page system built with **SvelteKit** and **NodeJS**. It’s not here to replace heavyweights like Datadog or Atlassian but rather to offer a simple, modern, and hassle-free way to set up a great-looking status page with minimal effort.
@@ -170,11 +179,6 @@ For the full quick start (including local Docker builds and dev mode), see the d
 
 - https://kener.ing/docs/v4/getting-started/quick-start
 
-## One Click Deployment
-
-[![Deploy on Railway](https://railway.com/button.svg)](https://railway.com/deploy/spSvic?referralCode=1Pn7vs&utm_medium=integration&utm_source=template&utm_campaign=generic)
-[![Deploy on Zeabur](https://zeabur.com/button.svg)](https://zeabur.com/templates/1YRTMI?referralCode=rajnandan1)
-
 ## Features
 
 Kener combines public status page essentials with advanced admin workflows.

docker-entrypoint.sh

@@ -1,6 +1,9 @@
 #!/bin/sh
 set -e
 
+# Default body size limit for SvelteKit adapter-node (512K default is too small for image uploads)
+export BODY_SIZE_LIMIT="${BODY_SIZE_LIMIT:-3M}"
+
 # Index documentation into Redis when docs are bundled in the image
 if [ -f /app/scripts/index-docs.ts ]; then
   echo "[kener] Indexing documentation into Redis..."

docs/adr/0001-explicit-group-membership.md

@@ -0,0 +1,5 @@
+# Group membership is an explicit stored list, not a rule
+
+When making group-monitor member selection searchable (#694), the requester also proposed dynamic membership by tag pattern (e.g. `site1-*` auto-adds matching monitors). We decided group membership stays an explicit, stored list of members. Dynamic membership contradicts the group model: each member carries an explicit weight (weights must sum to 1) and a manual execution order — a rule that adds/removes members over time would need an auto-weighting policy, silent weight redistribution when monitors are created or deleted, and an undefined execution order for matched members. Bulk needs are served in the editor instead: search plus "Add all N matching" makes large explicit groups cheap to build.
+
+If wildcard groups are requested again, the answer is here: it's a different feature (a rule-based aggregate without weights or order), not an extension of Group Monitors.

docs/adr/0002-maintenance-page-keyed-by-event-id.md

@@ -0,0 +1,5 @@
+# Public maintenance page is keyed by Maintenance Event id
+
+The public route `/maintenances/<id>` interprets `<id>` as a Maintenance Event id by default (with `?type=maintenance` to address a Maintenance definition instead), even though the route param is named `maintenance_id`. Issue #723 showed this misleads API consumers: `/api/v4/maintenances` returns Maintenance ids, and linking those to `/maintenances/<id>` lands on whatever Event happens to carry that id — an apparent "off-by-one title mismatch" with no actual data corruption.
+
+We considered flipping the route default to Maintenance ids but rejected it: every internal status-page link, subscriber email, and externally bookmarked URL is keyed by Event id, and all of those would break. Instead, v4 API responses carry an absolute `url` field (built from the configured Site URL) that resolves correctly — `?type=maintenance` for Maintenance objects, the plain Event-id path for Maintenance Events. Consumers should link via `url`, never by concatenating ids onto paths.

docs/adr/0003-fail-fast-self-healing-db-pool.md

@@ -0,0 +1,9 @@
+# Fail-fast, self-healing database pool defaults
+
+`knexfile.ts` overrides knex's pool defaults for network databases (Postgres, MySQL): `pool.min` is 0 instead of 2, acquire/create timeouts are 15s instead of 60s/30s, and TCP keepalive is enabled on connections. All knobs are overridable via `DATABASE_*` env vars.
+
+Two production incidents drove this. On Railway, a Postgres outage caused every request to hang for knex's default 60s `acquireConnectionTimeout` before failing with `KnexTimeoutError`, and after the database recovered the app stayed broken until a manual restart. In Docker Swarm (#692), the overlay network's conntrack silently dropped idle TCP connections after ~20 minutes, so the first request after an idle period drew a dead socket from the pool and returned a 500; the reporter worked around it with server-side Postgres `tcp_keepalives_*` settings and asked for an application-level fix.
+
+Both share one root cause: knex keeps `pool.min` connections forever and never validates them. Those permanently-idle sockets are exactly the ones cloud networks (Railway proxies, Swarm overlays, k8s) silently kill, and after any database blip they wedge the pool with corpses. `min: 0` lets the reaper retire every idle connection (`idleTimeoutMillis` 30s, well under typical conntrack windows), keepalive lets the OS detect silently-dropped sockets, and the 15s timeouts turn a minute-long hang into a fast failure during an outage.
+
+The trade-off: a quiet instance pays connection setup on the first query after idle (tens of milliseconds), and a database that takes longer than 15s to accept connections will see failures where the old defaults would have waited a minute. Deployments with such databases can raise `DATABASE_ACQUIRE_TIMEOUT_MS` / `DATABASE_CREATE_TIMEOUT_MS` rather than the project reverting to defaults that wedge everyone else.

docs/agents/domain.md

@@ -0,0 +1,37 @@
+# Domain Docs
+
+How the engineering skills should consume this repo's domain documentation when exploring the codebase.
+
+This repo is configured as a **single-context** repo.
+
+## Before exploring, read these
+
+- **`CONTEXT.md`** at the repo root.
+- **`docs/adr/`** — read ADRs that touch the area you're about to work in.
+
+If any of these files don't exist, **proceed silently**. Don't flag their absence; don't suggest creating them upfront. The producer skill (`/grill-with-docs`) creates them lazily when terms or decisions actually get resolved.
+
+## File structure
+
+Single-context repo:
+
+```text
+/
+├── CONTEXT.md
+├── docs/adr/
+│   ├── 0001-event-sourced-orders.md
+│   └── 0002-postgres-for-write-model.md
+└── src/
+```
+
+## Use the glossary's vocabulary
+
+When your output names a domain concept (in an issue title, a refactor proposal, a hypothesis, a test name), use the term as defined in `CONTEXT.md`. Don't drift to synonyms the glossary explicitly avoids.
+
+If the concept you need isn't in the glossary yet, that's a signal — either you're inventing language the project doesn't use (reconsider) or there's a real gap (note it for `/grill-with-docs`).
+
+## Flag ADR conflicts
+
+If your output contradicts an existing ADR, surface it explicitly rather than silently overriding:
+
+> _Contradicts ADR-0007 (event-sourced orders) — but worth reopening because…_

docs/agents/issue-tracker.md

@@ -0,0 +1,22 @@
+# Issue tracker: GitHub
+
+Issues and PRDs for this repo live as GitHub issues. Use the `gh` CLI for all operations.
+
+## Conventions
+
+- **Create an issue**: `gh issue create --title "..." --body "..."`. Use a heredoc for multi-line bodies.
+- **Read an issue**: `gh issue view <number> --comments`, filtering comments by `jq` and also fetching labels.
+- **List issues**: `gh issue list --state open --json number,title,body,labels,comments --jq '[.[] | {number, title, body, labels: [.labels[].name], comments: [.comments[].body]}]'` with appropriate `--label` and `--state` filters.
+- **Comment on an issue**: `gh issue comment <number> --body "..."`
+- **Apply / remove labels**: `gh issue edit <number> --add-label "..."` / `--remove-label "..."`
+- **Close**: `gh issue close <number> --comment "..."`
+
+Infer the repo from `git remote -v` — `gh` does this automatically when run inside a clone.
+
+## When a skill says "publish to the issue tracker"
+
+Create a GitHub issue.
+
+## When a skill says "fetch the relevant ticket"
+
+Run `gh issue view <number> --comments`.

docs/agents/triage-labels.md

@@ -0,0 +1,15 @@
+# Triage Labels
+
+The skills speak in terms of five canonical triage roles. This file maps those roles to the actual label strings used in this repo's issue tracker.
+
+| Label in mattpocock/skills | Label in our tracker | Meaning                                  |
+| -------------------------- | -------------------- | ---------------------------------------- |
+| `needs-triage`             | `needs-triage`       | Maintainer needs to evaluate this issue  |
+| `needs-info`               | `needs-info`         | Waiting on reporter for more information |
+| `ready-for-agent`          | `ready-for-agent`    | Fully specified, ready for an AFK agent  |
+| `ready-for-human`          | `ready-for-human`    | Requires human implementation            |
+| `wontfix`                  | `wontfix`            | Will not be actioned                     |
+
+When a skill mentions a role (e.g. "apply the AFK-ready triage label"), use the corresponding label string from this table.
+
+Edit the right-hand column to match whatever vocabulary you actually use.

knexfile.ts

@@ -7,13 +7,45 @@ const databaseURLParts = databaseURL.split("://");
 const databaseType = databaseURLParts[0];
 const databasePath = databaseURLParts[1];
 
+const intFromEnv = (name: string, fallback: number): number => {
+  const raw = process.env[name];
+  if (raw === undefined) return fallback;
+  const parsed = parseInt(raw, 10);
+  return Number.isFinite(parsed) && parsed >= 0 ? parsed : fallback;
+};
+
+// TCP keepalive on pooled connections, on by default. Cloud networks (Railway,
+// Docker Swarm overlays, k8s) silently drop idle TCP connections; without
+// keepalive the pool keeps handing out dead sockets after an idle period or a
+// database restart. See docs/adr/0003-fail-fast-self-healing-db-pool.md.
+const keepAliveEnabled = process.env.DATABASE_KEEPALIVE !== "false";
+
+// Pool defaults deviate from knex's on purpose:
+// - min 0: knex's min 2 connections are never reaped, so they are exactly the
+//   ones that go stale and wedge the app until a manual restart
+// - 15s acquire/create timeouts: fail fast instead of hanging requests for
+//   knex's default 60s during a database outage
+// Tarn requires max >= 1 and min <= max; clamp so a bad env value can not
+// produce a pool that fails every acquire
+const poolMax = Math.max(1, intFromEnv("DATABASE_POOL_MAX", 10));
+const poolMin = Math.min(intFromEnv("DATABASE_POOL_MIN", 0), poolMax);
+const pool = {
+  min: poolMin,
+  max: poolMax,
+  idleTimeoutMillis: intFromEnv("DATABASE_IDLE_TIMEOUT_MS", 30000),
+  createTimeoutMillis: intFromEnv("DATABASE_CREATE_TIMEOUT_MS", 15000),
+};
+const acquireConnectionTimeout = intFromEnv("DATABASE_ACQUIRE_TIMEOUT_MS", 15000);
+
 interface KnexConfig {
   migrations: { directory: string };
   seeds: { directory: string };
   databaseType: string;
   client?: string;
-  connection?: string | { filename: string };
+  connection?: string | { filename: string } | Record<string, unknown>;
   useNullAsDefault?: boolean;
+  pool?: typeof pool;
+  acquireConnectionTimeout?: number;
 }
 
 const knexOb: KnexConfig = {
@@ -25,6 +57,7 @@ const knexOb: KnexConfig = {
   },
   databaseType,
 };
+console.log(`Configuring database with type ${databaseType}`);
 if (databaseType === "sqlite") {
   knexOb.client = "better-sqlite3";
   knexOb.connection = {
@@ -33,10 +66,21 @@ if (databaseType === "sqlite") {
   knexOb.useNullAsDefault = true;
 } else if (databaseType === "postgresql") {
   knexOb.client = "pg";
-  knexOb.connection = databaseURL;
+  knexOb.connection = {
+    connectionString: databaseURL,
+    keepAlive: keepAliveEnabled,
+  };
+  knexOb.pool = pool;
+  knexOb.acquireConnectionTimeout = acquireConnectionTimeout;
 } else if (databaseType === "mysql") {
   knexOb.client = "mysql2";
-  knexOb.connection = databaseURL;
+  knexOb.connection = {
+    uri: databaseURL,
+    enableKeepAlive: keepAliveEnabled,
+    keepAliveInitialDelay: 10000,
+  };
+  knexOb.pool = pool;
+  knexOb.acquireConnectionTimeout = acquireConnectionTimeout;
 } else {
   console.error("Invalid database type");
   process.exit(1);

knip.json

@@ -1,27 +0,0 @@
-{
-  "$schema": "https://unpkg.com/knip@5/schema.json",
-  "entry": ["src/app.html", "build/main.js", "scripts/**/*.{js,ts}", "migrations/**/*.{js,ts}", "seeds/**/*.{js,ts}"],
-  "project": ["src/**/*.{js,ts,svelte}", "scripts/**/*.{js,ts}", "migrations/**/*.{js,ts}", "seeds/**/*.{js,ts}"],
-  "ignore": ["src/lib/components/ui/**"],
-  "ignoreDependencies": [
-    "@babel/runtime",
-    "js-yaml",
-    "mysql2",
-    "node-cache",
-    "pg",
-    "pg-pool",
-    "randomstring",
-    "style-to-object",
-    "lucide-svelte",
-    "marked-gfm-heading-id"
-  ],
-  "ignoreExportsUsedInFile": {
-    "interface": true,
-    "type": true
-  },
-  "ignoreBinaries": [],
-  "compilers": {
-    "css": ["postcss"],
-    "svelte": ["svelte"]
-  }
-}

migrations/20260313030304_add_position_page_monitors.ts

@@ -0,0 +1,19 @@
+import type { Knex } from "knex";
+
+export async function up(knex: Knex): Promise<void> {
+  const hasColumn = await knex.schema.hasColumn("pages_monitors", "position");
+  if (!hasColumn) {
+    await knex.schema.alterTable("pages_monitors", (table) => {
+      table.integer("position").unsigned().notNullable().defaultTo(0);
+    });
+  }
+}
+
+export async function down(knex: Knex): Promise<void> {
+  const hasColumn = await knex.schema.hasColumn("pages_monitors", "position");
+  if (hasColumn) {
+    await knex.schema.alterTable("pages_monitors", (table) => {
+      table.dropColumn("position");
+    });
+  }
+}

migrations/20260325120000_multi_monitor_alerts.ts

@@ -0,0 +1,215 @@
+/**
+ * Migration: Multi-Monitor Alerts
+ *
+ * This migration refactors the monitor alerting system to support many-to-many
+ * relationships between alert configurations and monitors. Previously, each
+ * `monitor_alerts_config` row was tied to exactly one monitor via a `monitor_tag`
+ * foreign key column. This migration:
+ *
+ * 1. Creates a new `monitor_alerts_config_monitors` junction table that links
+ *    `monitor_alerts_config` rows to one or more `monitors` rows, enabling a
+ *    single alert configuration to fire across multiple monitors.
+ *
+ * 2. Adds a `monitor_tag` column to `monitor_alerts_v2` so that each firing
+ *    alert record knows which specific monitor triggered it (important when one
+ *    config covers many monitors).
+ *
+ * 3. Migrates existing data: copies every `monitor_alerts_config.monitor_tag`
+ *    value into the new junction table and backfills `monitor_alerts_v2.monitor_tag`
+ *    from the same source, preserving all historical alert records.
+ *
+ * 4. Removes the one-to-one constraint on `monitor_alerts_config.monitor_tag` by
+ *    dropping its foreign key and setting the column nullable (SQLite workaround:
+ *    nulls the column directly since SQLite cannot drop foreign key constraints
+ *    inline).
+ *
+ * 5. Adds a composite index on `monitor_alerts_v2 (config_id, monitor_tag,
+ *    alert_status)` for fast per-monitor alert status lookups.
+ *
+ * The `down` migration reverses these steps: restores the first junction-table
+ * entry back onto `monitor_alerts_config.monitor_tag`, re-adds the foreign key
+ * (non-SQLite), removes the `monitor_tag` column from `monitor_alerts_v2`
+ * (non-SQLite), and drops the junction table.
+ */
+import type { Knex } from "knex";
+
+export async function up(knex: Knex): Promise<void> {
+  // Step 1: Create monitor_alerts_config_monitors junction table
+  if (!(await knex.schema.hasTable("monitor_alerts_config_monitors"))) {
+    await knex.schema.createTable("monitor_alerts_config_monitors", (table) => {
+      table.integer("monitor_alerts_id").unsigned().notNullable();
+      table.string("monitor_tag", 255).notNullable();
+      table.timestamp("created_at").defaultTo(knex.fn.now());
+      table.timestamp("updated_at").defaultTo(knex.fn.now());
+
+      // Composite primary key
+      table.primary(["monitor_alerts_id", "monitor_tag"]);
+
+      // Foreign keys
+      table.foreign("monitor_alerts_id").references("id").inTable("monitor_alerts_config").onDelete("CASCADE");
+      table.foreign("monitor_tag").references("tag").inTable("monitors").onDelete("CASCADE");
+    });
+  }
+
+  // Step 2: Add monitor_tag column to monitor_alerts_v2 for per-monitor alert tracking
+  const hasV2Column = await knex.schema.hasColumn("monitor_alerts_v2", "monitor_tag");
+  if (!hasV2Column) {
+    await knex.schema.alterTable("monitor_alerts_v2", (table) => {
+      table.string("monitor_tag", 255).nullable();
+      table.foreign("monitor_tag").references("tag").inTable("monitors").onDelete("CASCADE");
+    });
+  }
+
+  // Step 3: Migrate existing data from monitor_alerts_config.monitor_tag to junction table
+  // and backfill monitor_alerts_v2.monitor_tag from the same source
+  const existingConfigs = await knex("monitor_alerts_config").whereNotNull("monitor_tag").select("id", "monitor_tag");
+
+  if (existingConfigs.length > 0) {
+    // Build a config_id -> monitor_tag map for backfilling alerts
+    const configTagMap = new Map<number, string>();
+    const inserts = existingConfigs.map((config: { id: number; monitor_tag: string }) => {
+      configTagMap.set(config.id, config.monitor_tag);
+      return {
+        monitor_alerts_id: config.id,
+        monitor_tag: config.monitor_tag,
+        created_at: knex.fn.now(),
+        updated_at: knex.fn.now(),
+      };
+    });
+
+    // Batch insert into junction table
+    const chunkSize = 100;
+    for (let i = 0; i < inserts.length; i += chunkSize) {
+      await knex("monitor_alerts_config_monitors").insert(inserts.slice(i, i + chunkSize));
+    }
+
+    // Backfill monitor_tag on existing monitor_alerts_v2 rows
+    const existingAlerts = await knex("monitor_alerts_v2").whereNull("monitor_tag").select("id", "config_id");
+    for (const alert of existingAlerts) {
+      const tag = configTagMap.get(alert.config_id);
+      if (tag) {
+        await knex("monitor_alerts_v2").where({ id: alert.id }).update({ monitor_tag: tag });
+      }
+    }
+  }
+
+  // Step 4: Drop foreign key and make monitor_tag nullable on monitor_alerts_config
+  const dbClient = knex.client.config.client;
+
+  if (dbClient === "sqlite3" || dbClient === "better-sqlite3") {
+    // SQLite cannot ALTER COLUMN, so we rebuild the table with monitor_tag nullable
+    await knex.transaction(async (trx) => {
+      await trx.raw("PRAGMA foreign_keys = OFF");
+      await trx.raw("DROP TABLE IF EXISTS monitor_alerts_config_new");
+      await trx.raw(`
+        CREATE TABLE monitor_alerts_config_new (
+          id INTEGER PRIMARY KEY AUTOINCREMENT,
+          monitor_tag VARCHAR(255),
+          alert_for VARCHAR(50) NOT NULL,
+          alert_value VARCHAR(255) NOT NULL,
+          failure_threshold INTEGER NOT NULL DEFAULT 1,
+          success_threshold INTEGER NOT NULL DEFAULT 1,
+          alert_description TEXT,
+          create_incident VARCHAR(10) NOT NULL DEFAULT 'NO',
+          is_active VARCHAR(10) NOT NULL DEFAULT 'YES',
+          severity VARCHAR(50) NOT NULL DEFAULT 'WARNING',
+          created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+          updated_at DATETIME DEFAULT CURRENT_TIMESTAMP
+        )
+      `);
+      await trx.raw(`
+        INSERT INTO monitor_alerts_config_new
+          (id, monitor_tag, alert_for, alert_value, failure_threshold,
+           success_threshold, alert_description, create_incident,
+           is_active, severity, created_at, updated_at)
+        SELECT
+          id, NULL, alert_for, alert_value, failure_threshold,
+          success_threshold, alert_description, create_incident,
+          is_active, severity, created_at, updated_at
+        FROM monitor_alerts_config
+      `);
+      await trx.raw("DROP TABLE monitor_alerts_config");
+      await trx.raw("ALTER TABLE monitor_alerts_config_new RENAME TO monitor_alerts_config");
+      try {
+        await trx.raw("CREATE INDEX idx_monitor_alerts_config_monitor_tag ON monitor_alerts_config (monitor_tag)");
+      } catch (_e) {
+        /* index may already exist */
+      }
+      try {
+        await trx.raw("CREATE INDEX idx_monitor_alerts_config_is_active ON monitor_alerts_config (is_active)");
+      } catch (_e) {
+        /* index may already exist */
+      }
+      await trx.raw("PRAGMA foreign_keys = ON");
+    });
+  } else {
+    try {
+      await knex.schema.alterTable("monitor_alerts_config", (table) => {
+        table.dropForeign(["monitor_tag"]);
+      });
+    } catch (_e) {
+      // Foreign key may not exist or already dropped
+    }
+
+    await knex.schema.alterTable("monitor_alerts_config", (table) => {
+      table.string("monitor_tag", 255).nullable().alter();
+    });
+
+    await knex("monitor_alerts_config").update({ monitor_tag: null });
+  }
+
+  // Step 5: Add composite index on monitor_alerts_v2 for fast lookups
+  try {
+    await knex.raw(
+      "CREATE INDEX idx_monitor_alerts_v2_config_tag_status ON monitor_alerts_v2 (config_id, monitor_tag, alert_status)",
+    );
+  } catch (_e) {
+    /* index already exists */
+  }
+}
+
+export async function down(knex: Knex): Promise<void> {
+  // Step 1: Drop the composite index on monitor_alerts_v2
+  try {
+    await knex.raw("DROP INDEX IF EXISTS idx_monitor_alerts_v2_config_tag_status");
+  } catch (_e) {
+    /* index may not exist */
+  }
+
+  // Step 2: Copy first monitor_tag from junction table back to monitor_alerts_config
+  const configs = await knex("monitor_alerts_config").select("id");
+
+  for (const config of configs) {
+    const firstMonitor = await knex("monitor_alerts_config_monitors").where({ monitor_alerts_id: config.id }).first();
+
+    if (firstMonitor) {
+      await knex("monitor_alerts_config").where({ id: config.id }).update({ monitor_tag: firstMonitor.monitor_tag });
+    }
+  }
+
+  // Step 3: Delete configs that have no monitors (can't satisfy NOT NULL)
+  await knex("monitor_alerts_config").whereNull("monitor_tag").del();
+
+  // Step 4: Re-add foreign key constraint on monitor_alerts_config (non-SQLite only)
+  const dbClient = knex.client.config.client;
+  if (dbClient !== "sqlite3" && dbClient !== "better-sqlite3") {
+    await knex.schema.alterTable("monitor_alerts_config", (table) => {
+      table.string("monitor_tag", 255).notNullable().alter();
+      table.foreign("monitor_tag").references("tag").inTable("monitors").onDelete("CASCADE");
+    });
+  }
+
+  // Step 5: Drop monitor_tag column from monitor_alerts_v2 (non-SQLite only)
+  const hasV2Column = await knex.schema.hasColumn("monitor_alerts_v2", "monitor_tag");
+  if (hasV2Column) {
+    if (dbClient !== "sqlite3" && dbClient !== "better-sqlite3") {
+      await knex.schema.alterTable("monitor_alerts_v2", (table) => {
+        table.dropForeign(["monitor_tag"]);
+        table.dropColumn("monitor_tag");
+      });
+    }
+  }
+
+  // Step 6: Drop junction table
+  await knex.schema.dropTableIfExists("monitor_alerts_config_monitors");
+}

migrations/20260328120000_fix_sqlite_monitor_alerts_config_nullable.ts

@@ -0,0 +1,144 @@
+/**
+ * Migration: Fix SQLite monitor_alerts_config.monitor_tag NOT NULL constraint
+ *
+ * The earlier migration 20260325120000_multi_monitor_alerts nulled out data in
+ * monitor_alerts_config.monitor_tag for SQLite but could not alter the column
+ * constraint (SQLite doesn't support ALTER COLUMN). This migration recreates
+ * the table with monitor_tag as nullable, preserving all data and indexes.
+ *
+ * Only runs on SQLite/better-sqlite3; other databases already had the column
+ * altered in the previous migration.
+ */
+import type { Knex } from "knex";
+
+export async function up(knex: Knex): Promise<void> {
+  const dbClient = knex.client.config.client;
+  if (dbClient !== "sqlite3" && dbClient !== "better-sqlite3") {
+    return; // Already handled by 20260325120000_multi_monitor_alerts
+  }
+
+  // Check if monitor_tag is already nullable (migration 1 already rebuilt the table)
+  const tableInfo: Array<{ name: string; notnull: number }> = await knex.raw(
+    "PRAGMA table_info(monitor_alerts_config)",
+  );
+  const monitorTagCol = tableInfo.find((col) => col.name === "monitor_tag");
+  if (monitorTagCol && monitorTagCol.notnull === 0) {
+    return; // Column is already nullable, nothing to do
+  }
+
+  // Column is still NOT NULL — rebuild the table to make it nullable
+  try {
+    await knex.transaction(async (trx) => {
+      await trx.raw("PRAGMA foreign_keys = OFF");
+      await trx.raw("DROP TABLE IF EXISTS monitor_alerts_config_new");
+      await trx.raw(`
+        CREATE TABLE monitor_alerts_config_new (
+          id INTEGER PRIMARY KEY AUTOINCREMENT,
+          monitor_tag VARCHAR(255),
+          alert_for VARCHAR(50) NOT NULL,
+          alert_value VARCHAR(255) NOT NULL,
+          failure_threshold INTEGER NOT NULL DEFAULT 1,
+          success_threshold INTEGER NOT NULL DEFAULT 1,
+          alert_description TEXT,
+          create_incident VARCHAR(10) NOT NULL DEFAULT 'NO',
+          is_active VARCHAR(10) NOT NULL DEFAULT 'YES',
+          severity VARCHAR(50) NOT NULL DEFAULT 'WARNING',
+          created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+          updated_at DATETIME DEFAULT CURRENT_TIMESTAMP
+        )
+      `);
+
+      await trx.raw(`
+        INSERT INTO monitor_alerts_config_new
+          (id, monitor_tag, alert_for, alert_value, failure_threshold,
+           success_threshold, alert_description, create_incident,
+           is_active, severity, created_at, updated_at)
+        SELECT
+          id, NULL, alert_for, alert_value, failure_threshold,
+          success_threshold, alert_description, create_incident,
+          is_active, severity, created_at, updated_at
+        FROM monitor_alerts_config
+      `);
+
+      await trx.raw("DROP TABLE monitor_alerts_config");
+      await trx.raw("ALTER TABLE monitor_alerts_config_new RENAME TO monitor_alerts_config");
+
+      try {
+        await trx.raw("CREATE INDEX idx_monitor_alerts_config_monitor_tag ON monitor_alerts_config (monitor_tag)");
+      } catch (_e) {
+        /* index may already exist */
+      }
+      try {
+        await trx.raw("CREATE INDEX idx_monitor_alerts_config_is_active ON monitor_alerts_config (is_active)");
+      } catch (_e) {
+        /* index may already exist */
+      }
+      await trx.raw("PRAGMA foreign_keys = ON");
+    });
+  } catch (e) {
+    await knex.raw("PRAGMA foreign_keys = ON");
+    throw e;
+  }
+}
+
+export async function down(knex: Knex): Promise<void> {
+  const dbClient = knex.client.config.client;
+  if (dbClient !== "sqlite3" && dbClient !== "better-sqlite3") {
+    return;
+  }
+
+  // Revert: make monitor_tag NOT NULL again via table rebuild
+  try {
+    await knex.transaction(async (trx) => {
+      await trx.raw("PRAGMA foreign_keys = OFF");
+      await trx.raw(`
+				CREATE TABLE monitor_alerts_config_old (
+					id INTEGER PRIMARY KEY AUTOINCREMENT,
+					monitor_tag VARCHAR(255) NOT NULL,
+					alert_for VARCHAR(50) NOT NULL,
+					alert_value VARCHAR(255) NOT NULL,
+					failure_threshold INTEGER NOT NULL DEFAULT 1,
+					success_threshold INTEGER NOT NULL DEFAULT 1,
+					alert_description TEXT,
+					create_incident VARCHAR(10) NOT NULL DEFAULT 'NO',
+					is_active VARCHAR(10) NOT NULL DEFAULT 'YES',
+					severity VARCHAR(50) NOT NULL DEFAULT 'WARNING',
+					created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+					updated_at DATETIME DEFAULT CURRENT_TIMESTAMP
+				)
+			`);
+
+      // Only copy rows that have a non-null monitor_tag
+      await trx.raw(`
+				INSERT INTO monitor_alerts_config_old
+					(id, monitor_tag, alert_for, alert_value, failure_threshold,
+					 success_threshold, alert_description, create_incident,
+					 is_active, severity, created_at, updated_at)
+				SELECT
+					id, monitor_tag, alert_for, alert_value, failure_threshold,
+					success_threshold, alert_description, create_incident,
+					is_active, severity, created_at, updated_at
+				FROM monitor_alerts_config
+				WHERE monitor_tag IS NOT NULL
+			`);
+
+      await trx.raw("DROP TABLE monitor_alerts_config");
+      await trx.raw("ALTER TABLE monitor_alerts_config_old RENAME TO monitor_alerts_config");
+
+      try {
+        await trx.raw("CREATE INDEX idx_monitor_alerts_config_monitor_tag ON monitor_alerts_config (monitor_tag)");
+      } catch (_e) {
+        /* index may already exist */
+      }
+      try {
+        await trx.raw("CREATE INDEX idx_monitor_alerts_config_is_active ON monitor_alerts_config (is_active)");
+      } catch (_e) {
+        /* index may already exist */
+      }
+      await trx.raw("PRAGMA foreign_keys = ON");
+    });
+  } catch (e) {
+    await knex.raw("PRAGMA foreign_keys = ON");
+    throw e;
+  }
+}

migrations/20260330120000_add_rbac_tables.ts

@@ -0,0 +1,58 @@
+import type { Knex } from "knex";
+
+export async function up(knex: Knex): Promise<void> {
+  // 1. Roles table
+  if (!(await knex.schema.hasTable("roles"))) {
+    await knex.schema.createTable("roles", (table) => {
+      table.string("id", 100).primary();
+      table.text("role_name").notNullable();
+      table.integer("readonly").notNullable().defaultTo(0);
+      table.string("status", 20).notNullable().defaultTo("ACTIVE");
+      table.timestamp("created_at").defaultTo(knex.fn.now());
+      table.timestamp("updated_at").defaultTo(knex.fn.now());
+    });
+  }
+
+  // 2. Permissions table
+  if (!(await knex.schema.hasTable("permissions"))) {
+    await knex.schema.createTable("permissions", (table) => {
+      table.string("id", 100).primary();
+      table.text("permission_name").notNullable();
+      table.timestamp("created_at").defaultTo(knex.fn.now());
+      table.timestamp("updated_at").defaultTo(knex.fn.now());
+    });
+  }
+
+  // 3. Roles ↔ Permissions junction table
+  if (!(await knex.schema.hasTable("roles_permissions"))) {
+    await knex.schema.createTable("roles_permissions", (table) => {
+      table.string("roles_id", 100).notNullable().references("id").inTable("roles").onDelete("CASCADE");
+      table.string("permissions_id", 100).notNullable().references("id").inTable("permissions").onDelete("CASCADE");
+      table.string("status", 20).notNullable().defaultTo("ACTIVE");
+      table.timestamp("created_at").defaultTo(knex.fn.now());
+      table.timestamp("updated_at").defaultTo(knex.fn.now());
+
+      table.primary(["roles_id", "permissions_id"]);
+    });
+  }
+
+  // 4. Users ↔ Roles junction table
+  if (!(await knex.schema.hasTable("users_roles"))) {
+    await knex.schema.createTable("users_roles", (table) => {
+      table.string("roles_id", 100).notNullable().references("id").inTable("roles").onDelete("CASCADE");
+      table.integer("users_id").unsigned().notNullable().references("id").inTable("users").onDelete("CASCADE");
+      table.timestamp("created_at").defaultTo(knex.fn.now());
+      table.timestamp("updated_at").defaultTo(knex.fn.now());
+
+      table.primary(["roles_id", "users_id"]);
+      table.index("users_id", "idx_users_roles_users_id");
+    });
+  }
+}
+
+export async function down(knex: Knex): Promise<void> {
+  await knex.schema.dropTableIfExists("users_roles");
+  await knex.schema.dropTableIfExists("roles_permissions");
+  await knex.schema.dropTableIfExists("permissions");
+  await knex.schema.dropTableIfExists("roles");
+}

migrations/20260331120000_remove_role_from_users.ts

@@ -0,0 +1,94 @@
+import type { Knex } from "knex";
+
+// Maps the legacy users.role string to the new roles.id value.
+// The old default was "user"; everything unmapped falls back to "member".
+const ROLE_MAP: Record<string, string> = {
+  admin: "admin",
+  editor: "editor",
+  member: "member",
+  user: "member",
+};
+
+export async function up(knex: Knex): Promise<void> {
+  const hasColumn = await knex.schema.hasColumn("users", "role");
+  if (!hasColumn) return;
+
+  // 1. Ensure the three target roles exist so FK inserts succeed.
+  //    Seeds will reconcile permissions later; we only need the rows.
+  const rolesToEnsure = [
+    { id: "admin", role_name: "Administrator" },
+    { id: "editor", role_name: "Editor" },
+    { id: "member", role_name: "Member" },
+  ];
+  for (const role of rolesToEnsure) {
+    const exists = await knex("roles").where("id", role.id).first();
+    if (!exists) {
+      await knex("roles").insert({
+        id: role.id,
+        role_name: role.role_name,
+        readonly: 1,
+        status: "ACTIVE",
+        created_at: knex.fn.now(),
+        updated_at: knex.fn.now(),
+      });
+    }
+  }
+
+  // 2. Read users.role into memory BEFORE dropping the column.
+  //    On SQLite, dropColumn recreates the table (create → copy → drop → rename),
+  //    which can discard DML inserts to tables with FKs pointing at users.
+  const users: Array<{ id: number; role: string }> = await knex("users").select("id", "role");
+
+  // 3. Drop the column first.
+  await knex.schema.alterTable("users", (table) => {
+    table.dropColumn("role");
+  });
+
+  // 4. Now populate users_roles from the in-memory snapshot.
+  for (const user of users) {
+    const newRoleId = ROLE_MAP[user.role] ?? "member";
+
+    const alreadyAssigned = await knex("users_roles").where({ roles_id: newRoleId, users_id: user.id }).first();
+
+    if (!alreadyAssigned) {
+      await knex("users_roles").insert({
+        roles_id: newRoleId,
+        users_id: user.id,
+        created_at: knex.fn.now(),
+        updated_at: knex.fn.now(),
+      });
+    }
+  }
+}
+
+// Reverse map: pick the highest-precedence role when backfilling.
+const REVERSE_ROLE_PRECEDENCE: string[] = ["admin", "editor", "member"];
+
+export async function down(knex: Knex): Promise<void> {
+  const hasColumn = await knex.schema.hasColumn("users", "role");
+  if (!hasColumn) {
+    await knex.schema.alterTable("users", (table) => {
+      table.string("role").defaultTo("member");
+    });
+  }
+
+  // Backfill users.role from users_roles using deterministic precedence
+  const assignments: Array<{ users_id: number; roles_id: string }> = await knex("users_roles").select(
+    "users_id",
+    "roles_id",
+  );
+
+  // Group roles by user
+  const userRolesMap = new Map<number, string[]>();
+  for (const row of assignments) {
+    const list = userRolesMap.get(row.users_id) || [];
+    list.push(row.roles_id);
+    userRolesMap.set(row.users_id, list);
+  }
+
+  // Pick highest-precedence role for each user
+  for (const [userId, roleIds] of userRolesMap) {
+    const bestRole = REVERSE_ROLE_PRECEDENCE.find((r) => roleIds.includes(r)) || roleIds[0] || "member";
+    await knex("users").where("id", userId).update({ role: bestRole });
+  }
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kener",
-  "version": "4.0.14",
+  "version": "4.0.23",
   "type": "module",
   "private": false,
   "license": "MIT",
@@ -55,7 +55,7 @@
     "@lucide/svelte": "^0.561.0",
     "@sveltejs/adapter-auto": "^7.0.0",
     "@sveltejs/adapter-node": "^5.4.0",
-    "@sveltejs/kit": "^2.48.5",
+    "@sveltejs/kit": "^2.53.3",
     "@sveltejs/vite-plugin-svelte": "^6.2.1",
     "@tailwindcss/typography": "^0.5.19",
     "@tailwindcss/vite": "^4.1.17",
@@ -64,6 +64,7 @@
     "@types/d3-shape": "^3.1.8",
     "@types/dns2": "^2.0.10",
     "@types/express": "^5.0.6",
+    "@types/heic-convert": "^2.1.0",
     "@types/jsonwebtoken": "^9.0.10",
     "@types/mustache": "^4.2.6",
     "@types/node": "^25.0.3",
@@ -79,7 +80,7 @@
     "prettier": "^3.7.4",
     "prettier-plugin-svelte": "^3.4.0",
     "prettier-plugin-tailwindcss": "^0.7.2",
-    "svelte": "^5.43.8",
+    "svelte": "^5.53.5",
     "svelte-awesome-color-picker": "^4.1.0",
     "svelte-check": "^4.3.4",
     "svelte-sonner": "^1.0.7",
@@ -112,6 +113,8 @@
     "@codemirror/state": "^6.5.4",
     "@codemirror/view": "^6.39.11",
     "@formkit/auto-animate": "^0.9.0",
+    "@grpc/grpc-js": "^1.14.3",
+    "@grpc/proto-loader": "^0.8.0",
     "@humanspeak/svelte-purify": "^0.0.6",
     "@number-flow/svelte": "^0.3.9",
     "@scalar/express-api-reference": "^0.8.28",
@@ -137,6 +140,7 @@
     "front-matter": "^4.0.2",
     "gamedig": "^5.3.2",
     "glob": "^13.0.6",
+    "heic-convert": "^2.1.0",
     "highlight.js": "^11.11.1",
     "ioredis": "^5.8.2",
     "js-yaml": "^4.1.1",
@@ -168,5 +172,15 @@
     "style-to-object": "^1.0.14",
     "svelte-codemirror-editor": "^2.1.0",
     "vite-plugin-package-version": "^1.1.0"
+  },
+  "overrides": {
+    "fast-xml-parser": "^5.5.6",
+    "rollup": "^4.59.0",
+    "undici": "^7.24.0",
+    "minimatch": "^10.2.3",
+    "devalue": "^5.6.4",
+    "dompurify": "^3.3.2",
+    "cookie": "^0.7.0",
+    "mailparser": "^3.9.3"
   }
 }

render.yaml

@@ -0,0 +1,35 @@
+services:
+  - type: web
+    name: kener
+    runtime: image
+    image:
+      url: docker.io/rajnandan1/kener:latest
+    envVars:
+      - key: DATABASE_URL
+        fromDatabase:
+          name: kener-db
+          property: connectionString
+      - key: KENER_SECRET_KEY
+        generateValue: true
+      - key: ORIGIN
+        fromService:
+          type: web
+          name: kener
+          envVarKey: RENDER_EXTERNAL_URL
+      - key: REDIS_URL
+        fromService:
+          name: kener-redis
+          type: keyvalue
+          property: connectionString
+  - type: keyvalue
+    name: kener-redis
+    plan: starter
+    ipAllowList:
+      - source: 0.0.0.0/0
+        description: everywhere
+    maxmemoryPolicy: allkeys-lru
+
+databases:
+  - name: kener-db
+    plan: basic-256mb
+    databaseName: kener

scripts/clean-translations.js

@@ -1,247 +0,0 @@
-import fs from "node:fs";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-import { globSync } from "glob";
-import yaml from "js-yaml";
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-const projectRoot = path.resolve(__dirname, "..");
-const localesDir = path.join(projectRoot, "src", "lib", "locales");
-
-const WHITELISTED_DYNAMIC_KEYS = new Set([
-  "All Systems Operational",
-  "Degraded Performance",
-  "Partial Degraded Performance",
-  "Partial System Outage",
-  "Major System Outage",
-  "No Status Available",
-]);
-
-function fail(message) {
-  throw new Error(message);
-}
-
-function isPlainObject(value) {
-  return value !== null && typeof value === "object" && !Array.isArray(value);
-}
-
-function parseArgs(argv) {
-  let reportPath;
-
-  for (let i = 0; i < argv.length; i += 1) {
-    const arg = argv[i];
-
-    if (arg === "--report") {
-      const next = argv[i + 1];
-      if (!next || next.startsWith("--")) {
-        fail("Missing value for --report. Usage: --report <path>");
-      }
-      reportPath = next;
-      i += 1;
-      continue;
-    }
-
-    if (arg.startsWith("--report=")) {
-      reportPath = arg.slice("--report=".length);
-      if (!reportPath) {
-        fail("Missing value for --report. Usage: --report <path>");
-      }
-      continue;
-    }
-
-    fail(`Unknown argument: ${arg}`);
-  }
-
-  return { reportPath };
-}
-
-function detectReportPath(overridePath) {
-  if (overridePath) {
-    const resolved = path.resolve(projectRoot, overridePath);
-    if (!fs.existsSync(resolved)) {
-      fail(`Report file not found: ${resolved}`);
-    }
-    return resolved;
-  }
-
-  const jsonPath = path.join(projectRoot, "translation-report.json");
-  const yamlPath = path.join(projectRoot, "translation-report.yaml");
-
-  if (fs.existsSync(jsonPath)) return jsonPath;
-  if (fs.existsSync(yamlPath)) return yamlPath;
-
-  fail(
-    "Could not find translation report. Expected translation-report.json or translation-report.yaml in project root, or use --report <path>.",
-  );
-}
-
-function loadReport(reportPath) {
-  const ext = path.extname(reportPath).toLowerCase();
-  const raw = fs.readFileSync(reportPath, "utf8");
-
-  let parsed;
-  try {
-    if (ext === ".json") {
-      parsed = JSON.parse(raw);
-    } else if (ext === ".yaml" || ext === ".yml") {
-      parsed = yaml.load(raw);
-    } else {
-      fail(`Unsupported report file extension: ${ext}. Use .json, .yaml, or .yml.`);
-    }
-  } catch (error) {
-    fail(`Failed to parse report at ${reportPath}: ${error instanceof Error ? error.message : String(error)}`);
-  }
-
-  if (!isPlainObject(parsed)) {
-    fail("Invalid report format: expected a top-level object.");
-  }
-
-  if (!isPlainObject(parsed.locales)) {
-    fail("Invalid report format: expected report.locales to be an object.");
-  }
-
-  return parsed;
-}
-
-function getUnusedKeysForLocale(report, localeFileName) {
-  const localeReport = report.locales[localeFileName];
-
-  if (localeReport === undefined) return [];
-
-  if (!isPlainObject(localeReport)) {
-    fail(`Invalid report format for locales.${localeFileName}: expected an object.`);
-  }
-
-  const { unused } = localeReport;
-
-  if (unused === undefined) return [];
-
-  if (!Array.isArray(unused)) {
-    fail(`Invalid report format for locales.${localeFileName}.unused: expected an array.`);
-  }
-
-  const nonStrings = unused.filter((key) => typeof key !== "string");
-  if (nonStrings.length > 0) {
-    fail(`Invalid report format for locales.${localeFileName}.unused: all entries must be strings.`);
-  }
-
-  return unused;
-}
-
-function loadLocaleJson(localePath, localeFileName) {
-  const raw = fs.readFileSync(localePath, "utf8");
-
-  let parsed;
-  try {
-    parsed = JSON.parse(raw);
-  } catch (error) {
-    fail(`Invalid JSON in ${localeFileName}: ${error instanceof Error ? error.message : String(error)}`);
-  }
-
-  if (!isPlainObject(parsed)) {
-    fail(`Invalid locale file ${localeFileName}: expected a top-level object.`);
-  }
-
-  if (!isPlainObject(parsed.mappings)) {
-    fail(`Invalid locale file ${localeFileName}: expected \"mappings\" to be an object.`);
-  }
-
-  return parsed;
-}
-
-function sortObjectKeysAscending(input) {
-  const keys = Object.keys(input).sort((a, b) => a.localeCompare(b));
-  const result = {};
-  for (const key of keys) {
-    result[key] = input[key];
-  }
-  return result;
-}
-
-function replaceMappingsPreserveTopLevelOrder(localeData, sortedMappings) {
-  const next = {};
-  let sawMappings = false;
-
-  for (const key of Object.keys(localeData)) {
-    if (key === "mappings") {
-      next[key] = sortedMappings;
-      sawMappings = true;
-    } else {
-      next[key] = localeData[key];
-    }
-  }
-
-  if (!sawMappings) {
-    next.mappings = sortedMappings;
-  }
-
-  return next;
-}
-
-function cleanTranslations(report) {
-  if (!fs.existsSync(localesDir)) {
-    fail(`Locales directory not found: ${localesDir}`);
-  }
-
-  const localeFiles = globSync("*.json", {
-    cwd: localesDir,
-    nodir: true,
-  }).sort((a, b) => a.localeCompare(b));
-
-  if (localeFiles.length === 0) {
-    fail(`No locale files found in ${localesDir}`);
-  }
-
-  let totalRemoved = 0;
-  const perFile = [];
-
-  for (const localeFileName of localeFiles) {
-    const localePath = path.join(localesDir, localeFileName);
-    const localeData = loadLocaleJson(localePath, localeFileName);
-    const unusedKeys = getUnusedKeysForLocale(report, localeFileName);
-    const unusedSet = new Set(unusedKeys.filter((key) => !WHITELISTED_DYNAMIC_KEYS.has(key)));
-
-    const currentMappings = localeData.mappings;
-    const cleanedMappings = {};
-
-    let removedCount = 0;
-    for (const [key, value] of Object.entries(currentMappings)) {
-      if (unusedSet.has(key)) {
-        removedCount += 1;
-      } else {
-        cleanedMappings[key] = value;
-      }
-    }
-
-    const sortedMappings = sortObjectKeysAscending(cleanedMappings);
-    const nextLocaleData = replaceMappingsPreserveTopLevelOrder(localeData, sortedMappings);
-
-    fs.writeFileSync(localePath, `${JSON.stringify(nextLocaleData, null, 2)}\n`, "utf8");
-
-    totalRemoved += removedCount;
-    perFile.push({ file: localeFileName, removed: removedCount });
-  }
-
-  for (const item of perFile) {
-    console.log(`${item.file}: removed ${item.removed} key${item.removed === 1 ? "" : "s"}`);
-  }
-  console.log(`Total removed: ${totalRemoved}`);
-}
-
-function main() {
-  const { reportPath: reportArg } = parseArgs(process.argv.slice(2));
-  const reportPath = detectReportPath(reportArg);
-  const report = loadReport(reportPath);
-
-  console.log(`Using report: ${path.relative(projectRoot, reportPath)}`);
-  cleanTranslations(report);
-}
-
-try {
-  main();
-} catch (error) {
-  console.error("Failed to clean translations.");
-  console.error(error instanceof Error ? error.message : String(error));
-  process.exitCode = 1;
-}

scripts/main.ts

@@ -1,93 +1,141 @@
-import { handler } from "../build/handler.js";
 import dotenv from "dotenv";
 dotenv.config();
+
 import express from "express";
 import Startup from "../src/lib/server/startup.ts";
 import shutdownSchedulers from "../src/lib/server/schedulers/shutdown.ts";
 import shutdownQueues from "../src/lib/server/queues/shutdown.ts";
 import dbInstance from "../src/lib/server/db/db.ts";
+import { redisConnection } from "../src/lib/server/redisConnector.ts";
 import knex from "knex";
 import knexOb from "../knexfile.js";
 
 const PORT = process.env.PORT || 3000;
 const base = process.env.KENER_BASE_PATH || "";
 
-const app: any = express();
-const db = knex(knexOb);
+async function start() {
+  // Dynamic import so BODY_SIZE_LIMIT from .env is available
+  // before the handler reads it at module top-level
+  const { handler } = await import("../build/handler.js");
 
-app.get(base + "/healthcheck", (req: any, res: any) => {
-  res.end("ok");
-});
+  const app: any = express();
+  const db = knex(knexOb);
 
-app.use(handler);
-
-//migrations
-async function runMigrations() {
-  try {
-    // Rename old .js migration entries to .ts in the knex_migrations table
-    // so Knex can find the renamed files on disk
-    const hasTable = await db.schema.hasTable("knex_migrations");
-    if (hasTable) {
-      const oldJsMigrations = await db("knex_migrations").where("name", "like", "%.js");
-      for (const row of oldJsMigrations) {
-        const newName = row.name.replace(/\.js$/, ".ts");
-        await db("knex_migrations").where("id", row.id).update({ name: newName });
-        console.log(`Renamed migration record: ${row.name} -> ${newName}`);
-      }
+  // Caps a health probe at 2s so a wedged dependency can not hang the
+  // endpoint. A probe is healthy unless it throws, times out, or resolves false.
+  const probe = async (check: () => Promise<unknown>): Promise<boolean> => {
+    let timer: ReturnType<typeof setTimeout> | undefined;
+    try {
+      const result = await Promise.race([
+        check(),
+        new Promise((_, reject) => {
+          timer = setTimeout(() => reject(new Error("health probe timeout")), 2000);
+        }),
+      ]);
+      return result !== false;
+    } catch {
+      return false;
+    } finally {
+      clearTimeout(timer);
     }
+  };
 
-    console.log("Running migrations...");
-    await db.migrate.latest(); // Runs migrations to the latest state
-    console.log("Migrations completed successfully!");
-  } catch (err) {
-    console.error("Error running migrations:", err);
+  // Reports component health. Always 200 so healthcheck-driven restarters do
+  // not bounce the app while a dependency is down (a restart can not fix a
+  // dead database); pass ?strict=1 to get 503 when any component is down.
+  app.get(base + "/healthcheck", async (req: any, res: any) => {
+    const [dbOk, redisOk] = await Promise.all([
+      probe(() => dbInstance.ping()),
+      // Guard on status before PING: the shared ioredis client has
+      // maxRetriesPerRequest null, so commands sent while disconnected would
+      // queue forever and accumulate across healthcheck polls
+      probe(async () => {
+        const redis = redisConnection();
+        if (redis.status !== "ready") return false;
+        return await redis.ping();
+      }),
+    ]);
+    const healthy = dbOk && redisOk;
+    const strict = req.query.strict === "1";
+    res.status(strict && !healthy ? 503 : 200).json({
+      status: healthy ? "ok" : "degraded",
+      db: dbOk,
+      redis: redisOk,
+    });
+  });
+
+  app.use(handler);
+
+  //migrations
+  async function runMigrations() {
+    try {
+      // Rename old .js migration entries to .ts in the knex_migrations table
+      // so Knex can find the renamed files on disk
+      const hasTable = await db.schema.hasTable("knex_migrations");
+      if (hasTable) {
+        const oldJsMigrations = await db("knex_migrations").where("name", "like", "%.js");
+        for (const row of oldJsMigrations) {
+          const newName = row.name.replace(/\.js$/, ".ts");
+          await db("knex_migrations").where("id", row.id).update({ name: newName });
+          console.log(`Renamed migration record: ${row.name} -> ${newName}`);
+        }
+      }
+
+      console.log("Running migrations...");
+      await db.migrate.latest(); // Runs migrations to the latest state
+      console.log("Migrations completed successfully!");
+    } catch (err) {
+      console.error("Error running migrations:", err);
+    }
   }
+
+  //seed
+  async function runSeed() {
+    try {
+      console.log("Running seed...");
+      await db.seed.run(); // Runs seed to the latest state
+      console.log("Seed completed successfully!");
+    } catch (err) {
+      console.error("Error running seed:", err);
+    }
+  }
+
+  app.listen(PORT, async () => {
+    await runMigrations();
+    await runSeed();
+    await db.destroy();
+    Startup();
+    console.log("Kener is running on port " + PORT + "!");
+  });
+
+  // Graceful shutdown handler
+  async function gracefulShutdown(signal: string) {
+    console.log(`\nReceived ${signal}. Starting graceful shutdown...`);
+
+    try {
+      console.log("Shutting down schedulers...");
+      await shutdownSchedulers();
+      console.log("Schedulers shut down successfully.");
+
+      console.log("Shutting down queues...");
+      await shutdownQueues();
+      console.log("Queues shut down successfully.");
+
+      console.log("Closing database connection...");
+      await dbInstance.close();
+      console.log("Database connection closed successfully.");
+
+      console.log("Graceful shutdown completed.");
+      process.exit(0);
+    } catch (err) {
+      console.error("Error during graceful shutdown:", err);
+      process.exit(1);
+    }
+  }
+
+  // Handle termination signals
+  process.on("SIGTERM", () => gracefulShutdown("SIGTERM"));
+  process.on("SIGINT", () => gracefulShutdown("SIGINT"));
 }
 
-//seed
-async function runSeed() {
-  try {
-    console.log("Running seed...");
-    await db.seed.run(); // Runs seed to the latest state
-    console.log("Seed completed successfully!");
-  } catch (err) {
-    console.error("Error running seed:", err);
-  }
-}
-
-app.listen(PORT, async () => {
-  await runMigrations();
-  await runSeed();
-  await db.destroy();
-  Startup();
-  console.log("Kener is running on port " + PORT + "!");
-});
-
-// Graceful shutdown handler
-async function gracefulShutdown(signal: string) {
-  console.log(`\nReceived ${signal}. Starting graceful shutdown...`);
-
-  try {
-    console.log("Shutting down schedulers...");
-    await shutdownSchedulers();
-    console.log("Schedulers shut down successfully.");
-
-    console.log("Shutting down queues...");
-    await shutdownQueues();
-    console.log("Queues shut down successfully.");
-
-    console.log("Closing database connection...");
-    await dbInstance.close();
-    console.log("Database connection closed successfully.");
-
-    console.log("Graceful shutdown completed.");
-    process.exit(0);
-  } catch (err) {
-    console.error("Error during graceful shutdown:", err);
-    process.exit(1);
-  }
-}
-
-// Handle termination signals
-process.on("SIGTERM", () => gracefulShutdown("SIGTERM"));
-process.on("SIGINT", () => gracefulShutdown("SIGINT"));
+start();

seeds/pages.ts

@@ -30,6 +30,7 @@ export async function seed(knex: Knex): Promise<void> {
             page_id: pageId,
             monitor_tag: "earth",
             monitor_settings_json: "",
+            position: 0,
             created_at: knex.fn.now(),
             updated_at: knex.fn.now(),
           });
@@ -42,6 +43,7 @@ export async function seed(knex: Knex): Promise<void> {
             page_id: pageId,
             monitor_tag: "kener",
             monitor_settings_json: "",
+            position: 1,
             created_at: knex.fn.now(),
             updated_at: knex.fn.now(),
           });

seeds/permissions.ts

@@ -0,0 +1,28 @@
+import type { Knex } from "knex";
+import { permissions } from "../src/lib/allPerms.ts";
+
+export async function seed(knex: Knex): Promise<void> {
+  const permissionIds = new Set(permissions.map((p) => p.id));
+
+  // Get all existing permissions
+  const existing: Array<{ id: string }> = await knex("permissions").select("id");
+  const existingIds = new Set(existing.map((e) => e.id));
+
+  // Insert missing permissions
+  for (const perm of permissions) {
+    if (!existingIds.has(perm.id)) {
+      await knex("permissions").insert({
+        id: perm.id,
+        permission_name: perm.permission_name,
+        created_at: knex.fn.now(),
+        updated_at: knex.fn.now(),
+      });
+    }
+  }
+
+  // Delete permissions that are no longer in the seed list
+  const toDelete = existing.filter((e) => !permissionIds.has(e.id)).map((e) => e.id);
+  if (toDelete.length > 0) {
+    await knex("permissions").whereIn("id", toDelete).del();
+  }
+}

seeds/roles.ts

@@ -0,0 +1,106 @@
+import type { Knex } from "knex";
+import { permissions } from "../src/lib/allPerms.ts";
+
+/**
+ * Seeds the three readonly roles (admin, editor, member),
+ * assigns permissions to each role in roles_permissions,
+ * and migrates existing users.role → users_roles.
+ *
+ * Permission mapping derived from src/routes/(manage)/manage/api/+server.ts:
+ *
+ * admin  → all permissions
+ * editor → all except api_keys.delete (AdminCan-only)
+ * member → all .read permissions only
+ */
+
+const readonlyRoles = [
+  { id: "admin", role_name: "Administrator" },
+  { id: "editor", role_name: "Editor" },
+  { id: "member", role_name: "Member" },
+];
+
+const allPermissionIds = permissions.map((p) => p.id);
+const readPermissionIds = allPermissionIds.filter((id) => id.endsWith(".read"));
+
+const rolePermissions: Record<string, string[]> = {
+  admin: allPermissionIds,
+  editor: allPermissionIds.filter((id) => id !== "api_keys.delete"),
+  member: readPermissionIds,
+};
+
+export async function seed(knex: Knex): Promise<void> {
+  // 1. Ensure readonly roles exist
+  for (const role of readonlyRoles) {
+    const existing = await knex("roles").where("id", role.id).first();
+    if (!existing) {
+      await knex("roles").insert({
+        id: role.id,
+        role_name: role.role_name,
+        readonly: 1,
+        status: "ACTIVE",
+        created_at: knex.fn.now(),
+        updated_at: knex.fn.now(),
+      });
+    }
+  }
+
+  // 2. Seed roles_permissions for readonly roles
+  //    Only insert permissions that actually exist in the permissions table
+  //    to avoid FK constraint errors if permissions seed hasn't run yet.
+  const existingPermRows: Array<{ id: string }> = await knex("permissions").select("id");
+  const existingPermIds = new Set(existingPermRows.map((p) => p.id));
+
+  for (const [roleId, permissionIds] of Object.entries(rolePermissions)) {
+    const validPermissionIds = permissionIds.filter((id) => existingPermIds.has(id));
+
+    const existingPerms: Array<{ permissions_id: string }> = await knex("roles_permissions")
+      .where("roles_id", roleId)
+      .select("permissions_id");
+    const existingSet = new Set(existingPerms.map((e) => e.permissions_id));
+
+    // Insert missing permissions
+    for (const permId of validPermissionIds) {
+      if (!existingSet.has(permId)) {
+        await knex("roles_permissions").insert({
+          roles_id: roleId,
+          permissions_id: permId,
+          status: "ACTIVE",
+          created_at: knex.fn.now(),
+          updated_at: knex.fn.now(),
+        });
+      }
+    }
+
+    // Remove permissions no longer assigned to this role
+    const desiredSet = new Set(validPermissionIds);
+    const toRemove = existingPerms.filter((e) => !desiredSet.has(e.permissions_id)).map((e) => e.permissions_id);
+    if (toRemove.length > 0) {
+      await knex("roles_permissions").where("roles_id", roleId).whereIn("permissions_id", toRemove).del();
+    }
+  }
+
+  // 3. Migrate existing users: read users.role → insert into users_roles
+  const hasRoleColumn = await knex.schema.hasColumn("users", "role");
+  if (hasRoleColumn) {
+    const users: Array<{ id: number; role: string }> = await knex("users").select("id", "role");
+
+    for (const user of users) {
+      if (!user.role) continue;
+
+      // Only migrate if a matching role exists
+      const roleExists = await knex("roles").where("id", user.role).first();
+      if (!roleExists) continue;
+
+      // Skip if already assigned
+      const existing = await knex("users_roles").where({ roles_id: user.role, users_id: user.id }).first();
+      if (!existing) {
+        await knex("users_roles").insert({
+          roles_id: user.role,
+          users_id: user.id,
+          created_at: knex.fn.now(),
+          updated_at: knex.fn.now(),
+        });
+      }
+    }
+  }
+}

skills-lock.json

@@ -0,0 +1,10 @@
+{
+  "version": 1,
+  "skills": {
+    "ss-shadcn-svelte": {
+      "source": "rajnandan1/such-skills",
+      "sourceType": "github",
+      "computedHash": "0678d0cad0bce1d56731c9613e75f2d274810ad2a17ecea2d21434b6416c90b7"
+    }
+  }
+}

src/app.html

@@ -3,6 +3,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta property="og:locale" content="en_US" />
     %sveltekit.head%
   </head>
   <body data-sveltekit-preload-data="hover">

src/error.html

@@ -0,0 +1,73 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta http-equiv="refresh" content="30" />
+    <title>%sveltekit.status% — Status page temporarily unavailable</title>
+    <style>
+      :root {
+        color-scheme: light dark;
+        --bg: #ffffff;
+        --fg: #09090b;
+        --muted: #71717a;
+        --border: #e4e4e7;
+      }
+      @media (prefers-color-scheme: dark) {
+        :root {
+          --bg: #09090b;
+          --fg: #fafafa;
+          --muted: #a1a1aa;
+          --border: #27272a;
+        }
+      }
+      body {
+        margin: 0;
+        min-height: 100vh;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background: var(--bg);
+        color: var(--fg);
+        font-family:
+          ui-sans-serif,
+          system-ui,
+          -apple-system,
+          "Segoe UI",
+          Roboto,
+          sans-serif;
+      }
+      .card {
+        max-width: 28rem;
+        margin: 1rem;
+        padding: 2rem;
+        border: 1px solid var(--border);
+        border-radius: 1rem;
+        text-align: center;
+      }
+      h1 {
+        font-size: 1.25rem;
+        margin: 0 0 0.5rem;
+      }
+      p {
+        color: var(--muted);
+        font-size: 0.875rem;
+        line-height: 1.5;
+        margin: 0.25rem 0;
+      }
+      .code {
+        color: var(--muted);
+        font-size: 0.75rem;
+        margin-top: 1.25rem;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="card">
+      <h1>This status page is temporarily unavailable</h1>
+      <p>We are having trouble serving this page right now. It usually resolves on its own.</p>
+      <p>This page will retry automatically in 30 seconds.</p>
+      <div class="code">%sveltekit.status%</div>
+    </div>
+  </body>
+</html>

src/hooks.server.ts

@@ -1,4 +1,5 @@
 import { json, type Handle } from "@sveltejs/kit";
+import { sequence } from "@sveltejs/kit/hooks";
 import { VerifyAPIKey } from "$lib/server/controllers/apiController";
 import db from "$lib/server/db/db";
 import type { UnauthorizedResponse, NotFoundResponse } from "$lib/types/api";
@@ -58,7 +59,38 @@ function extractPagePath(pathname: string): string | null {
   return match ? decodeURIComponent(match[1]) : null;
 }
 
-export const handle: Handle = async ({ event, resolve }) => {
+// Content types that indicate a form submission (mirrors SvelteKit's internal CSRF check scope)
+const FORM_CONTENT_TYPES = ["application/x-www-form-urlencoded", "multipart/form-data", "text/plain"];
+
+function isFormContentType(request: Request): boolean {
+  const type = request.headers.get("content-type")?.split(";", 1)[0].trim()?.toLowerCase() ?? "";
+  return FORM_CONTENT_TYPES.includes(type);
+}
+
+// Custom CSRF handler: validates Origin when present, allows requests when absent.
+// When Origin is absent (e.g. Referrer-Policy: no-referrer), security relies on
+// SameSite=Lax cookies which prevent cross-site POST from carrying auth cookies.
+const csrfHandle: Handle = async ({ event, resolve }) => {
+  const { request } = event;
+
+  if (
+    isFormContentType(request) &&
+    (request.method === "POST" || request.method === "PUT" || request.method === "PATCH" || request.method === "DELETE")
+  ) {
+    const requestOrigin = request.headers.get("origin");
+    if (requestOrigin && requestOrigin !== "null") {
+      const requestHost = new URL(requestOrigin).host;
+      const expectedHost = event.url.host;
+      if (requestHost !== expectedHost) {
+        return new Response(`Cross-site ${request.method} form submissions are forbidden`, { status: 403 });
+      }
+    }
+  }
+
+  return resolve(event);
+};
+
+const apiAuthHandle: Handle = async ({ event, resolve }) => {
   const { pathname } = event.url;
 
   // Check if this is an API route that requires authentication
@@ -160,3 +192,5 @@ export const handle: Handle = async ({ event, resolve }) => {
   response.headers.delete("Link");
   return response;
 };
+
+export const handle = sequence(csrfHandle, apiAuthHandle);

src/lib/allPerms.ts

@@ -0,0 +1,274 @@
+/**
+ * Permissions derived from src/routes/(manage)/manage/api/+server.ts actions.
+ * Grouped by domain with read/write granularity.
+ *
+ * Mapping from actions → permissions:
+ *
+ * monitors.read      → getMonitors, getMonitoringDataPaginated
+ * monitors.write     → storeMonitorData, updateMonitoringData, deleteMonitor, deleteMonitorData, cloneMonitor, testMonitor
+ *
+ * incidents.read     → getIncidents, getIncident, getComments
+ * incidents.write    → createIncident, updateIncident, deleteIncident, addMonitor, removeMonitor, addComment, deleteComment, updateComment
+ *
+ * maintenances.read  → getMaintenances, getMaintenance, getMaintenanceEvents, getMaintenanceEvent, getMaintenanceMonitors
+ * maintenances.write → createMaintenance, updateMaintenance, deleteMaintenance, createMaintenanceEvent, updateMaintenanceEvent, deleteMaintenanceEvent, addMonitorToMaintenance, removeMonitorFromMaintenance, updateMaintenanceMonitorImpact
+ *
+ * pages.read         → getPages
+ * pages.write        → createPage, updatePage, deletePage, addMonitorToPage, removeMonitorFromPage, reorderPageMonitors
+ *
+ * triggers.read      → getTriggers
+ * triggers.write     → createUpdateTrigger, updateMonitorTriggers, deleteTrigger, testTrigger
+ *
+ * alerts.read        → getMonitorAlertConfig, getMonitorAlertConfigById, getMonitorAlertConfigsByMonitorTag, getAlertConfigsPaginated, getAllAlertsPaginated
+ * alerts.write       → createMonitorAlertConfig, updateMonitorAlertConfig, deleteMonitorAlertConfig, toggleMonitorAlertConfigStatus, deleteMonitorAlertV2, updateMonitorAlertV2Status
+ *
+ * api_keys.read      → getAPIKeys
+ * api_keys.write     → createNewApiKey, updateApiKeyStatus
+ * api_keys.delete    → deleteApiKey (admin-only today)
+ *
+ * users.read         → getUsers
+ * users.write        → manualUpdate, createNewUser, resendInvitation, sendVerificationEmail
+ *
+ * settings.read      → getAllSiteData, getSiteDataByKey, getSubscriptionsConfig
+ * settings.write     → storeSiteData, updateSubscriptionsConfig
+ *
+ * subscribers.read   → getSubscribersByMethod, getSubscriberWithSubscriptions, getSubscriberCountsByMethod, getAdminSubscribers
+ * subscribers.write  → deleteUserSubscription, updateUserSubscriptionStatus, adminUpdateSubscriptionStatus, adminDeleteSubscriber, adminAddSubscriber
+ *
+ * email_templates.read  → getGeneralEmailTemplates, getGeneralEmailTemplateById
+ * email_templates.write → updateGeneralEmailTemplate
+ *
+ * images.write       → uploadImage, deleteImage
+ */
+export const permissions: Array<{ id: string; permission_name: string }> = [
+  // Monitors
+  { id: "monitors.read", permission_name: "View monitors and monitoring data" },
+  { id: "monitors.write", permission_name: "Create, update, delete, and clone monitors" },
+
+  // Incidents
+  { id: "incidents.read", permission_name: "View incidents and comments" },
+  { id: "incidents.write", permission_name: "Create, update, and delete incidents and comments" },
+
+  // Maintenances
+  { id: "maintenances.read", permission_name: "View maintenances and events" },
+  { id: "maintenances.write", permission_name: "Create, update, and delete maintenances and events" },
+
+  // Pages
+  { id: "pages.read", permission_name: "View pages" },
+  { id: "pages.write", permission_name: "Create, update, and delete pages" },
+
+  // Triggers
+  { id: "triggers.read", permission_name: "View triggers" },
+  { id: "triggers.write", permission_name: "Create, update, delete, and test triggers" },
+
+  // Alerts
+  { id: "alerts.read", permission_name: "View alert configurations and alert history" },
+  { id: "alerts.write", permission_name: "Create, update, and delete alert configurations" },
+
+  // API Keys
+  { id: "api_keys.read", permission_name: "View API keys" },
+  { id: "api_keys.write", permission_name: "Create and update API keys" },
+  { id: "api_keys.delete", permission_name: "Delete API keys" },
+
+  // Users
+  { id: "users.read", permission_name: "View users" },
+  { id: "users.write", permission_name: "Manage users, invitations, and verification" },
+
+  // Settings (site data + subscriptions config)
+  { id: "settings.read", permission_name: "View site settings and subscriptions config" },
+  { id: "settings.write", permission_name: "Update site settings and subscriptions config" },
+
+  // Subscribers
+  { id: "subscribers.read", permission_name: "View subscribers" },
+  { id: "subscribers.write", permission_name: "Manage subscribers and subscriptions" },
+
+  // Email Templates
+  { id: "email_templates.read", permission_name: "View email templates" },
+  { id: "email_templates.write", permission_name: "Update email templates" },
+
+  // Images
+  { id: "images.write", permission_name: "Upload and delete images" },
+
+  // Roles
+  { id: "roles.read", permission_name: "View roles, permissions, and user assignments" },
+  { id: "roles.write", permission_name: "Create, update, and delete roles" },
+  { id: "roles.assign_permissions", permission_name: "Add and remove permissions from roles" },
+  { id: "roles.assign_users", permission_name: "Add and remove users to and from roles" },
+];
+
+export const ACTION_PERMISSION_MAP: Record<string, string | null> = {
+  // Self-actions — no permission needed beyond being logged in
+  updateUser: null,
+  updatePassword: null,
+  sendVerificationEmail: null, // controller has its own self-vs-other check
+
+  // Settings
+  getAllSiteData: "settings.read",
+  getSiteDataByKey: "settings.read",
+  getSubscriptionsConfig: "settings.read",
+  storeSiteData: "settings.write",
+  updateSubscriptionsConfig: "settings.write",
+
+  // Users
+  getUsers: "users.read",
+  manualUpdate: "users.write",
+  createNewUser: "users.write",
+  resendInvitation: "users.write",
+
+  // Monitors
+  getMonitors: "monitors.read",
+  getMonitoringDataPaginated: "monitors.read",
+  storeMonitorData: "monitors.write",
+  updateMonitoringData: "monitors.write",
+  deleteMonitor: "monitors.write",
+  deleteMonitorData: "monitors.write",
+  cloneMonitor: "monitors.write",
+  testMonitor: "monitors.write",
+
+  // Incidents
+  getIncidents: "incidents.read",
+  getIncident: "incidents.read",
+  getComments: "incidents.read",
+  createIncident: "incidents.write",
+  updateIncident: "incidents.write",
+  deleteIncident: "incidents.write",
+  addMonitor: "incidents.write",
+  removeMonitor: "incidents.write",
+  addComment: "incidents.write",
+  deleteComment: "incidents.write",
+  updateComment: "incidents.write",
+
+  // Maintenances
+  getMaintenances: "maintenances.read",
+  getMaintenance: "maintenances.read",
+  getMaintenanceEvents: "maintenances.read",
+  getMaintenanceEvent: "maintenances.read",
+  getMaintenanceMonitors: "maintenances.read",
+  createMaintenance: "maintenances.write",
+  updateMaintenance: "maintenances.write",
+  deleteMaintenance: "maintenances.write",
+  createMaintenanceEvent: "maintenances.write",
+  updateMaintenanceEvent: "maintenances.write",
+  deleteMaintenanceEvent: "maintenances.write",
+  addMonitorToMaintenance: "maintenances.write",
+  removeMonitorFromMaintenance: "maintenances.write",
+  updateMaintenanceMonitorImpact: "maintenances.write",
+
+  // Pages
+  getPages: "pages.read",
+  createPage: "pages.write",
+  updatePage: "pages.write",
+  deletePage: "pages.write",
+  addMonitorToPage: "pages.write",
+  removeMonitorFromPage: "pages.write",
+  reorderPageMonitors: "pages.write",
+
+  // Triggers
+  getTriggers: "triggers.read",
+  createUpdateTrigger: "triggers.write",
+  updateMonitorTriggers: "triggers.write",
+  deleteTrigger: "triggers.write",
+  testTrigger: "triggers.write",
+
+  // Alerts
+  getAllAlertsPaginated: "alerts.read",
+  getMonitorAlertConfig: "alerts.read",
+  getMonitorAlertConfigById: "alerts.read",
+  getMonitorAlertConfigsByMonitorTag: "alerts.read",
+  getAlertConfigsPaginated: "alerts.read",
+  createMonitorAlertConfig: "alerts.write",
+  updateMonitorAlertConfig: "alerts.write",
+  deleteMonitorAlertConfig: "alerts.write",
+  toggleMonitorAlertConfigStatus: "alerts.write",
+  deleteMonitorAlertV2: "alerts.write",
+  updateMonitorAlertV2Status: "alerts.write",
+
+  // API Keys
+  getAPIKeys: "api_keys.read",
+  createNewApiKey: "api_keys.write",
+  updateApiKeyStatus: "api_keys.write",
+  deleteApiKey: "api_keys.delete",
+
+  // Subscribers
+  getSubscribersByMethod: "subscribers.read",
+  getSubscriberWithSubscriptions: "subscribers.read",
+  getSubscriberCountsByMethod: "subscribers.read",
+  getAdminSubscribers: "subscribers.read",
+  deleteUserSubscription: "subscribers.write",
+  updateUserSubscriptionStatus: "subscribers.write",
+  adminUpdateSubscriptionStatus: "subscribers.write",
+  adminDeleteSubscriber: "subscribers.write",
+  adminAddSubscriber: "subscribers.write",
+
+  // Email Templates
+  getGeneralEmailTemplates: "email_templates.read",
+  getGeneralEmailTemplateById: "email_templates.read",
+  updateGeneralEmailTemplate: "email_templates.write",
+
+  // Images
+  uploadImage: "images.write",
+  deleteImage: "images.write",
+
+  // Roles
+  getRoles: "roles.read",
+  getAllPermissions: "roles.read",
+  getRolePermissions: "roles.read",
+  getRoleUsers: "roles.read",
+  createRole: "roles.write",
+  updateRole: "roles.write",
+  deleteRole: "roles.write",
+  updateRolePermissions: "roles.assign_permissions",
+  addUserToRole: "roles.assign_users",
+  removeUserFromRole: "roles.assign_users",
+};
+
+export const ROUTE_PERMISSION_MAP: Record<string, string | null> = {
+  // Monitors
+  "/(manage)/manage/app/monitors": "monitors.read",
+  "/(manage)/manage/app/monitors/[tag]": "monitors.read",
+  "/(manage)/manage/app/monitoring-data": "monitors.read",
+
+  // Incidents
+  "/(manage)/manage/app/incidents": "incidents.read",
+  "/(manage)/manage/app/incidents/[incident_id]": "incidents.read",
+
+  // Maintenances
+  "/(manage)/manage/app/maintenances": "maintenances.read",
+  "/(manage)/manage/app/maintenances/[id]": "maintenances.read",
+
+  // Pages
+  "/(manage)/manage/app/pages": "pages.read",
+  "/(manage)/manage/app/pages/[page_id]": "pages.read",
+
+  // Triggers
+  "/(manage)/manage/app/triggers": "triggers.read",
+  "/(manage)/manage/app/triggers/[trigger_id]": "triggers.read",
+
+  // Alerts
+  "/(manage)/manage/app/alerts": "alerts.read",
+  "/(manage)/manage/app/alerts/[alert_config_id]": "alerts.read",
+  "/(manage)/manage/app/alerts/logs/[alert_config_id]": "alerts.read",
+
+  // API Keys
+  "/(manage)/manage/app/api-keys": "api_keys.read",
+
+  // Users
+  "/(manage)/manage/app/users": "users.read",
+
+  // Settings
+  "/(manage)/manage/app/site-configurations": "settings.read",
+  "/(manage)/manage/app/customizations": "settings.read",
+  "/(manage)/manage/app/internationalization": "settings.read",
+  "/(manage)/manage/app/analytics-providers": "settings.read",
+  "/(manage)/manage/app/badges": "settings.read",
+  "/(manage)/manage/app/embed": "settings.read",
+
+  // Subscribers
+  "/(manage)/manage/app/subscriptions": "subscribers.read",
+
+  // Email Templates
+  "/(manage)/manage/app/templates": "email_templates.read",
+
+  // Roles
+  "/(manage)/manage/app/roles": "roles.read",
+};

src/lib/client/resolver.ts

@@ -31,3 +31,39 @@ export default function urlResolve(resolve: ResolveFn, path: string, params?: Re
   }
   return resolve(path);
 }
+
+/**
+ * Resolves a path to an absolute URL by prefixing the site URL.
+ * Required for meta tags like og:image and twitter:image that need absolute URLs.
+ * @param resolve - The resolve function from $app/paths
+ * @param siteUrl - The site URL (e.g., "https://status.example.com")
+ * @param path - The route path or absolute URL
+ * @param params - Optional parameters for dynamic route segments
+ * @returns An absolute URL, or the resolved relative URL if siteUrl is empty
+ *
+ * @example
+ * ```ts
+ * absoluteResolve(resolve, "https://status.example.com", "/uploads/preview.png")
+ * // => "https://status.example.com/uploads/preview.png"
+ * ```
+ */
+export function absoluteResolve(
+  resolve: ResolveFn,
+  siteUrl: string,
+  path: string,
+  params?: Record<string, string>
+): string {
+  // Normalize relative paths like "./assets/..." to "/assets/..." so the
+  // final URL doesn't contain "/./" segments (crawlers don't normalize these)
+  const normalizedPath = path.startsWith("./") ? path.slice(1) : path;
+  const resolved = urlResolve(resolve, normalizedPath, params);
+  // Already absolute, return as-is
+  if (resolved.startsWith("http://") || resolved.startsWith("https://")) {
+    return resolved;
+  }
+  if (!siteUrl) {
+    return resolved;
+  }
+  const trimmedSiteUrl = siteUrl.replace(/\/+$/, "");
+  return trimmedSiteUrl + (resolved.startsWith("/") ? resolved : "/" + resolved);
+}

src/lib/components/AllMaintenanceMonitorGrid.svelte

@@ -1,188 +0,0 @@
-<script lang="ts">
-  import { Badge } from "$lib/components/ui/badge/index.js";
-  import Clock from "@lucide/svelte/icons/clock";
-  import CalendarClock from "@lucide/svelte/icons/calendar-clock";
-  import Timer from "@lucide/svelte/icons/timer";
-  import { t } from "$lib/stores/i18n";
-  import { formatDate, formatDuration } from "$lib/stores/datetime";
-  import { resolve } from "$app/paths";
-  import clientResolver from "$lib/client/resolver.js";
-
-  interface Maintenance {
-    id: number;
-    title: string;
-    description?: string | null;
-    start_date_time: number;
-    end_date_time: number;
-    monitor_tag?: string;
-  }
-
-  interface Props {
-    ongoingMaintenances?: Maintenance[];
-    upcomingMaintenances?: Maintenance[];
-    pastMaintenances?: Maintenance[];
-    class?: string;
-  }
-
-  let {
-    ongoingMaintenances = [],
-    upcomingMaintenances = [],
-    pastMaintenances = [],
-    class: className = ""
-  }: Props = $props();
-
-  // Deduplicate maintenances by id (can have duplicates due to multiple monitors)
-  function deduplicateMaintenances(maintenances: Maintenance[]): Maintenance[] {
-    const seen = new Set<number>();
-    return maintenances.filter((m) => {
-      if (seen.has(m.id)) return false;
-      seen.add(m.id);
-      return true;
-    });
-  }
-
-  // Deduplicated arrays
-  let uniqueOngoing = $derived(deduplicateMaintenances(ongoingMaintenances));
-  let uniqueUpcoming = $derived(deduplicateMaintenances(upcomingMaintenances));
-  let uniquePast = $derived(deduplicateMaintenances(pastMaintenances));
-
-  // Check if there's any maintenance data
-  let hasAnyData = $derived(uniqueOngoing.length > 0 || uniqueUpcoming.length > 0 || uniquePast.length > 0);
-</script>
-
-{#if hasAnyData}
-  <div class="bg-background rounded-3xl border {className}">
-    <div class=" flex items-center justify-between p-4">
-      <Badge variant="secondary" class="gap-1">{$t("Maintenances")}</Badge>
-    </div>
-
-    <div class="grid grid-cols-1 gap-0 lg:grid-cols-3">
-      <!-- Ongoing Maintenances -->
-      <div class="flex flex-col lg:border-r">
-        <div class="text-muted-foreground bg-secondary flex items-center justify-between gap-2 p-4 text-sm font-medium">
-          <div class="flex items-center gap-2">
-            <div class="bg-maintenance h-2 w-2 rounded-full"></div>
-            {$t("Ongoing")}
-          </div>
-          <div class="text-maintenance">
-            <span>{uniqueOngoing.length}</span>
-          </div>
-        </div>
-        <div class="scrollbar-hidden max-h-64 overflow-y-auto">
-          {#if uniqueOngoing.length === 0}
-            <p class="text-muted-foreground py-4 text-center text-xs">{$t("No ongoing maintenances")}</p>
-          {:else}
-            {#each uniqueOngoing as maintenance (maintenance.id)}
-              <a
-                href={clientResolver(resolve, `/maintenances/${maintenance.id}`)}
-                class="hover:bg-muted/50 block border-b p-3 transition-colors last:border-0"
-              >
-                <h4 class="line-clamp-2 text-sm leading-tight font-medium">{maintenance.title}</h4>
-                {#if maintenance.description}
-                  <p class="text-muted-foreground mt-1 line-clamp-3 text-xs leading-relaxed">
-                    {maintenance.description}
-                  </p>
-                {/if}
-                <div class="text-muted-foreground mt-2 flex flex-wrap items-center gap-x-3 gap-y-1 text-xs">
-                  <span class="flex items-center gap-1">
-                    <Clock class="h-3 w-3" />
-                    {$formatDate(maintenance.start_date_time, "MMM d, HH:mm")}
-                  </span>
-                  <span class="flex items-center gap-1">
-                    <Timer class="h-3 w-3" />
-                    {$formatDuration(maintenance.start_date_time, maintenance.end_date_time)}
-                  </span>
-                </div>
-              </a>
-            {/each}
-          {/if}
-        </div>
-      </div>
-
-      <!-- Upcoming Maintenances -->
-      <div class="flex flex-col lg:border-r">
-        <div class="text-muted-foreground bg-secondary flex items-center justify-between gap-2 p-4 text-sm font-medium">
-          <div class="flex items-center gap-2">
-            <div class="bg-primary h-2 w-2 rounded-full"></div>
-            {$t("Upcoming")}
-          </div>
-          <div>
-            {uniqueUpcoming.length}
-          </div>
-        </div>
-        <div class="scrollbar-hidden max-h-64 overflow-y-auto">
-          {#if uniqueUpcoming.length === 0}
-            <p class="text-muted-foreground py-4 text-center text-xs">{$t("No upcoming maintenances")}</p>
-          {:else}
-            {#each uniqueUpcoming as maintenance (maintenance.id)}
-              <a
-                href={clientResolver(resolve, `/maintenances/${maintenance.id}`)}
-                class="hover:bg-muted/50 block border-b p-3 transition-colors last:border-0"
-              >
-                <h4 class="line-clamp-2 text-sm leading-tight font-medium">{maintenance.title}</h4>
-                {#if maintenance.description}
-                  <p class="text-muted-foreground mt-1 line-clamp-3 text-xs leading-relaxed">
-                    {maintenance.description}
-                  </p>
-                {/if}
-                <div class="text-muted-foreground mt-2 flex flex-wrap items-center gap-x-3 gap-y-1 text-xs">
-                  <span class="flex items-center gap-1">
-                    <CalendarClock class="h-3 w-3" />
-                    {$formatDate(maintenance.start_date_time, "MMM d, HH:mm")}
-                  </span>
-                  <span class="flex items-center gap-1">
-                    <Timer class="h-3 w-3" />
-                    {$formatDuration(maintenance.start_date_time, maintenance.end_date_time)}
-                  </span>
-                </div>
-              </a>
-            {/each}
-          {/if}
-        </div>
-      </div>
-
-      <!-- Past Maintenances -->
-      <div class="flex flex-col">
-        <div class="text-muted-foreground bg-secondary flex items-center justify-between gap-2 p-4 text-sm font-medium">
-          <div class="flex items-center gap-2">
-            <div class="bg-muted-foreground h-2 w-2 rounded-full"></div>
-
-            {$t("Past")}
-          </div>
-          <div>
-            {uniquePast.length}
-          </div>
-        </div>
-        <div class="scrollbar-hidden max-h-64 overflow-y-auto">
-          {#if uniquePast.length === 0}
-            <p class="text-muted-foreground py-4 text-center text-xs">{$t("No past maintenances")}</p>
-          {:else}
-            {#each uniquePast as maintenance (maintenance.id)}
-              <a
-                href={clientResolver(resolve, `/maintenances/${maintenance.id}`)}
-                class="hover:bg-muted/50 block border-b p-3 transition-colors last:border-0"
-              >
-                <h4 class="line-clamp-2 text-sm leading-tight font-medium">{maintenance.title}</h4>
-                {#if maintenance.description}
-                  <p class="text-muted-foreground mt-1 line-clamp-3 text-xs leading-relaxed">
-                    {maintenance.description}
-                  </p>
-                {/if}
-                <div class="text-muted-foreground mt-2 flex flex-wrap items-center gap-x-3 gap-y-1 text-xs">
-                  <span class="flex items-center gap-1">
-                    <Clock class="h-3 w-3" />
-                    {$formatDate(maintenance.start_date_time, "MMM d, HH:mm")}
-                  </span>
-                  <span class="flex items-center gap-1">
-                    <Timer class="h-3 w-3" />
-                    {$formatDuration(maintenance.start_date_time, maintenance.end_date_time)}
-                  </span>
-                </div>
-              </a>
-            {/each}
-          {/if}
-        </div>
-      </div>
-    </div>
-  </div>
-{/if}

src/lib/components/GroupMonitorPopover.svelte

@@ -41,7 +41,7 @@
     </Drawer.Trigger>
     <Drawer.Content class="max-h-[80vh]">
       <Drawer.Header>
-        <Drawer.Title>{$t("Included Monitors")}</Drawer.Title>
+        <Drawer.Title>{$t("Included Monitors (%count)", { count: String(tags.length) })}</Drawer.Title>
       </Drawer.Header>
       <div class="scrollbar-hidden flex flex-col overflow-y-auto px-4 pb-4">
         {#if tags.length === 0}

src/lib/components/IncidentItem.svelte

@@ -105,7 +105,7 @@
       class="mt-2 flex w-full flex-col gap-2 text-xs font-medium sm:flex-row sm:items-center sm:justify-between"
     >
       <span class="max-w-full rounded-full border px-3 py-2 wrap-break-word">
-        {$formatDate(incident.start_date_time, "PPp")}
+        {$formatDate(incident.start_date_time, page.data.dateAndTimeFormat.datePlusTime)}
       </span>
       <span class="relative w-full text-center sm:flex-1">
         <span
@@ -117,7 +117,7 @@
       </span>
       {#if incident.end_date_time}
         <span class="max-w-full rounded-full border px-3 py-2 wrap-break-word">
-          {$formatDate(incident.end_date_time, "PPp")}
+          {$formatDate(incident.end_date_time, page.data.dateAndTimeFormat.datePlusTime)}
         </span>
       {:else}
         <span class="max-w-full rounded-full border px-3 py-2 wrap-break-word">
@@ -129,7 +129,7 @@
       <div class="my-2 grid grid-cols-1 gap-4 text-xs font-medium sm:grid-cols-3">
         <div class="text-muted-foreground bg-secondary flex items-center justify-between rounded-full border p-2 px-4">
           <span>{$t("Last Updated")}</span>
-          <span>{$formatDate(incident.updated_at, "PPp")}</span>
+          <span>{$formatDate(incident.updated_at, page.data.dateAndTimeFormat.datePlusTime)}</span>
         </div>
         <div class="text-muted-foreground bg-secondary flex items-center justify-between rounded-full border p-2 px-4">
           <span>{$t("Status")}</span>
@@ -167,7 +167,7 @@
                 {$t(comment.state)}
               </Badge>
               <span class="text-muted-foreground text-xs">
-                {$formatDate(comment.commented_at, "PPp")}
+                {$formatDate(comment.commented_at, page.data.dateAndTimeFormat.datePlusTime)}
               </span>
             </div>
             <div

src/lib/components/LatencyTrendChart.svelte

@@ -6,6 +6,7 @@
   import { t } from "$lib/stores/i18n";
   import { ParseLatency } from "$lib/clientTools";
   import { formatDate } from "$lib/stores/datetime";
+  import { page } from "$app/state";
 
   interface ChartPoint {
     date: Date;
@@ -82,7 +83,9 @@
                 ></div>
                 <div class="flex flex-1 flex-col items-start justify-between gap-1 leading-none">
                   <span class="text-muted-foreground text-xs"
-                    >{item.payload?.date ? $formatDate(item.payload.date, "MMM d") : ""}</span
+                    >{item.payload?.date
+                      ? $formatDate(item.payload.date, page.data.dateAndTimeFormat.dateOnly)
+                      : ""}</span
                   >
                   <div class="flex items-center gap-2">
                     <span class="text-foreground font-mono font-medium tabular-nums">

src/lib/components/MaintenanceItem.svelte

@@ -97,7 +97,7 @@
       class="mt-2 flex w-full flex-col gap-2 text-xs font-medium sm:flex-row sm:items-center sm:justify-between"
     >
       <span class="max-w-full rounded-full border px-3 py-2 wrap-break-word">
-        {$formatDate(maintenance.start_date_time, "PPp")}
+        {$formatDate(maintenance.start_date_time, page.data.dateAndTimeFormat.datePlusTime)}
       </span>
       <span class="relative w-full text-center sm:flex-1">
         <span
@@ -108,7 +108,7 @@
         </span>
       </span>
       <span class="max-w-full rounded-full border px-3 py-2 wrap-break-word">
-        {$formatDate(maintenance.end_date_time, "PPp")}
+        {$formatDate(maintenance.end_date_time, page.data.dateAndTimeFormat.datePlusTime)}
       </span>
     </Item.Description>
   </Item.Content>

src/lib/components/MinuteGrid.svelte

@@ -5,6 +5,8 @@
   import TrendingUp from "@lucide/svelte/icons/trending-up";
   import { t } from "$lib/stores/i18n";
   import { formatDate } from "$lib/stores/datetime";
+  import { selectedTimezone } from "$lib/stores/timezone";
+  import { toZonedTime } from "date-fns-tz";
   import * as Tooltip from "$lib/components/ui/tooltip/index.js";
 
   interface MinuteData {
@@ -74,7 +76,7 @@
     const minutesByHour: Map<number, MinuteData[]> = new Map();
 
     for (const minute of minutes) {
-      const date = new Date(minute.timestamp * 1000);
+      const date = toZonedTime(minute.timestamp * 1000, $selectedTimezone);
       const hour = date.getHours();
 
       if (!minutesByHour.has(hour)) {
@@ -319,7 +321,10 @@
         style={tooltipStyle}
       >
         <span class="text-{hoveredMinute.data.status.toLowerCase()}">
-          {$t(hoveredMinute.data.status)} @ {$formatDate(hoveredMinute.data.timestamp, "HH:mm")}
+          {$t(hoveredMinute.data.status)} @ {$formatDate(
+            hoveredMinute.data.timestamp,
+            page.data.dateAndTimeFormat.timeOnly
+          )}
         </span>
       </div>
     {/if}

src/lib/components/MonitorBar.svelte

@@ -1,6 +1,5 @@
 <script lang="ts">
   import * as Item from "$lib/components/ui/item/index.js";
-  import { Button } from "$lib/components/ui/button/index.js";
   import { Skeleton } from "$lib/components/ui/skeleton/index.js";
   import * as Avatar from "$lib/components/ui/avatar/index.js";
   import ICONS from "$lib/icons";
@@ -12,6 +11,7 @@
   import { GetInitials } from "$lib/clientTools.js";
   import GroupMonitorPopover from "./GroupMonitorPopover.svelte";
   import { t } from "$lib/stores/i18n";
+  import { page } from "$app/state";
 
   interface Props {
     tag: string;
@@ -136,11 +136,11 @@
         <StatusBarCalendar data={data.uptimeData} monitorTag={tag} barHeight={40} radius={8} />
         <div class="flex min-w-0 justify-between gap-3">
           <p class="text-muted-foreground min-w-0 truncate text-xs font-medium">
-            {$formatDate(new Date(data.fromTimeStamp * 1000), "MMM d, yyyy")}
+            {$formatDate(new Date(data.fromTimeStamp * 1000), page.data.dateAndTimeFormat.dateOnly)}
           </p>
 
           <p class="text-muted-foreground min-w-0 truncate text-right text-xs font-medium">
-            {$formatDate(new Date(data.toTimeStamp * 1000), "MMM d, yyyy")}
+            {$formatDate(new Date(data.toTimeStamp * 1000), page.data.dateAndTimeFormat.dateOnly)}
           </p>
         </div>
       </div>
@@ -152,8 +152,7 @@
           days={days as number}
           endOfDayTodayAtTz={endOfDayTodayAtTz as number}
         >
-          {groupChildTags.length}
-          {$t("Included Monitors")}
+          {$t("Included Monitors (%count)", { count: String(groupChildTags.length) })}
         </GroupMonitorPopover>
       </div>
     {/if}

src/lib/components/MonitorDayDetail.svelte

@@ -3,24 +3,20 @@
   import * as Tooltip from "$lib/components/ui/tooltip/index.js";
 
   import { resolve } from "$app/paths";
-  import TrendingUp from "@lucide/svelte/icons/trending-up";
   import Clock from "@lucide/svelte/icons/clock";
-  import Activity from "@lucide/svelte/icons/activity";
-  import { Button } from "$lib/components/ui/button/index.js";
   import * as Dialog from "$lib/components/ui/dialog/index.js";
-  import { Badge } from "$lib/components/ui/badge/index.js";
   import { Skeleton } from "$lib/components/ui/skeleton/index.js";
   import LoaderBoxes from "$lib/components/loaderbox.svelte";
-  import constants from "$lib/global-constants.js";
   import * as Tabs from "$lib/components/ui/tabs/index.js";
   import { page } from "$app/state";
   import { AreaChart, Area, LinearGradient } from "layerchart";
   import { curveCatmullRom } from "d3-shape";
-  import { scaleOrdinal, scaleSequential, scaleTime } from "d3-scale";
+  import { scaleTime } from "d3-scale";
   import IncidentItem from "$lib/components/IncidentItem.svelte";
   import MaintenanceItem from "$lib/components/MaintenanceItem.svelte";
   import MinuteGrid from "$lib/components/MinuteGrid.svelte";
   import clientResolver from "$lib/client/resolver.js";
+  import { ParseLatency } from "$lib/clientTools";
 
   import * as Chart from "$lib/components/ui/chart/index.js";
   import type { IncidentForMonitorListWithComments, MaintenanceEventsMonitorList } from "$lib/server/types/db";
@@ -213,9 +209,8 @@
   <Dialog.Content class="max-h-[90vh] overflow-y-auto rounded-3xl p-4 sm:max-w-[46.5rem] sm:p-6">
     <Dialog.Header>
       <Dialog.Title class="flex items-center gap-2 text-base sm:text-lg">
-        <Activity class="h-4 w-4 shrink-0 sm:h-5 sm:w-5" />
         <span class="truncate">
-          {selectedDay ? $formatDate(new Date(selectedDay.timestamp * 1000), "EEEE, MMMM do, yyyy") : ""}
+          {selectedDay ? $formatDate(new Date(selectedDay.timestamp * 1000), page.data.dateAndTimeFormat.dateOnly) : ""}
         </span>
       </Dialog.Title>
       <Dialog.Description class="text-xs sm:text-sm"
@@ -316,7 +311,7 @@
                     line: { class: "stroke-1" }
                   },
                   xAxis: {
-                    format: (d: Date) => $formatDate(d, "HH:mm")
+                    format: (d: Date) => $formatDate(d, page.data.dateAndTimeFormat.timeOnly)
                   }
                 }}
               >
@@ -342,11 +337,13 @@
                         ></div>
                         <div class="flex flex-1 flex-col items-start justify-between gap-1 leading-none">
                           <span class="text-muted-foreground text-xs">
-                            {item.payload?.date ? $formatDate(item.payload.date, "HH:mm") : ""}
+                            {item.payload?.date
+                              ? $formatDate(item.payload.date, page.data.dateAndTimeFormat.timeOnly)
+                              : ""}
                           </span>
                           <div class="flex items-center gap-2">
                             <span class="text-foreground font-mono font-medium tabular-nums">
-                              {Math.round(Number(value))} ms
+                              {ParseLatency(Math.round(Number(value)))}
                             </span>
                           </div>
                         </div>

src/lib/components/MonitorOverview.svelte

@@ -2,7 +2,6 @@
   import { onMount, untrack } from "svelte";
   import * as Card from "$lib/components/ui/card/index.js";
   import { Skeleton } from "$lib/components/ui/skeleton/index.js";
-  import { Badge } from "$lib/components/ui/badge/index.js";
   import * as DropdownMenu from "$lib/components/ui/dropdown-menu/index.js";
   import StatusBarCalendar from "$lib/components/StatusBarCalendar.svelte";
   import LatencyTrendChart from "$lib/components/LatencyTrendChart.svelte";
@@ -18,6 +17,7 @@
   import * as Popover from "$lib/components/ui/popover/index.js";
   import * as ToggleGroup from "$lib/components/ui/toggle-group/index.js";
   import GroupMonitorPopover from "$lib/components/GroupMonitorPopover.svelte";
+  import { page } from "$app/state";
 
   interface Props {
     monitorTag: string;
@@ -205,12 +205,12 @@
         <div class="flex justify-between">
           <p class="text-muted-foreground text-xs font-medium">
             {#if displayData.length > 0}
-              {$formatDate(displayData[0].ts, "d MMM yyyy")}
+              {$formatDate(displayData[0].ts, page.data.dateAndTimeFormat.dateOnly)}
             {/if}
           </p>
           <p class="text-muted-foreground text-xs font-medium">
             {#if displayData.length > 0}
-              {$formatDate(displayData[displayData.length - 1].ts, "d MMM yyyy")}
+              {$formatDate(displayData[displayData.length - 1].ts, page.data.dateAndTimeFormat.dateOnly)}
             {/if}
           </p>
         </div>
@@ -219,7 +219,7 @@
       {#if groupTags.length > 0}
         <div class="flex justify-center">
           <GroupMonitorPopover tags={groupTags} days={selectedDays} {endOfDayTodayAtTz}>
-            {$t("Included Monitors")} ({groupTags.length})
+            {$t("Included Monitors (%count)", { count: String(groupTags.length) })}
             <ArrowUp class="size-3" />
           </GroupMonitorPopover>
         </div>

src/lib/components/MonitorPicker.svelte

@@ -0,0 +1,98 @@
+<script lang="ts">
+  import * as Command from "$lib/components/ui/command/index.js";
+  import * as Popover from "$lib/components/ui/popover/index.js";
+  import { Button } from "$lib/components/ui/button/index.js";
+  import type { MonitorRecord } from "$lib/server/types/db.js";
+  import CheckIcon from "@lucide/svelte/icons/check";
+  import ChevronsUpDownIcon from "@lucide/svelte/icons/chevrons-up-down";
+  import ListPlusIcon from "@lucide/svelte/icons/list-plus";
+  import clientResolver from "$lib/client/resolver.js";
+  import { resolve } from "$app/paths";
+
+  let {
+    monitors = [],
+    selectedTags = [],
+    onToggle,
+    onAddMany,
+    placeholder = "Search monitors to add..."
+  }: {
+    monitors: MonitorRecord[];
+    selectedTags: string[];
+    onToggle: (tag: string) => void;
+    onAddMany?: (tags: string[]) => void;
+    placeholder?: string;
+  } = $props();
+
+  let open = $state(false);
+  let search = $state("");
+
+  // Own filtering (shouldFilter={false}) so "Add all matching" counts stay
+  // consistent with what the list shows. Case-insensitive over name + tag.
+  const filteredMonitors = $derived.by(() => {
+    const query = search.trim().toLowerCase();
+    if (!query) return monitors;
+    return monitors.filter((m) => m.name.toLowerCase().includes(query) || m.tag.toLowerCase().includes(query));
+  });
+
+  const unselectedMatches = $derived(filteredMonitors.filter((m) => !selectedTags.includes(m.tag)));
+  const showAddAll = $derived(!!search.trim() && unselectedMatches.length > 0 && !!onAddMany);
+
+  function addAllMatching() {
+    onAddMany?.(unselectedMatches.map((m) => m.tag));
+  }
+</script>
+
+<Popover.Root bind:open>
+  <Popover.Trigger>
+    {#snippet child({ props })}
+      <Button
+        {...props}
+        variant="outline"
+        role="combobox"
+        aria-expanded={open}
+        class="w-full justify-between font-normal"
+      >
+        <span class="text-muted-foreground">{placeholder}</span>
+        <ChevronsUpDownIcon class="text-muted-foreground size-4 shrink-0" />
+      </Button>
+    {/snippet}
+  </Popover.Trigger>
+  <Popover.Content class="w-[var(--bits-popover-trigger-width)] p-0" align="start">
+    <Command.Root shouldFilter={false}>
+      <Command.Input {placeholder} bind:value={search} />
+      <Command.List class="max-h-64">
+        <Command.Empty>No monitors found.</Command.Empty>
+        <Command.Group>
+          {#each filteredMonitors as monitor (monitor.tag)}
+            {@const selected = selectedTags.includes(monitor.tag)}
+            <Command.Item value={monitor.tag} onSelect={() => onToggle(monitor.tag)}>
+              <CheckIcon class="size-4 {selected ? 'opacity-100' : 'opacity-0'}" />
+              {#if monitor.image}
+                <img
+                  src={clientResolver(resolve, monitor.image)}
+                  alt={monitor.name}
+                  class="size-5 rounded object-cover"
+                />
+              {:else}
+                <div class="bg-muted flex size-5 items-center justify-center rounded text-[10px] font-medium">
+                  {monitor.name.charAt(0).toUpperCase()}
+                </div>
+              {/if}
+              <span class="truncate">{monitor.name}</span>
+              <span class="text-muted-foreground ml-auto truncate text-xs">{monitor.tag}</span>
+            </Command.Item>
+          {/each}
+        </Command.Group>
+        {#if showAddAll}
+          <Command.Separator />
+          <Command.Group>
+            <Command.Item value="__add-all-matching__" onSelect={addAllMatching}>
+              <ListPlusIcon class="size-4" />
+              Add all {unselectedMatches.length} matching
+            </Command.Item>
+          </Command.Group>
+        {/if}
+      </Command.List>
+    </Command.Root>
+  </Popover.Content>
+</Popover.Root>

src/lib/components/NotificationsPopover.svelte

@@ -113,7 +113,7 @@
               <p class="line-clamp-2 text-sm">{item.eventTitle}</p>
             </div>
             <div class="text-muted-foreground mt-1 flex flex-wrap items-center gap-2 text-xs">
-              <span>{$formatDate(item.eventDate, "PPp")}</span>
+              <span>{$formatDate(item.eventDate, page.data.dateAndTimeFormat.datePlusTime)}</span>
 
               <span>•</span>
               <span>{$formatDuration(item.eventStartDateTime, item.eventEndDateTime, $t("Ongoing"))}</span>

src/lib/components/StatusBarCalendar.svelte

@@ -375,7 +375,7 @@
     >
       <span class={getStatusColor(hoveredBar.data)}>{$t(GetStatusSummary(hoveredBar.data))}</span>
       <span class="text-muted-foreground">@</span>
-      {$formatDate(hoveredBar.data.ts, "d MMM yyyy")}
+      {$formatDate(hoveredBar.data.ts, page.data.dateAndTimeFormat.dateOnly)}
       {#if hoveredBar.data.avgLatency > 0}
         <span class="text-muted-foreground ml-1">|</span>
         <span class="ml-1">{ParseLatency(hoveredBar.data.avgLatency)}</span>

src/lib/locales/cs.json

@@ -22,39 +22,39 @@
     "Day": "Den",
     "Day Uptime": "Denní dostupnost",
     "Days": "Dní",
-    "Degraded": "Zhoršený",
-    "DEGRADED": "ZHORŠENÝ",
-    "Degraded Performance": "Zhoršený výkon",
-    "Didn't receive the code? Resend": "Nepřišel vám kód? Odeslat znovu",
-    "Down": "Nedostupný",
-    "DOWN": "VÝPADEK",
+    "Degraded": "Omezený",
+    "DEGRADED": "OMEZENÝ",
+    "Degraded Performance": "Snížený výkon",
+    "Didn't receive the code? Resend": "Nepřišel kód? Odeslat znovu",
+    "Down": "Nedostupné",
+    "DOWN": "NEDOSTUPNÉ",
     "Duration": "Trvání",
     "Edit Monitor": "Upravit monitor",
     "Email address": "E-mailová adresa",
     "Embed Monitor": "Vložit monitor",
-    "Embed this monitor in your website or app": "Vložte tento monitor na svůj web nebo do aplikace",
+    "Embed this monitor in your website or app": "Vložte tento monitor na web nebo do aplikace",
     "End Time": "Konec",
-    "Enter the verification code sent to your email.": "Zadejte ověřovací kód zaslaný na váš e-mail.",
+    "Enter the verification code sent to your email.": "Zadejte ověřovací kód zaslaný na e-mail",
     "Events": "Události",
     "Failed to load data": "Nepodařilo se načíst data",
     "Failed to load latency data": "Nepodařilo se načíst data latence",
     "Failed to load status data for this day": "Nepodařilo se načíst data stavu pro tento den",
     "Failed to send verification code": "Nepodařilo se odeslat ověřovací kód",
-    "Failed to update preference": "Nepodařilo se aktualizovat nastavení",
+    "Failed to update preference": "Nepodařilo se uložit nastavení",
     "Format": "Formát",
     "Get badges for this monitor": "Získat odznaky pro tento monitor",
-    "Get notified about incidents and scheduled maintenance.": "Dostávejte upozornění na incidenty a plánovanou údržbu.",
+    "Get notified about incidents and scheduled maintenance.": "Dostávejte upozornění na incidenty a plánovanou údržbu",
     "Get notified about incidents updates": "Dostávejte upozornění na aktualizace incidentů",
     "Get notified about scheduled maintenance": "Dostávejte upozornění na plánovanou údržbu",
     "Home": "Domů",
     "IDENTIFIED": "IDENTIFIKOVÁNO",
     "iFrame": "iFrame",
     "Impact": "Dopad",
+    "incident": "incident",
     "Incident": "Incident",
     "Incident Updates": "Aktualizace incidentů",
     "Incidents": "Incidenty",
-    "Included Monitors": "Monitorů zahrnuto",
-    "incident": "Incident",
+    "Included Monitors (%count)": "Zahrnuté monitory (%count)",
     "INVESTIGATING": "VYŠETŘOVÁNÍ",
     "Last Updated": "Naposledy aktualizováno",
     "Latency": "Latence",
@@ -62,18 +62,18 @@
     "Latency Over Time": "Latence v čase",
     "Latency Trend": "Trend latence",
     "Latest Latency": "Poslední latence",
-    "Latest Status": "Poslední stav",
+    "Latest Status": "Naposledy zjištěný stav",
     "Light": "Světlý",
     "Live Status": "Aktuální stav",
-    "Loading your preferences...": "Načítám vaše nastavení...",
+    "Loading your preferences...": "Načítání nastavení...",
+    "maintenance": "údržba",
     "Maintenance": "Údržba",
     "MAINTENANCE": "ÚDRŽBA",
-    "maintenance": "Údržba",
     "Maintenance Updates": "Aktualizace údržby",
-    "Maintenances": "Údrždy",
+    "Maintenances": "Údržby",
     "Major System Outage": "Závažný výpadek systému",
     "Manage Site": "Spravovat stránku",
-    "Manage your notification preferences.": "Spravujte svá nastavení oznámení.",
+    "Manage your notification preferences.": "Spravujte nastavení oznámení",
     "Max Latency": "Max. latence",
     "maximum": "maximální",
     "Maximum Latency": "Maximální latence",
@@ -82,33 +82,34 @@
     "Minimum Latency": "Minimální latence",
     "Minute-by-minute status data for this day": "Minutová data stavu pro tento den",
     "MONITORING": "MONITOROVÁNÍ",
-    "Network error. Please try again.": "Chyba sítě. Zkuste to prosím znovu.",
+    "Network error. Please try again.": "Chyba sítě. Zkuste to znovu",
     "No Events in %currentMonth": "V měsíci %currentMonth nejsou plánované žádné události",
     "No events to show": "Žádné události k zobrazení",
     "No incidents for this day": "Pro tento den nejsou evidovány žádné incidenty",
-    "No latency data available for this day": "Pro tento den nejsou k dispozici data latence",
+    "No latency data available for this day": "Pro tento den nejsou dostupná data latence",
     "No maintenances for this day": "Pro tento den není naplánovaná žádná údržba",
     "No monitors affected": "Žádné zasažené monitory",
-    "No monitors available.": "Žádné dostupné monitory.",
+    "No monitors available.": "Žádné dostupné monitory",
     "No ongoing maintenances": "Žádná probíhající údržba",
     "No past maintenances": "Žádná minulá údržba",
     "No Status Available": "Stav není k dispozici",
     "No upcoming maintenances": "Žádná nadcházející údržba",
     "No Updates": "Žádné aktualizace",
-    "No updates yet": "Zatím bez aktualizací",
+    "No updates yet": "Zatím žádné aktualizace",
     "NO_DATA": "Žádná data",
     "Notifications": "Oznámení",
     "One-time": "Jednorázově",
     "Ongoing": "Probíhající",
+    "ONGOING": "PROBÍHAJÍCÍ",
     "Ongoing Maintenances": "Probíhající údržby",
     "Operational": "V provozu",
-    "Partial Degraded Performance": "Částečně zhoršený výkon",
+    "Partial Degraded Performance": "Částečně omezený provoz",
     "Partial System Outage": "Částečný výpadek systému",
     "Past": "Minulé",
     "Per-Minute Status": "Stav po minutách",
     "Pinging": "Pingování",
     "Please enter a valid email address": "Zadejte platnou e-mailovou adresu",
-    "Please enter the 6-digit verification code": "Zadejte prosím 6místný ověřovací kód",
+    "Please enter the 6-digit verification code": "Zadejte 6místný ověřovací kód",
     "Read less": "Zobrazit méně",
     "Read more": "Zobrazit více",
     "READY": "PŘIPRAVENO",
@@ -120,20 +121,20 @@
     "Scheduled Windows": "Naplánované úlohy",
     "Script": "Skript",
     "Select Language": "Vyberte jazyk",
-    "Select latency metric to display": "Vyberte metriku latence k zobrazení",
+    "Select latency metric to display": "Vyberte metriku latence",
     "Select Range": "Vyberte rozsah",
     "Sending...": "Odesílání...",
     "Standard": "Standardní",
     "Start Time": "Začátek",
     "Status": "Stav",
     "Status Badge": "Odznak stavu",
-    "Status Embed": "Status pro vložení",
+    "Status Embed": "Stav pro vložení",
     "Status history and latency trend": "Historie stavu a trend latence",
-    "Subscribe": "Odebírat",
+    "Subscribe": "Přihlásit se k odběru",
     "Subscribe to Updates": "Odebírat aktualizace",
     "Theme": "Motiv",
-    "There are no incidents or maintenances scheduled for this month.": "Na tento měsíc nejsou naplánované incidenty ani údržba.",
-    "There are no ongoing incidents or maintenance events.": "V tuto chvíli neprobíhají žádné incidenty ani údržba.",
+    "There are no incidents or maintenances scheduled for this month.": "Na tento měsíc nejsou naplánované žádné incidenty ani údržby",
+    "There are no ongoing incidents or maintenance events.": "V tuto chvíli neprobíhají žádné incidenty ani údržba",
     "Timeline": "Časová osa",
     "Total Incidents": "Celkem incidentů",
     "Total Maintenances": "Celkem údržeb",
@@ -151,6 +152,6 @@
     "Verification failed": "Ověření se nezdařilo",
     "Verify": "Ověřit",
     "Verifying": "Ověřování",
-    "We sent a 6-digit code to": "Poslali jsme 6místný kód na"
+    "We sent a 6-digit code to": "Odeslali jsme 6místný kód na"
   }
 }

src/lib/locales/de.json

@@ -5,12 +5,12 @@
     "Affected Monitors (%count)": "Betroffene Monitore (%count)",
     "All Systems Operational": "Alle Systeme betriebsbereit",
     "Average Latency": "Durchschnittliche Latenz",
-    "Avg Latency": "Durchschnittliche Latenz",
+    "Avg Latency": "Durchschn. Latenz",
     "Back": "Zurück",
-    "Badges": "Abzeichen",
+    "Badges": "Anzeigen",
     "CANCELLED": "ABGESAGT",
     "COMPLETED": "ABGESCHLOSSEN",
-    "Continue": "Weitermachen",
+    "Continue": "Fortsetzen",
     "Copied": "Kopiert",
     "Current": "Aktuell",
     "Dark": "Dunkel",
@@ -18,32 +18,35 @@
     "Day Uptime": "Tagesverfügbarkeit",
     "Days": "Tage",
     "Degraded": "Beeinträchtigt",
+    "DEGRADED": "BEEINTRÄCHTIGT",
     "Degraded Performance": "Beeinträchtigte Leistung",
-    "Didn't receive the code? Resend": "Sie haben den Code nicht erhalten? ",
+    "Didn't receive the code? Resend": "Sie haben den Code nicht erhalten? Erneut senden",
     "Down": "Ausgefallen",
+    "DOWN": "AUSGEFALLEN",
     "Duration": "Dauer",
     "Email address": "E-Mail-Adresse",
     "Embed Monitor": "Monitor einbetten",
     "Embed this monitor in your website or app": "Betten Sie diesen Monitor in Ihre Website oder App ein",
     "End Time": "Endzeit",
     "Enter the verification code sent to your email.": "Geben Sie den Bestätigungscode ein, der an Ihre E-Mail-Adresse gesendet wurde.",
-    "Events": "Veranstaltungen",
+    "Events": "Ereignisse",
     "Failed to load data": "Daten konnten nicht geladen werden",
     "Failed to load latency data": "Latenzdaten konnten nicht geladen werden",
     "Failed to load status data for this day": "Statusdaten für diesen Tag konnten nicht geladen werden",
     "Failed to send verification code": "Der Bestätigungscode konnte nicht gesendet werden",
     "Failed to update preference": "Die Präferenz konnte nicht aktualisiert werden",
-    "Get badges for this monitor": "Erhalten Sie Abzeichen für diesen Monitor",
+    "Get badges for this monitor": "Erhalten Sie Statusanzeigen für diesen Monitor",
     "Get notified about incidents and scheduled maintenance.": "Lassen Sie sich über Vorfälle und geplante Wartungsarbeiten benachrichtigen.",
     "Get notified about incidents updates": "Lassen Sie sich über Aktualisierungen von Vorfällen benachrichtigen",
     "Get notified about scheduled maintenance": "Lassen Sie sich über geplante Wartungsarbeiten benachrichtigen",
-    "IDENTIFIED": "IDENTIFIED",
+    "IDENTIFIED": "IDENTIFIZIERT",
     "iFrame": "iFrame",
     "Impact": "Auswirkungen",
-    "Incident Updates": "Vorfallaktualisierungen",
-    "Incidents": "Vorfälle",
-    "Included Monitors": "Enthaltene Monitore",
     "incident": "Vorfall",
+    "Incident Updates": "Vorfallsaktualisierungen",
+    "Incidents": "Vorfälle",
+    "Included Monitors (%count)": "Enthaltene Monitore (%count)",
+    "INVESTIGATING": "WIRD UNTERSUCHT",
     "Last Updated": "Zuletzt aktualisiert",
     "Latency": "Latenz",
     "Latency Embed": "Latenz-Einbettung",
@@ -54,19 +57,20 @@
     "Light": "Hell",
     "Live Status": "Live-Status",
     "Loading your preferences...": "Deine Einstellungen werden geladen...",
+    "maintenance": "Wartung",
+    "MAINTENANCE": "WARTUNG",
     "Maintenance Updates": "Wartungsaktualisierungen",
     "Maintenances": "Wartungen",
-    "maintenance": "Wartung",
     "Major System Outage": "Schwerwiegender Systemausfall",
     "Manage Site": "Seite verwalten",
     "Manage your notification preferences.": "Verwalten Sie Ihre Benachrichtigungseinstellungen.",
-    "Max Latency": "Maximale Latenz",
+    "Max Latency": "Max. Latenz",
     "Maximum Latency": "Maximale Latenz",
     "Min Latency": "Min. Latenz",
-    "Minimum Latency": "Min. Latenz",
+    "Minimum Latency": "Minimale Latenz",
     "Minute-by-minute status data for this day": "Minutenweise Statusdaten für diesen Tag",
-    "MONITORING": "MONITORING",
-    "Network error. Please try again.": "Netzwerkfehler. ",
+    "MONITORING": "WIRD ÜBERWACHT",
+    "Network error. Please try again.": "Netzwerkfehler. Bitte erneut versuchen.",
     "No Events in %currentMonth": "Keine Ereignisse in %currentMonth",
     "No events to show": "Keine Ereignisse zum Anzeigen",
     "No incidents for this day": "Keine Vorfälle für diesen Tag",
@@ -79,7 +83,7 @@
     "No Status Available": "Kein Status verfügbar",
     "No upcoming maintenances": "Keine bevorstehenden Wartungsarbeiten",
     "No Updates": "Keine Aktualisierungen",
-    "No updates yet": "Noch keine Updates",
+    "No updates yet": "Noch keine Aktualisierungen",
     "Notifications": "Benachrichtigungen",
     "One-time": "Einmalig",
     "Ongoing": "Laufend",
@@ -95,41 +99,39 @@
     "Read more": "Mehr lesen",
     "READY": "BEREIT",
     "Recurring": "Wiederkehrend",
-    "RESOLVED": "RESOLVED",
+    "RESOLVED": "BEHOBEN",
     "SCHEDULED": "GEPLANT",
     "Scheduled Events (%count)": "Geplante Ereignisse (%count)",
     "Script": "Skript",
-    "Select Language": "Wählen Sie Sprache aus",
-    "Select latency metric to display": "Latenzmetrik zur Anzeige auswählen",
-    "Select Range": "Wählen Sie Bereich aus",
+    "Select Language": "Sprache auswählen",
+    "Select latency metric to display": "Anzuzeigende Latenzmetrik auswählen",
+    "Select Range": "Bereich auswählen",
     "Sending...": "Senden...",
     "Standard": "Standard",
     "Start Time": "Startzeit",
     "Status": "Status",
-    "Status Badge": "Statusabzeichen",
+    "Status Badge": "Statusanzeige",
     "Status Embed": "Status einbetten",
     "Status history and latency trend": "Statusverlauf und Latenztrend",
     "Subscribe": "Abonnieren",
-    "Subscribe to Updates": "Benachrichtigungen erhalten",
+    "Subscribe to Updates": "Benachrichtigungen abonnieren",
     "There are no incidents or maintenances scheduled for this month.": "Für diesen Monat sind keine Vorfälle oder Wartungsarbeiten geplant.",
-    "There are no ongoing incidents or maintenance events.": "Es gibt keine laufenden Vorfälle oder Wartungsereignisse.",
+    "There are no ongoing incidents or maintenance events.": "Es gibt keine laufenden Vorfälle oder Wartungsarbeiten.",
     "Total Incidents": "Gesamtzahl der Vorfälle",
-    "Total Maintenances": "Gesamtwartungen",
+    "Total Maintenances": "Gesamtzahl der Wartungen",
     "Under Maintenance": "Unter Wartung",
     "Unknown impact": "Unbekannte Auswirkung",
-    "Upcoming": "Demnächst",
+    "UP": "AKTIV",
+    "Upcoming": "Anstehend",
+    "Update Incident": "Vorfall aktualisieren",
     "Update Maintenance": "Wartung aktualisieren",
     "Updates": "Aktualisierungen",
     "Updates (%count)": "Aktualisierungen (%count)",
     "Uptime": "Betriebszeit",
-    "Uptime Badge": "Verfügbarkeitsabzeichen",
-    "Verification failed": "Die Überprüfung ist fehlgeschlagen",
+    "Uptime Badge": "Verfügbarkeitsanzeige",
+    "Verification failed": "Überprüfung fehlgeschlagen",
     "Verify": "Verifizieren",
     "Verifying": "Verifizieren",
-    "We sent a 6-digit code to": "Wir haben einen 6-stelligen Code an gesendet",
-    "INVESTIGATING": "WIRD UNTERSUCHT",
-    "IDENTIFIED": "IDENTIFIZIERT",
-    "MONITORING": "WIRD ÜBERWACHT",
-    "RESOLVED": "BEHOBEN"
+    "We sent a 6-digit code to": "Wir haben einen 6-stelligen Code gesendet an"
   }
 }

src/lib/locales/dk.json

@@ -18,9 +18,11 @@
     "Day Uptime": "Dag oppetid",
     "Days": "dage",
     "Degraded": "Forringet",
+    "DEGRADED": "FORRINGET",
     "Degraded Performance": "Nedsat ydeevne",
     "Didn't receive the code? Resend": "Modtog du ikke koden? ",
     "Down": "Nede",
+    "DOWN": "NEDE",
     "Duration": "Varighed",
     "Email address": "E-mailadresse",
     "Embed Monitor": "Integrer skærm",
@@ -40,10 +42,10 @@
     "IDENTIFIED": "IDENTIFIED",
     "iFrame": "iFrame",
     "Impact": "Indvirkning",
+    "incident": "Hændelse",
     "Incident Updates": "Hændelsesopdateringer",
     "Incidents": "Hændelser",
-    "Included Monitors": "Included Monitors",
-    "incident": "Hændelse",
+    "Included Monitors (%count)": "Included Monitors (%count)",
     "INVESTIGATING": "INVESTIGATING",
     "Last Updated": "Sidst opdateret",
     "Latency": "Latency",
@@ -55,9 +57,10 @@
     "Light": "Lys",
     "Live Status": "Live status",
     "Loading your preferences...": "Indlæser dine præferencer...",
+    "maintenance": "Vedligeholdelse",
+    "MAINTENANCE": "VEDLIGEHOLDELSE",
     "Maintenance Updates": "Vedligeholdelsesopdateringer",
     "Maintenances": "Vedligeholdelse",
-    "maintenance": "Vedligeholdelse",
     "Major System Outage": "Større systemnedbrud",
     "Manage Site": "Administrer side",
     "Manage your notification preferences.": "Administrer dine meddelelsespræferencer.",
@@ -118,7 +121,9 @@
     "Total Maintenances": "Samlet vedligeholdelse",
     "Under Maintenance": "Under Vedligeholdelse",
     "Unknown impact": "Ukendt påvirkning",
+    "UP": "OPPE",
     "Upcoming": "Kommende",
+    "Update Incident": "Opdater hændelse",
     "Update Maintenance": "Opdater vedligeholdelse",
     "Updates": "Opdateringer",
     "Updates (%count)": "Opdateringer (%count)",

src/lib/locales/en.json

@@ -18,9 +18,11 @@
     "Day Uptime": "Day Uptime",
     "Days": "Days",
     "Degraded": "Degraded",
+    "DEGRADED": "DEGRADED",
     "Degraded Performance": "Degraded Performance",
     "Didn't receive the code? Resend": "Didn't receive the code? Resend",
     "Down": "Down",
+    "DOWN": "DOWN",
     "Duration": "Duration",
     "Email address": "Email address",
     "Embed Monitor": "Embed Monitor",
@@ -40,10 +42,10 @@
     "IDENTIFIED": "IDENTIFIED",
     "iFrame": "iFrame",
     "Impact": "Impact",
+    "incident": "Incident",
     "Incident Updates": "Incident Updates",
     "Incidents": "Incidents",
-    "Included Monitors": "Included Monitors",
-    "incident": "Incident",
+    "Included Monitors (%count)": "Included Monitors (%count)",
     "INVESTIGATING": "INVESTIGATING",
     "Last Updated": "Last Updated",
     "Latency": "Latency",
@@ -55,9 +57,10 @@
     "Light": "Light",
     "Live Status": "Live Status",
     "Loading your preferences...": "Loading your preferences...",
+    "maintenance": "Maintenance",
+    "MAINTENANCE": "MAINTENANCE",
     "Maintenance Updates": "Maintenance Updates",
     "Maintenances": "Maintenances",
-    "maintenance": "Maintenance",
     "Major System Outage": "Major System Outage",
     "Manage Site": "Manage Site",
     "Manage your notification preferences.": "Manage your notification preferences.",
@@ -118,7 +121,9 @@
     "Total Maintenances": "Total Maintenances",
     "Under Maintenance": "Under Maintenance",
     "Unknown impact": "Unknown impact",
+    "UP": "UP",
     "Upcoming": "Upcoming",
+    "Update Incident": "Update Incident",
     "Update Maintenance": "Update Maintenance",
     "Updates": "Updates",
     "Updates (%count)": "Updates (%count)",

src/lib/locales/es.json

@@ -18,9 +18,11 @@
     "Day Uptime": "Tiempo de actividad del día",
     "Days": "Días",
     "Degraded": "Degradado",
+    "DEGRADED": "DEGRADADO",
     "Degraded Performance": "Rendimiento degradado",
     "Didn't receive the code? Resend": "¿No recibiste el código? ",
     "Down": "Caído",
+    "DOWN": "CAÍDO",
     "Duration": "Duración",
     "Email address": "Dirección de correo electrónico",
     "Embed Monitor": "Monitor integrado",
@@ -40,10 +42,10 @@
     "IDENTIFIED": "IDENTIFIED",
     "iFrame": "marco flotante",
     "Impact": "Impacto",
+    "incident": "Incidente",
     "Incident Updates": "Actualizaciones de incidentes",
     "Incidents": "Incidentes",
-    "Included Monitors": "Included Monitors",
-    "incident": "Incidente",
+    "Included Monitors (%count)": "Included Monitors (%count)",
     "INVESTIGATING": "INVESTIGATING",
     "Last Updated": "Última actualización",
     "Latency": "Estado latente",
@@ -55,9 +57,10 @@
     "Light": "Luz",
     "Live Status": "Estado en vivo",
     "Loading your preferences...": "Cargando tus preferencias...",
+    "maintenance": "Mantenimiento",
+    "MAINTENANCE": "MANTENIMIENTO",
     "Maintenance Updates": "Actualizaciones de mantenimiento",
     "Maintenances": "Mantenimientos",
-    "maintenance": "Mantenimiento",
     "Major System Outage": "Interrupción importante del sistema",
     "Manage Site": "Gestionar sitio",
     "Manage your notification preferences.": "Administre sus preferencias de notificación.",
@@ -118,7 +121,9 @@
     "Total Maintenances": "Mantenimientos totales",
     "Under Maintenance": "En mantenimiento",
     "Unknown impact": "Impacto desconocido",
+    "UP": "ACTIVO",
     "Upcoming": "Próximo",
+    "Update Incident": "Actualizar incidente",
     "Update Maintenance": "Actualizar mantenimiento",
     "Updates": "Actualizaciones",
     "Updates (%count)": "Actualizaciones (%count)",

src/lib/locales/fa.json

@@ -18,9 +18,11 @@
     "Day Uptime": "تایم روز",
     "Days": "روزها",
     "Degraded": "کاهش یافته",
+    "DEGRADED": "کاهش یافته",
     "Degraded Performance": "عملکرد کاهش‌یافته",
     "Didn't receive the code? Resend": "کد را دریافت نکردید؟ ",
     "Down": "از کار افتاده",
+    "DOWN": "قطع",
     "Duration": "مدت",
     "Email address": "آدرس ایمیل",
     "Embed Monitor": "تعبیه مانیتور",
@@ -40,10 +42,10 @@
     "IDENTIFIED": "IDENTIFIED",
     "iFrame": "آی فریم",
     "Impact": "تاثیر",
+    "incident": "رخداد",
     "Incident Updates": "به روز رسانی حادثه",
     "Incidents": "حوادث",
-    "Included Monitors": "Included Monitors",
-    "incident": "رخداد",
+    "Included Monitors (%count)": "Included Monitors (%count)",
     "INVESTIGATING": "INVESTIGATING",
     "Last Updated": "آخرین به روز رسانی",
     "Latency": "تأخیر",
@@ -55,9 +57,10 @@
     "Light": "نور",
     "Live Status": "وضعیت زنده",
     "Loading your preferences...": "در حال بارگیری تنظیمات برگزیده شما...",
+    "maintenance": "نگهداری",
+    "MAINTENANCE": "تعمیر و نگهداری",
     "Maintenance Updates": "به روز رسانی های تعمیر و نگهداری",
     "Maintenances": "تعمیر و نگهداری",
-    "maintenance": "نگهداری",
     "Major System Outage": "قطعی عمده سیستم",
     "Manage Site": "مدیریت سایت",
     "Manage your notification preferences.": "تنظیمات برگزیده اعلان خود را مدیریت کنید.",
@@ -118,7 +121,9 @@
     "Total Maintenances": "کل تعمیر و نگهداری",
     "Under Maintenance": "تحت تعمیر و نگهداری",
     "Unknown impact": "تاثیر نامعلوم",
+    "UP": "فعال",
     "Upcoming": "آینده",
+    "Update Incident": "به‌روزرسانی رویداد",
     "Update Maintenance": "به‌روزرسانی نگهداری",
     "Updates": "به‌روزرسانی‌ها",
     "Updates (%count)": "به‌روزرسانی‌ها (%count)",

src/lib/locales/fr.json

@@ -3,11 +3,11 @@
   "mappings": {
     "%latency %metric latency": "%latency %metric latence",
     "Affected Monitors (%count)": "Moniteurs concernés (%count)",
-    "All Systems Operational": "Tous les systèmes opérationnels",
+    "All Systems Operational": "Tous les systèmes sont opérationnels",
     "Average Latency": "Latence moyenne",
     "Avg Latency": "Latence moyenne",
-    "Back": "Dos",
-    "Badges": "Insignes",
+    "Back": "Retour",
+    "Badges": "Badges",
     "CANCELLED": "ANNULÉ",
     "COMPLETED": "TERMINÉ",
     "Continue": "Continuer",
@@ -18,9 +18,11 @@
     "Day Uptime": "Disponibilité journalière",
     "Days": "Jours",
     "Degraded": "Dégradé",
+    "DEGRADED": "DÉGRADÉ",
     "Degraded Performance": "Performance dégradée",
     "Didn't receive the code? Resend": "Vous n'avez pas reçu le code ? ",
     "Down": "Hors service",
+    "DOWN": "EN PANNE",
     "Duration": "Durée",
     "Email address": "Adresse email",
     "Embed Monitor": "Intégrer le moniteur",
@@ -40,10 +42,10 @@
     "IDENTIFIED": "IDENTIFIED",
     "iFrame": "iFrame",
     "Impact": "Impact",
+    "incident": "Incident",
     "Incident Updates": "Mises à jour des incidents",
     "Incidents": "Incidents",
-    "Included Monitors": "Included Monitors",
-    "incident": "Incident",
+    "Included Monitors (%count)": "Included Monitors (%count)",
     "INVESTIGATING": "INVESTIGATING",
     "Last Updated": "Dernière mise à jour",
     "Latency": "Latence",
@@ -55,9 +57,10 @@
     "Light": "Lumière",
     "Live Status": "Statut en direct",
     "Loading your preferences...": "Chargement de vos préférences...",
+    "maintenance": "Maintenance",
+    "MAINTENANCE": "MAINTENANCE",
     "Maintenance Updates": "Mises à jour de maintenance",
     "Maintenances": "Entretiens",
-    "maintenance": "Maintenance",
     "Major System Outage": "Panne majeure du système",
     "Manage Site": "Gérer le site",
     "Manage your notification preferences.": "Gérez vos préférences de notification.",
@@ -90,7 +93,7 @@
     "Past": "Passé",
     "Per-Minute Status": "Statut par minute",
     "Pinging": "Ping",
-    "Please enter a valid email address": "S'il vous plaît, mettez une adresse email valide",
+    "Please enter a valid email address": "Veuillez renseigner une adresse email valide",
     "Please enter the 6-digit verification code": "Veuillez saisir le code de vérification à 6 chiffres",
     "Read less": "Lire moins",
     "Read more": "En savoir plus",
@@ -118,7 +121,9 @@
     "Total Maintenances": "Entretiens totaux",
     "Under Maintenance": "En maintenance",
     "Unknown impact": "Impact inconnu",
+    "UP": "OPÉRATIONNEL",
     "Upcoming": "Prochain",
+    "Update Incident": "Mettre à jour l'incident",
     "Update Maintenance": "Mettre à jour la maintenance",
     "Updates": "Mises à jour",
     "Updates (%count)": "Mises à jour (%count)",

src/lib/locales/hi.json

@@ -18,9 +18,11 @@
     "Day Uptime": "दिन का अपटाइम",
     "Days": "दिन",
     "Degraded": "अवनत",
+    "DEGRADED": "अवक्रमित",
     "Degraded Performance": "प्रदर्शन में गिरावट",
     "Didn't receive the code? Resend": "कोड नहीं मिला? फिर से भेजें",
     "Down": "बंद",
+    "DOWN": "बंद",
     "Duration": "अवधि",
     "Email address": "ईमेल पता",
     "Embed Monitor": "मॉनिटर एम्बेड करें",
@@ -40,10 +42,10 @@
     "IDENTIFIED": "पहचाना गया",
     "iFrame": "iFrame",
     "Impact": "प्रभाव",
+    "incident": "घटना",
     "Incident Updates": "घटना अपडेट",
     "Incidents": "घटनाएँ",
-    "Included Monitors": "शामिल मॉनिटर",
-    "incident": "घटना",
+    "Included Monitors (%count)": "शामिल मॉनिटर (%count)",
     "INVESTIGATING": "जाँच कर रहे हैं",
     "Last Updated": "अंतिम अपडेट",
     "Latency": "लेटेंसी",
@@ -55,9 +57,10 @@
     "Light": "लाइट",
     "Live Status": "लाइव स्थिति",
     "Loading your preferences...": "आपकी प्राथमिकताएँ लोड हो रही हैं...",
+    "maintenance": "रखरखाव",
+    "MAINTENANCE": "रखरखाव",
     "Maintenance Updates": "रखरखाव अपडेट",
     "Maintenances": "रखरखाव",
-    "maintenance": "रखरखाव",
     "Major System Outage": "सिस्टम का बड़ा आउटेज",
     "Manage Site": "साइट प्रबंधित करें",
     "Manage your notification preferences.": "अपनी सूचना प्राथमिकताएँ प्रबंधित करें।",
@@ -118,7 +121,9 @@
     "Total Maintenances": "कुल रखरखाव",
     "Under Maintenance": "रखरखाव जारी है",
     "Unknown impact": "अज्ञात प्रभाव",
+    "UP": "चालू",
     "Upcoming": "आने वाला",
+    "Update Incident": "घटना अपडेट करें",
     "Update Maintenance": "रखरखाव अपडेट करें",
     "Updates": "अपडेट्स",
     "Updates (%count)": "अपडेट (%count)",

src/lib/locales/it.json

@@ -18,9 +18,11 @@
     "Day Uptime": "Tempo di attività giornaliero",
     "Days": "Giorni",
     "Degraded": "Degradato",
+    "DEGRADED": "DEGRADATO",
     "Degraded Performance": "Prestazioni degradate",
     "Didn't receive the code? Resend": "Non hai ricevuto il codice? ",
     "Down": "Non disponibile",
+    "DOWN": "NON DISPONIBILE",
     "Duration": "Durata",
     "Email address": "Indirizzo e-mail",
     "Embed Monitor": "Incorpora monitoraggio",
@@ -40,10 +42,10 @@
     "IDENTIFIED": "IDENTIFIED",
     "iFrame": "iFrame",
     "Impact": "Impatto",
+    "incident": "Incidente",
     "Incident Updates": "Aggiornamenti sugli incidenti",
     "Incidents": "Incidenti",
-    "Included Monitors": "Included Monitors",
-    "incident": "Incidente",
+    "Included Monitors (%count)": "Included Monitors (%count)",
     "INVESTIGATING": "INVESTIGATING",
     "Last Updated": "Ultimo aggiornamento",
     "Latency": "Latenza",
@@ -55,9 +57,10 @@
     "Light": "Leggero",
     "Live Status": "Stato in tempo reale",
     "Loading your preferences...": "Caricamento delle tue preferenze...",
+    "maintenance": "Manutenzione",
+    "MAINTENANCE": "MANUTENZIONE",
     "Maintenance Updates": "Aggiornamenti sulla manutenzione",
     "Maintenances": "Manutenzioni",
-    "maintenance": "Manutenzione",
     "Major System Outage": "Interruzione grave del sistema",
     "Manage Site": "Gestisci sito",
     "Manage your notification preferences.": "Gestisci le tue preferenze di notifica.",
@@ -118,7 +121,9 @@
     "Total Maintenances": "Manutenzioni totali",
     "Under Maintenance": "In manutenzione",
     "Unknown impact": "Impatto sconosciuto",
+    "UP": "ATTIVO",
     "Upcoming": "Prossimamente",
+    "Update Incident": "Aggiorna incidente",
     "Update Maintenance": "Aggiorna manutenzione",
     "Updates": "Aggiornamenti",
     "Updates (%count)": "Aggiornamenti (%count)",

src/lib/locales/ja.json

@@ -18,9 +18,11 @@
     "Day Uptime": "一日の稼働時間",
     "Days": "日数",
     "Degraded": "低下",
+    "DEGRADED": "劣化",
     "Degraded Performance": "パフォーマンスの低下",
     "Didn't receive the code? Resend": "コードを受け取っていませんか?",
     "Down": "停止",
+    "DOWN": "障害",
     "Duration": "間隔",
     "Email address": "電子メールアドレス",
     "Embed Monitor": "埋め込みモニター",
@@ -40,10 +42,10 @@
     "IDENTIFIED": "IDENTIFIED",
     "iFrame": "iFrame",
     "Impact": "インパクト",
+    "incident": "インシデント",
     "Incident Updates": "インシデントの最新情報",
     "Incidents": "事件",
-    "Included Monitors": "Included Monitors",
-    "incident": "インシデント",
+    "Included Monitors (%count)": "Included Monitors (%count)",
     "INVESTIGATING": "INVESTIGATING",
     "Last Updated": "最終更新日",
     "Latency": "レイテンシー",
@@ -55,9 +57,10 @@
     "Light": "ライト",
     "Live Status": "ライブステータス",
     "Loading your preferences...": "設定を読み込んでいます...",
+    "maintenance": "メンテナンス",
+    "MAINTENANCE": "メンテナンス",
     "Maintenance Updates": "メンテナンスアップデート",
     "Maintenances": "メンテナンス",
-    "maintenance": "メンテナンス",
     "Major System Outage": "大規模なシステム障害",
     "Manage Site": "サイト管理",
     "Manage your notification preferences.": "通知設定を管理します。",
@@ -118,7 +121,9 @@
     "Total Maintenances": "トータルメンテナンス",
     "Under Maintenance": "メンテナンス中",
     "Unknown impact": "未知の影響",
+    "UP": "正常",
     "Upcoming": "今後の予定",
+    "Update Incident": "インシデントを更新",
     "Update Maintenance": "メンテナンスを更新",
     "Updates": "更新",
     "Updates (%count)": "アップデート (%count)",

src/lib/locales/ko.json

@@ -18,9 +18,11 @@
     "Day Uptime": "일일 가동 시간",
     "Days": "날",
     "Degraded": "저하",
+    "DEGRADED": "성능 저하",
     "Degraded Performance": "성능 저하",
     "Didn't receive the code? Resend": "코드를 받지 못하셨나요? 재전송",
     "Down": "중단",
+    "DOWN": "장애",
     "Duration": "지속",
     "Email address": "이메일 주소",
     "Embed Monitor": "모니터 내장",
@@ -40,10 +42,10 @@
     "IDENTIFIED": "IDENTIFIED",
     "iFrame": "아이프레임",
     "Impact": "영향",
+    "incident": "인시던트",
     "Incident Updates": "사고 업데이트",
     "Incidents": "사건",
-    "Included Monitors": "Included Monitors",
-    "incident": "인시던트",
+    "Included Monitors (%count)": "Included Monitors (%count)",
     "INVESTIGATING": "INVESTIGATING",
     "Last Updated": "마지막 업데이트",
     "Latency": "숨어 있음",
@@ -55,9 +57,10 @@
     "Light": "빛",
     "Live Status": "실시간 현황",
     "Loading your preferences...": "환경설정 로드 중...",
+    "maintenance": "유지보수",
+    "MAINTENANCE": "점검 중",
     "Maintenance Updates": "유지보수 업데이트",
     "Maintenances": "유지보수",
-    "maintenance": "유지보수",
     "Major System Outage": "대규모 시스템 장애",
     "Manage Site": "사이트 관리",
     "Manage your notification preferences.": "알림 기본 설정을 관리하세요.",
@@ -118,7 +121,9 @@
     "Total Maintenances": "총 유지보수",
     "Under Maintenance": "유지보수 중",
     "Unknown impact": "알 수 없는 영향",
+    "UP": "정상",
     "Upcoming": "예정",
+    "Update Incident": "인시던트 업데이트",
     "Update Maintenance": "유지보수 업데이트",
     "Updates": "업데이트",
     "Updates (%count)": "업데이트(%count)",

src/lib/locales/nb-NO.json

@@ -18,9 +18,11 @@
     "Day Uptime": "Dag oppetid",
     "Days": "Dager",
     "Degraded": "Degradert",
+    "DEGRADED": "FORRINGET",
     "Degraded Performance": "Redusert ytelse",
     "Didn't receive the code? Resend": "Fikk du ikke koden? Send på nytt",
     "Down": "Nede",
+    "DOWN": "NEDE",
     "Duration": "Varighet",
     "Email address": "E-postadresse",
     "Embed Monitor": "Bygg inn monitor",
@@ -40,10 +42,10 @@
     "IDENTIFIED": "IDENTIFIED",
     "iFrame": "iFrame",
     "Impact": "Påvirkning",
+    "incident": "Hendelse",
     "Incident Updates": "Hendelsesoppdateringer",
     "Incidents": "Hendelser",
-    "Included Monitors": "Included Monitors",
-    "incident": "Hendelse",
+    "Included Monitors (%count)": "Included Monitors (%count)",
     "INVESTIGATING": "INVESTIGATING",
     "Last Updated": "Sist oppdatert",
     "Latency": "Latens",
@@ -55,9 +57,10 @@
     "Light": "Lys",
     "Live Status": "Live-status",
     "Loading your preferences...": "Laster inn innstillingene dine ...",
+    "maintenance": "Vedlikehold",
+    "MAINTENANCE": "VEDLIKEHOLD",
     "Maintenance Updates": "Vedlikeholdsoppdateringer",
     "Maintenances": "Vedlikehold",
-    "maintenance": "Vedlikehold",
     "Major System Outage": "Større systemutfall",
     "Manage Site": "Administrer nettsted",
     "Manage your notification preferences.": "Administrer varslingspreferansene dine.",
@@ -118,7 +121,9 @@
     "Total Maintenances": "Totalt vedlikehold",
     "Under Maintenance": "Under Vedlikehold",
     "Unknown impact": "Ukjent påvirkning",
+    "UP": "OPPE",
     "Upcoming": "Kommende",
+    "Update Incident": "Oppdater hendelse",
     "Update Maintenance": "Oppdater vedlikehold",
     "Updates": "Oppdateringer",
     "Updates (%count)": "Oppdateringer (%count)",

src/lib/locales/nl.json

@@ -18,9 +18,11 @@
     "Day Uptime": "Dag uptime",
     "Days": "Dagen",
     "Degraded": "Verstoord",
+    "DEGRADED": "VERSLECHTERD",
     "Degraded Performance": "Verminderde prestaties",
     "Didn't receive the code? Resend": "Heb je de code niet ontvangen? ",
     "Down": "Niet bereikbaar",
+    "DOWN": "OFFLINE",
     "Duration": "Duur",
     "Email address": "E-mailadres",
     "Embed Monitor": "Monitor insluiten",
@@ -40,10 +42,10 @@
     "IDENTIFIED": "IDENTIFIED",
     "iFrame": "iFrame",
     "Impact": "Invloed",
+    "incident": "Incident",
     "Incident Updates": "Incidentupdates",
     "Incidents": "Incidenten",
-    "Included Monitors": "Included Monitors",
-    "incident": "Incident",
+    "Included Monitors (%count)": "Included Monitors (%count)",
     "INVESTIGATING": "INVESTIGATING",
     "Last Updated": "Laatst bijgewerkt",
     "Latency": "Latentie",
@@ -55,9 +57,10 @@
     "Light": "Licht",
     "Live Status": "Live-status",
     "Loading your preferences...": "Uw voorkeuren laden...",
+    "maintenance": "Onderhoud",
+    "MAINTENANCE": "ONDERHOUD",
     "Maintenance Updates": "Onderhoudsupdates",
     "Maintenances": "Onderhouden",
-    "maintenance": "Onderhoud",
     "Major System Outage": "Grote systeemstoring",
     "Manage Site": "Site beheren",
     "Manage your notification preferences.": "Beheer uw meldingsvoorkeuren.",
@@ -118,7 +121,9 @@
     "Total Maintenances": "Totaal onderhoud",
     "Under Maintenance": "Onder Onderhoud",
     "Unknown impact": "Onbekende impact",
+    "UP": "ACTIEF",
     "Upcoming": "Aankomend",
+    "Update Incident": "Incident bijwerken",
     "Update Maintenance": "Onderhoud bijwerken",
     "Updates": "Actualisaties",
     "Updates (%count)": "Updates (%count)",

src/lib/locales/pl.json

@@ -18,9 +18,11 @@
     "Day Uptime": "Dzień sprawności",
     "Days": "Dni",
     "Degraded": "Pogorszony",
+    "DEGRADED": "POGORSZONY",
     "Degraded Performance": "Obniżona wydajność",
     "Didn't receive the code? Resend": "Nie otrzymałeś kodu? ",
     "Down": "Niedostępny",
+    "DOWN": "AWARIA",
     "Duration": "Czas trwania",
     "Email address": "Adres e-mail",
     "Embed Monitor": "Wstaw monitor",
@@ -40,10 +42,10 @@
     "IDENTIFIED": "IDENTIFIED",
     "iFrame": "iFramka",
     "Impact": "Uderzenie",
+    "incident": "Incydent",
     "Incident Updates": "Aktualizacje incydentów",
     "Incidents": "Incydenty",
-    "Included Monitors": "Included Monitors",
-    "incident": "Incydent",
+    "Included Monitors (%count)": "Included Monitors (%count)",
     "INVESTIGATING": "INVESTIGATING",
     "Last Updated": "Ostatnia aktualizacja",
     "Latency": "Utajenie",
@@ -55,9 +57,10 @@
     "Light": "Światło",
     "Live Status": "Stan na żywo",
     "Loading your preferences...": "Ładowanie Twoich preferencji...",
+    "maintenance": "Konserwacja",
+    "MAINTENANCE": "KONSERWACJA",
     "Maintenance Updates": "Aktualizacje konserwacyjne",
     "Maintenances": "Konserwacje",
-    "maintenance": "Konserwacja",
     "Major System Outage": "Poważna awaria systemu",
     "Manage Site": "Zarządzaj stroną",
     "Manage your notification preferences.": "Zarządzaj preferencjami powiadomień.",
@@ -118,7 +121,9 @@
     "Total Maintenances": "Całkowita konserwacja",
     "Under Maintenance": "W ramach konserwacji",
     "Unknown impact": "Nieznany wpływ",
+    "UP": "DZIAŁA",
     "Upcoming": "Nadchodzące",
+    "Update Incident": "Aktualizuj incydent",
     "Update Maintenance": "Aktualizuj konserwację",
     "Updates": "Aktualizacje",
     "Updates (%count)": "Aktualizacje (%count)",

src/lib/locales/pt-BR.json

@@ -18,9 +18,11 @@
     "Day Uptime": "Tempo de atividade diurno",
     "Days": "Dias",
     "Degraded": "Degradado",
+    "DEGRADED": "DEGRADADO",
     "Degraded Performance": "Desempenho degradado",
     "Didn't receive the code? Resend": "Não recebeu o código? ",
     "Down": "Fora do ar",
+    "DOWN": "FORA DO AR",
     "Duration": "Duração",
     "Email address": "Endereço de email",
     "Embed Monitor": "Incorporar monitor",
@@ -40,10 +42,10 @@
     "IDENTIFIED": "IDENTIFIED",
     "iFrame": "iFrame",
     "Impact": "Impacto",
+    "incident": "Incidente",
     "Incident Updates": "Atualizações de incidentes",
     "Incidents": "Incidentes",
-    "Included Monitors": "Included Monitors",
-    "incident": "Incidente",
+    "Included Monitors (%count)": "Included Monitors (%count)",
     "INVESTIGATING": "INVESTIGATING",
     "Last Updated": "Última atualização",
     "Latency": "Latência",
@@ -55,9 +57,10 @@
     "Light": "Luz",
     "Live Status": "Status ao vivo",
     "Loading your preferences...": "Carregando suas preferências...",
+    "maintenance": "Manutenção",
+    "MAINTENANCE": "MANUTENÇÃO",
     "Maintenance Updates": "Atualizações de manutenção",
     "Maintenances": "Manutenção",
-    "maintenance": "Manutenção",
     "Major System Outage": "Indisponibilidade grave do sistema",
     "Manage Site": "Gerenciar site",
     "Manage your notification preferences.": "Gerencie suas preferências de notificação.",
@@ -118,7 +121,9 @@
     "Total Maintenances": "Manutenção total",
     "Under Maintenance": "Em manutenção",
     "Unknown impact": "Impacto desconhecido",
+    "UP": "ATIVO",
     "Upcoming": "Por vir",
+    "Update Incident": "Atualizar incidente",
     "Update Maintenance": "Atualizar manutenção",
     "Updates": "Atualizações",
     "Updates (%count)": "Atualizações (%count)",

src/lib/locales/ru.json

@@ -19,9 +19,11 @@
     "Day Uptime": "Время работы за день",
     "Days": "Days",
     "Degraded": "Деградация",
+    "DEGRADED": "УХУДШЕНИЕ",
     "Degraded Performance": "Снижение производительности",
     "Didn't receive the code? Resend": "Не получили код? Отправить повторно",
     "Down": "Недоступен",
+    "DOWN": "НЕ РАБОТАЕТ",
     "Duration": "Продолжительность",
     "Email address": "Адрес электронной почты",
     "Embed Monitor": "Встроить монитор",
@@ -41,10 +43,10 @@
     "IDENTIFIED": "IDENTIFIED",
     "iFrame": "iFrame",
     "Impact": "Влияние",
+    "incident": "Инцидент",
     "Incident Updates": "Обновления инцидентов",
     "Incidents": "Инциденты",
-    "Included Monitors": "Included Monitors",
-    "incident": "Инцидент",
+    "Included Monitors (%count)": "Included Monitors (%count)",
     "INVESTIGATING": "INVESTIGATING",
     "Last Updated": "Последнее обновление",
     "Latency": "Задержка",
@@ -56,9 +58,10 @@
     "Light": "Светлая",
     "Live Status": "Статус в реальном времени",
     "Loading your preferences...": "Загрузка настроек...",
+    "maintenance": "Обслуживание",
+    "MAINTENANCE": "ОБСЛУЖИВАНИЕ",
     "Maintenance Updates": "Обновления обслуживания",
     "Maintenances": "Обслуживание",
-    "maintenance": "Обслуживание",
     "Major System Outage": "Крупный сбой системы",
     "Manage Site": "Управление сайтом",
     "Manage your notification preferences.": "Управляйте настройками уведомлений.",
@@ -119,7 +122,9 @@
     "Total Maintenances": "Total Maintenances",
     "Under Maintenance": "На обслуживании",
     "Unknown impact": "Неизвестное влияние",
+    "UP": "РАБОТАЕТ",
     "Upcoming": "Предстоящие",
+    "Update Incident": "Обновить инцидент",
     "Update Maintenance": "Обновить обслуживание",
     "Updates": "Обновления",
     "Updates (%count)": "Обновления (%count)",

src/lib/locales/sk.json

@@ -6,7 +6,7 @@
     "30 Days": "30 dní",
     "7 Days": "7 dní",
     "90 Days": "90 dní",
-    "Affected Monitors (%count)": "Ovládacie monitory (%count)",
+    "Affected Monitors (%count)": "Ovplyvnené monitory (%count)",
     "All Systems Operational": "Všetky systémy sú v prevádzke",
     "average": "priemerná",
     "Average Latency": "Priemerná latencia",
@@ -22,58 +22,58 @@
     "Day": "Deň",
     "Day Uptime": "Denná dostupnosť",
     "Days": "Dní",
-    "Degraded": "Zhoršený",
-    "DEGRADED": "ZHORŠENÝ",
-    "Degraded Performance": "Zhoršený výkon",
-    "Didn't receive the code? Resend": "Nedostali ste kód? Odoslať znova",
-    "Down": "Nedostupný",
-    "DOWN": "VÝPADOK",
+    "Degraded": "Obmedzený",
+    "DEGRADED": "OBMEDZENÝ",
+    "Degraded Performance": "Znížený výkon",
+    "Didn't receive the code? Resend": "Neprišiel kód? Odoslať znova",
+    "Down": "Nedostupné",
+    "DOWN": "NEDOSTUPNÉ",
     "Duration": "Trvanie",
     "Edit Monitor": "Upraviť monitor",
     "Email address": "E-mailová adresa",
     "Embed Monitor": "Vložiť monitor",
-    "Embed this monitor in your website or app": "Vložte tento monitor na svoj web alebo do aplikácie",
+    "Embed this monitor in your website or app": "Vložte tento monitor na web alebo do aplikácie",
     "End Time": "Koniec",
-    "Enter the verification code sent to your email.": "Zadajte overovací kód zaslaný na váš e-mail.",
+    "Enter the verification code sent to your email.": "Zadajte overovací kód zaslaný na e-mail",
     "Events": "Udalosti",
     "Failed to load data": "Nepodarilo sa načítať dáta",
     "Failed to load latency data": "Nepodarilo sa načítať dáta latencie",
-    "Failed to load status data for this day": "Nepodarilo sa načítať dáta stavu pre tento deň",
+    "Failed to load status data for this day": "Nepodarilo sa načítať stavové dáta pre tento deň",
     "Failed to send verification code": "Nepodarilo sa odoslať overovací kód",
-    "Failed to update preference": "Nepodarilo sa aktualizovať nastavenia",
+    "Failed to update preference": "Nepodarilo sa uložiť nastavenie",
     "Format": "Formát",
     "Get badges for this monitor": "Získať odznaky pre tento monitor",
-    "Get notified about incidents and scheduled maintenance.": "Dostávajte upozornenia na incidenty a plánovanú údržbu.",
+    "Get notified about incidents and scheduled maintenance.": "Dostávajte upozornenia na incidenty a plánovanú údržbu",
     "Get notified about incidents updates": "Dostávajte upozornenia na aktualizácie incidentov",
     "Get notified about scheduled maintenance": "Dostávajte upozornenia na plánovanú údržbu",
     "Home": "Domov",
     "IDENTIFIED": "IDENTIFIKOVANÉ",
     "iFrame": "iFrame",
     "Impact": "Dopad",
+    "incident": "incident",
     "Incident": "Incident",
     "Incident Updates": "Aktualizácie incidentov",
     "Incidents": "Incidenty",
-    "Included Monitors": "Monitorov zahrnuté",
-    "incident": "Incident",
-    "INVESTIGATING": "VYŠETROVANIE",
+    "Included Monitors (%count)": "Zahrnuté monitory (%count)",
+    "INVESTIGATING": "PREBIEHA VYŠETROVANIE",
     "Last Updated": "Naposledy aktualizované",
     "Latency": "Latencia",
     "Latency Embed": "Vložená latencia",
     "Latency Over Time": "Latencia v čase",
     "Latency Trend": "Trend latencie",
     "Latest Latency": "Posledná latencia",
-    "Latest Status": "Posledný stav",
+    "Latest Status": "Naposledy zistený stav",
     "Light": "Svetlý",
     "Live Status": "Aktuálny stav",
-    "Loading your preferences...": "Načítavam vaše nastavenia...",
+    "Loading your preferences...": "Načítavanie nastavení...",
+    "maintenance": "údržba",
     "Maintenance": "Údržba",
     "MAINTENANCE": "ÚDRŽBA",
-    "maintenance": "Údržba",
     "Maintenance Updates": "Aktualizácie údržby",
     "Maintenances": "Údržby",
     "Major System Outage": "Závažný výpadok systému",
     "Manage Site": "Spravovať stránku",
-    "Manage your notification preferences.": "Spravujte svoje nastavenia oznámení.",
+    "Manage your notification preferences.": "Spravujte nastavenia upozornení",
     "Max Latency": "Max. latencia",
     "maximum": "maximálna",
     "Maximum Latency": "Maximálna latencia",
@@ -82,27 +82,28 @@
     "Minimum Latency": "Minimálna latencia",
     "Minute-by-minute status data for this day": "Minútové dáta stavu pre tento deň",
     "MONITORING": "MONITOROVANIE",
-    "Network error. Please try again.": "Chyba siete. Skúste to znova.",
-    "No Events in %currentMonth": "V mesiaci %currentMonth nie sú plánované žiadne udalosti",
+    "Network error. Please try again.": "Chyba siete. Skúste to znova",
+    "No Events in %currentMonth": "V mesiaci %currentMonth nie sú žiadne udalosti",
     "No events to show": "Žiadne udalosti na zobrazenie",
     "No incidents for this day": "Pre tento deň nie sú evidované žiadne incidenty",
-    "No latency data available for this day": "Pre tento deň nie sú k dispozícii dáta latencie",
+    "No latency data available for this day": "Pre tento deň nie sú dostupné dáta latencie",
     "No maintenances for this day": "Pre tento deň nie je naplánovaná žiadna údržba",
-    "No monitors affected": "Žiadne zasiahnuté monitory",
-    "No monitors available.": "Žiadne dostupné monitory.",
+    "No monitors affected": "Žiadne ovplyvnené monitory",
+    "No monitors available.": "Žiadne dostupné monitory",
     "No ongoing maintenances": "Žiadna prebiehajúca údržba",
-    "No past maintenances": "Žiadna minula údržba",
+    "No past maintenances": "Žiadna minulá údržba",
     "No Status Available": "Stav nie je k dispozícii",
     "No upcoming maintenances": "Žiadna nadchádzajúca údržba",
     "No Updates": "Žiadne aktualizácie",
-    "No updates yet": "Zatiaľ bez aktualizácií",
+    "No updates yet": "Zatiaľ žiadne aktualizácie",
     "NO_DATA": "Žiadne dáta",
-    "Notifications": "Oznámenia",
+    "Notifications": "Upozornenia",
     "One-time": "Jednorazovo",
     "Ongoing": "Prebiehajúce",
+    "ONGOING": "PREBIEHAJÚCE",
     "Ongoing Maintenances": "Prebiehajúce údržby",
     "Operational": "V prevádzke",
-    "Partial Degraded Performance": "Čiastočne zhoršený výkon",
+    "Partial Degraded Performance": "Čiastočne obmedzený výkon",
     "Partial System Outage": "Čiastočný výpadok systému",
     "Past": "Minulé",
     "Per-Minute Status": "Stav po minútach",
@@ -120,20 +121,20 @@
     "Scheduled Windows": "Naplánované úlohy",
     "Script": "Skript",
     "Select Language": "Vyberte jazyk",
-    "Select latency metric to display": "Vyberte metriku latencie na zobrazenie",
+    "Select latency metric to display": "Vyberte metriku latencie",
     "Select Range": "Vyberte rozsah",
     "Sending...": "Odosielanie...",
     "Standard": "Štandardný",
     "Start Time": "Začiatok",
     "Status": "Stav",
     "Status Badge": "Odznak stavu",
-    "Status Embed": "Status na vloženie",
+    "Status Embed": "Stav na vloženie",
     "Status history and latency trend": "História stavu a trend latencie",
-    "Subscribe": "Odoberať",
+    "Subscribe": "Prihlásiť sa na odber",
     "Subscribe to Updates": "Odoberať aktualizácie",
     "Theme": "Motív",
-    "There are no incidents or maintenances scheduled for this month.": "Na tento mesiac nie sú naplánované incidenty ani údržba.",
-    "There are no ongoing incidents or maintenance events.": "V tejto chvíli neprebiehajú žiadne incidenty ani údržba.",
+    "There are no incidents or maintenances scheduled for this month.": "Na tento mesiac nie sú naplánované žiadne incidenty ani údržby",
+    "There are no ongoing incidents or maintenance events.": "Momentálne neprebiehajú žiadne incidenty ani údržba",
     "Timeline": "Časová os",
     "Total Incidents": "Celkom incidentov",
     "Total Maintenances": "Celkom údržieb",
@@ -151,6 +152,6 @@
     "Verification failed": "Overenie zlyhalo",
     "Verify": "Overiť",
     "Verifying": "Overovanie",
-    "We sent a 6-digit code to": "Poslali sme 6-miestny kód na"
+    "We sent a 6-digit code to": "Odoslali sme 6-miestny kód na"
   }
 }

src/lib/locales/tr.json

@@ -18,9 +18,11 @@
     "Day Uptime": "Gün Çalışma Süresi",
     "Days": "Günler",
     "Degraded": "Bozulmuş",
+    "DEGRADED": "DÜŞÜK PERFORMANS",
     "Degraded Performance": "Düşük performans",
     "Didn't receive the code? Resend": "Kodu almadınız mı? ",
     "Down": "Çevrimdışı",
+    "DOWN": "ÇÖKME",
     "Duration": "Süre",
     "Email address": "E-posta adresi",
     "Embed Monitor": "Gömülü Monitör",
@@ -40,10 +42,10 @@
     "IDENTIFIED": "IDENTIFIED",
     "iFrame": "iFrame",
     "Impact": "Darbe",
+    "incident": "Olay",
     "Incident Updates": "Olay Güncellemeleri",
     "Incidents": "Olaylar",
-    "Included Monitors": "Included Monitors",
-    "incident": "Olay",
+    "Included Monitors (%count)": "Included Monitors (%count)",
     "INVESTIGATING": "INVESTIGATING",
     "Last Updated": "Son Güncelleme",
     "Latency": "Gecikme",
@@ -55,9 +57,10 @@
     "Light": "Işık",
     "Live Status": "Canlı Durum",
     "Loading your preferences...": "Tercihleriniz yükleniyor...",
+    "maintenance": "Bakım",
+    "MAINTENANCE": "BAKIM",
     "Maintenance Updates": "Bakım Güncellemeleri",
     "Maintenances": "Bakımlar",
-    "maintenance": "Bakım",
     "Major System Outage": "Büyük sistem kesintisi",
     "Manage Site": "Siteyi yönet",
     "Manage your notification preferences.": "Bildirim tercihlerinizi yönetin.",
@@ -118,7 +121,9 @@
     "Total Maintenances": "Toplam Bakımlar",
     "Under Maintenance": "Bakımda",
     "Unknown impact": "Bilinmeyen etki",
+    "UP": "ÇALIŞIYOR",
     "Upcoming": "Yaklaşan",
+    "Update Incident": "Olayı güncelle",
     "Update Maintenance": "Bakımı güncelle",
     "Updates": "Güncellemeler",
     "Updates (%count)": "Güncellemeler (%count)",

src/lib/locales/uk.json

@@ -0,0 +1,138 @@
+{
+  "name": "Українська",
+  "code": "uk",
+  "mappings": {
+    "%latency %metric latency": "%latency %metric latency",
+    "Affected Monitors (%count)": "Затронуті монітори (%count)",
+    "All Systems Operational": "Усі системи працюють",
+    "Average Latency": "Середня затримка",
+    "Avg Latency": "Сер. затримка",
+    "Back": "Назад",
+    "Badges": "Бейджі",
+    "CANCELLED": "СКАСОВАНО",
+    "COMPLETED": "ЗАВЕРШЕНО",
+    "Continue": "Продовжити",
+    "Copied": "Скопійовано",
+    "Current": "Поточні",
+    "Dark": "Темна",
+    "Day": "День",
+    "Day Uptime": "Час роботи за день",
+    "Days": "Дні",
+    "Degraded": "Погіршення",
+    "DEGRADED": "ПОГІРШЕННЯ",
+    "Degraded Performance": "Зниження продуктивності",
+    "Didn't receive the code? Resend": "Не отримали код? Надіслати повторно",
+    "Down": "Недоступний",
+    "DOWN": "НЕ ПРАЦЮЄ",
+    "Duration": "Тривалість",
+    "Email address": "Адреса електронної пошти",
+    "Embed Monitor": "Вбудувати монітор",
+    "Embed this monitor in your website or app": "Вбудуйте цей монітор у свій сайт або застосунок",
+    "End Time": "Час завершення",
+    "Enter the verification code sent to your email.": "Введіть код підтвердження, надісланий на вашу пошту.",
+    "Events": "Події",
+    "Failed to load data": "Не вдалося завантажити дані",
+    "Failed to load latency data": "Не вдалося завантажити дані затримки",
+    "Failed to load status data for this day": "Не вдалося завантажити дані статусу за цей день",
+    "Failed to send verification code": "Не вдалося надіслати код підтвердження",
+    "Failed to update preference": "Не вдалося оновити налаштування",
+    "Get badges for this monitor": "Отримати бейджі для цього монітора",
+    "Get notified about incidents and scheduled maintenance.": "Отримуйте сповіщення про інциденти та планове обслуговування",
+    "Get notified about incidents updates": "Отримуйте сповіщення про оновлення інцидентів",
+    "Get notified about scheduled maintenance": "Отримуйте сповіщення про планове обслуговування",
+    "IDENTIFIED": "ВИЗНАЧЕНО",
+    "iFrame": "iFrame",
+    "Impact": "Вплив",
+    "incident": "інцидент",
+    "Incident Updates": "Оновлення інцидентів",
+    "Incidents": "Інциденти",
+    "Included Monitors (%count)": "Включені монітори (%count)",
+    "INVESTIGATING": "ДОСЛІДЖЕННЯ",
+    "Last Updated": "Останнє оновлення",
+    "Latency": "Затримка",
+    "Latency Embed": "Вбудована затримка",
+    "Latency Over Time": "Затримка з часом",
+    "Latency Trend": "Тренд затримки",
+    "Latest Latency": "Остання затримка",
+    "Latest Status": "Останній статус",
+    "Light": "Світла",
+    "Live Status": "Статус у реальному часі",
+    "Loading your preferences...": "Завантаження налаштувань...",
+    "maintenance": "обслуговування",
+    "MAINTENANCE": "ОБСЛУГОВУВАННЯ",
+    "Maintenance Updates": "Оновлення обслуговування",
+    "Maintenances": "Обслуговування",
+    "Major System Outage": "Критичний збій системи",
+    "Manage Site": "Керування сайтом",
+    "Manage your notification preferences.": "Керуйте налаштуваннями сповіщень",
+    "Max Latency": "Макс. затримка",
+    "Maximum Latency": "Максимальна затримка",
+    "Min Latency": "Мін. затримка",
+    "Minimum Latency": "Мінімальна затримка",
+    "Minute-by-minute status data for this day": "Похвилинні дані статусу за цей день",
+    "MONITORING": "МОНІТОРИНГ",
+    "Network error. Please try again.": "Помилка мережі. Спробуйте ще раз",
+    "No Events in %currentMonth": "Немає подій у %currentMonth",
+    "No events to show": "Немає подій для відображення",
+    "No incidents for this day": "Немає інцидентів за цей день",
+    "No latency data available for this day": "Немає даних про затримку за цей день",
+    "No maintenances for this day": "Немає обслуговування за цей день",
+    "No monitors affected": "Жоден монітор не зачеплений",
+    "No monitors available.": "Немає доступних моніторів",
+    "No ongoing maintenances": "Немає поточного обслуговування",
+    "No past maintenances": "Немає минулого обслуговування",
+    "No Status Available": "Статус недоступний",
+    "No upcoming maintenances": "Немає запланованого обслуговування",
+    "No Updates": "Немає оновлень",
+    "No updates yet": "Оновлень поки немає",
+    "Notifications": "Сповіщення",
+    "One-time": "Одноразове",
+    "Ongoing": "Поточні",
+    "Operational": "Працює",
+    "Partial Degraded Performance": "Часткове зниження продуктивності",
+    "Partial System Outage": "Частковий збій системи",
+    "Past": "Минулі",
+    "Per-Minute Status": "Похвилинний статус",
+    "Pinging": "Перевірка доступності",
+    "Please enter a valid email address": "Будь ласка, введіть дійсну електронну адресу",
+    "Please enter the 6-digit verification code": "Будь ласка, введіть 6-значний код підтвердження",
+    "Read less": "Згорнути",
+    "Read more": "Читати більше",
+    "READY": "ГОТОВО",
+    "Recurring": "Повторюване",
+    "RESOLVED": "ВИРІШЕНО",
+    "SCHEDULED": "ЗАПЛАНОВАНО",
+    "Scheduled Events (%count)": "Заплановані події (%count)",
+    "Script": "Скрипт",
+    "Select Language": "Оберіть мову",
+    "Select latency metric to display": "Оберіть метрику затримки для відображення",
+    "Select Range": "Оберіть діапазон",
+    "Sending...": "Надсилання...",
+    "Standard": "Стандартний",
+    "Start Time": "Час початку",
+    "Status": "Статус",
+    "Status Badge": "Бейдж статусу",
+    "Status Embed": "Вбудований статус",
+    "Status history and latency trend": "Історія статусів та тренд затримки",
+    "Subscribe": "Підписатися",
+    "Subscribe to Updates": "Підписатися на оновлення",
+    "There are no incidents or maintenances scheduled for this month.": "На цей місяць не заплановано інцидентів або обслуговування",
+    "There are no ongoing incidents or maintenance events.": "Наразі немає активних інцидентів або обслуговування",
+    "Total Incidents": "Загальна кількість інцидентів",
+    "Total Maintenances": "Загальна кількість обслуговувань",
+    "Under Maintenance": "На обслуговуванні",
+    "Unknown impact": "Невідомий вплив",
+    "UP": "ПРАЦЮЄ",
+    "Upcoming": "Майбутні",
+    "Update Incident": "Оновити інцидент",
+    "Update Maintenance": "Оновити обслуговування",
+    "Updates": "Оновлення",
+    "Updates (%count)": "Оновлення (%count)",
+    "Uptime": "Час роботи",
+    "Uptime Badge": "Бейдж часу роботи",
+    "Verification failed": "Перевірка не вдалася",
+    "Verify": "Підтвердити",
+    "Verifying": "Перевірка",
+    "We sent a 6-digit code to": "Ми надіслали 6-значний код на"
+  }
+}

src/lib/locales/vi.json

@@ -18,9 +18,11 @@
     "Day Uptime": "Thời gian hoạt động trong ngày",
     "Days": "Ngày",
     "Degraded": "Suy giảm",
+    "DEGRADED": "SUY GIẢM",
     "Degraded Performance": "Hiệu suất suy giảm",
     "Didn't receive the code? Resend": "Không nhận được mã? ",
     "Down": "Ngừng hoạt động",
+    "DOWN": "NGỪNG HOẠT ĐỘNG",
     "Duration": "Khoảng thời gian",
     "Email address": "Địa chỉ email",
     "Embed Monitor": "Màn hình nhúng",
@@ -40,10 +42,10 @@
     "IDENTIFIED": "IDENTIFIED",
     "iFrame": "iFrame",
     "Impact": "Sự va chạm",
+    "incident": "Sự cố",
     "Incident Updates": "Cập nhật sự cố",
     "Incidents": "Sự cố",
-    "Included Monitors": "Included Monitors",
-    "incident": "Sự cố",
+    "Included Monitors (%count)": "Included Monitors (%count)",
     "INVESTIGATING": "INVESTIGATING",
     "Last Updated": "Cập nhật lần cuối",
     "Latency": "Độ trễ",
@@ -55,9 +57,10 @@
     "Light": "Ánh sáng",
     "Live Status": "Trạng thái trực tiếp",
     "Loading your preferences...": "Đang tải tùy chọn của bạn...",
+    "maintenance": "Bảo trì",
+    "MAINTENANCE": "BẢO TRÌ",
     "Maintenance Updates": "Cập nhật bảo trì",
     "Maintenances": "Bảo trì",
-    "maintenance": "Bảo trì",
     "Major System Outage": "Sự cố hệ thống nghiêm trọng",
     "Manage Site": "Quản lý trang",
     "Manage your notification preferences.": "Quản lý tùy chọn thông báo của bạn.",
@@ -118,7 +121,9 @@
     "Total Maintenances": "Tổng số lần bảo trì",
     "Under Maintenance": "Đang bảo trì",
     "Unknown impact": "Tác động không xác định",
+    "UP": "HOẠT ĐỘNG",
     "Upcoming": "Sắp tới",
+    "Update Incident": "Cập nhật sự cố",
     "Update Maintenance": "Cập nhật bảo trì",
     "Updates": "Cập nhật",
     "Updates (%count)": "Cập nhật (%count)",

src/lib/locales/zh-CN.json

@@ -18,9 +18,11 @@
     "Day Uptime": "日间正常运行时间",
     "Days": "天",
     "Degraded": "降级",
+    "DEGRADED": "降级",
     "Degraded Performance": "性能下降",
     "Didn't receive the code? Resend": "没有收到代码？",
     "Down": "宕机",
+    "DOWN": "故障",
     "Duration": "期间",
     "Email address": "电子邮件",
     "Embed Monitor": "嵌入监视器",
@@ -40,10 +42,10 @@
     "IDENTIFIED": "IDENTIFIED",
     "iFrame": "框架",
     "Impact": "影响",
+    "incident": "事件",
     "Incident Updates": "事件更新",
     "Incidents": "事件",
-    "Included Monitors": "Included Monitors",
-    "incident": "事件",
+    "Included Monitors (%count)": "Included Monitors (%count)",
     "INVESTIGATING": "INVESTIGATING",
     "Last Updated": "最后更新",
     "Latency": "延迟",
@@ -55,9 +57,10 @@
     "Light": "光",
     "Live Status": "实时状态",
     "Loading your preferences...": "正在加载您的偏好设置...",
+    "maintenance": "维护",
+    "MAINTENANCE": "维护中",
     "Maintenance Updates": "维护更新",
     "Maintenances": "维护保养",
-    "maintenance": "维护",
     "Major System Outage": "重大系统故障",
     "Manage Site": "管理站点",
     "Manage your notification preferences.": "管理您的通知首选项。",
@@ -118,7 +121,9 @@
     "Total Maintenances": "全面维护",
     "Under Maintenance": "维护中",
     "Unknown impact": "未知影响",
+    "UP": "正常",
     "Upcoming": "即将推出",
+    "Update Incident": "更新事件",
     "Update Maintenance": "更新维护",
     "Updates": "更新",
     "Updates (%count)": "更新 (%count)",

src/lib/locales/zh-TW.json

@@ -0,0 +1,133 @@
+{
+  "name": "繁體中文（台灣）",
+  "mappings": {
+    "%latency %metric latency": "%latency %metric 延遲",
+    "Affected Monitors (%count)": "受影響的監控項目 (%count)",
+    "All Systems Operational": "所有系統正常運作",
+    "Average Latency": "平均延遲",
+    "Avg Latency": "平均延遲",
+    "Back": "返回",
+    "Badges": "徽章",
+    "CANCELLED": "已取消",
+    "COMPLETED": "已完成",
+    "Continue": "繼續",
+    "Copied": "已複製",
+    "Current": "目前",
+    "Dark": "深色",
+    "Day": "天",
+    "Day Uptime": "當日正常運作時間",
+    "Days": "天",
+    "DEGRADED": "降級",
+    "Degraded Performance": "效能降低",
+    "Didn't receive the code? Resend": "沒有收到驗證碼？重新傳送",
+    "DOWN": "故障",
+    "Duration": "持續時間",
+    "Edit Monitor": "編輯監控",
+    "Email address": "電子郵件地址",
+    "Embed Monitor": "嵌入監控",
+    "Embed this monitor in your website or app": "將此監控嵌入您的網站或應用程式",
+    "End Time": "結束時間",
+    "Enter the verification code sent to your email.": "請輸入傳送至您電子郵件的驗證碼。",
+    "Events": "事件",
+    "Failed to load data": "載入資料失敗",
+    "Failed to load latency data": "載入延遲資料失敗",
+    "Failed to load status data for this day": "無法載入當日的狀態資料",
+    "Failed to send verification code": "傳送驗證碼失敗",
+    "Failed to update preference": "更新偏好設定失敗",
+    "Get badges for this monitor": "取得此監控的徽章",
+    "Get notified about incidents and scheduled maintenance.": "接收事件與排程維護的通知。",
+    "Get notified about incidents updates": "接收事件更新通知",
+    "Get notified about scheduled maintenance": "接收排程維護通知",
+    "IDENTIFIED": "已確認",
+    "iFrame": "iFrame",
+    "Impact": "影響",
+    "Incident Updates": "事件更新",
+    "Incidents": "事件",
+    "Included Monitors (%count)": "包含的監控項目 (%count)",
+    "INVESTIGATING": "調查中",
+    "Last Updated": "最後更新",
+    "Latency": "延遲",
+    "Latency Embed": "延遲嵌入",
+    "Latency Over Time": "延遲趨勢圖",
+    "Latency Trend": "延遲趨勢",
+    "Latest Latency": "最新延遲",
+    "Latest Status": "最新狀態",
+    "Light": "淺色",
+    "Live Status": "即時狀態",
+    "Loading your preferences...": "正在載入您的偏好設定……",
+    "MAINTENANCE": "維護中",
+    "Maintenance Updates": "維護更新",
+    "Maintenances": "維護作業",
+    "Major System Outage": "重大系統中斷",
+    "Manage Site": "管理網站",
+    "Manage your notification preferences.": "管理您的通知偏好設定。",
+    "Max Latency": "最大延遲",
+    "Maximum Latency": "最大延遲",
+    "Min Latency": "最小延遲",
+    "Minimum Latency": "最小延遲",
+    "Minute-by-minute status data for this day": "當日逐分鐘狀態資料",
+    "MONITORING": "監控中",
+    "Network error. Please try again.": "網路錯誤，請重試。",
+    "No Events in %currentMonth": "%currentMonth 沒有事件",
+    "No events to show": "沒有可顯示的事件",
+    "No incidents for this day": "當日無事件",
+    "No latency data available for this day": "當日無延遲資料",
+    "No maintenances for this day": "當日無維護作業",
+    "No monitors affected": "沒有受影響的監控項目",
+    "No monitors available.": "沒有可用的監控項目。",
+    "No ongoing maintenances": "沒有進行中的維護作業",
+    "No past maintenances": "沒有過去的維護作業",
+    "No Status Available": "無可用狀態",
+    "No upcoming maintenances": "沒有即將進行的維護作業",
+    "No Updates": "沒有更新",
+    "No updates yet": "尚無更新",
+    "Notifications": "通知",
+    "One-time": "單次",
+    "Ongoing": "進行中",
+    "Partial Degraded Performance": "部分效能降低",
+    "Partial System Outage": "部分系統中斷",
+    "Past": "過去",
+    "Per-Minute Status": "逐分鐘狀態",
+    "Pinging": "偵測中",
+    "Please enter a valid email address": "請輸入有效的電子郵件地址",
+    "Please enter the 6-digit verification code": "請輸入 6 位數驗證碼",
+    "Read less": "收合",
+    "Read more": "展開",
+    "READY": "就緒",
+    "Recurring": "週期性",
+    "RESOLVED": "已解決",
+    "SCHEDULED": "已排程",
+    "Scheduled Events (%count)": "排程事件 (%count)",
+    "Script": "程式碼",
+    "Select Language": "選擇語言",
+    "Select latency metric to display": "選擇要顯示的延遲指標",
+    "Select Range": "選擇範圍",
+    "Sending...": "傳送中……",
+    "Standard": "標準",
+    "Start Time": "開始時間",
+    "Status": "狀態",
+    "Status Badge": "狀態徽章",
+    "Status Embed": "狀態嵌入",
+    "Status history and latency trend": "狀態歷程與延遲趨勢",
+    "Subscribe": "訂閱",
+    "Subscribe to Updates": "訂閱更新",
+    "There are no incidents or maintenances scheduled for this month.": "本月沒有排程的事件或維護作業。",
+    "There are no ongoing incidents or maintenance events.": "目前沒有進行中的事件或維護作業。",
+    "Total Incidents": "事件總數",
+    "Total Maintenances": "維護總數",
+    "Under Maintenance": "維護中",
+    "Unknown impact": "影響不明",
+    "UP": "正常",
+    "Upcoming": "即將進行",
+    "Update Incident": "更新事件",
+    "Update Maintenance": "更新維護",
+    "Updates": "更新",
+    "Updates (%count)": "更新 (%count)",
+    "Uptime": "正常運作時間",
+    "Uptime Badge": "正常運作時間徽章",
+    "Verification failed": "驗證失敗",
+    "Verify": "驗證",
+    "Verifying": "驗證中",
+    "We sent a 6-digit code to": "我們已傳送 6 位數驗證碼至"
+  }
+}

src/lib/server/controllers/dashboardController.ts

@@ -159,9 +159,13 @@ export interface PageDashboardData {
   pageStatus: { statusSummary: string; statusClass: string };
   ongoingIncidents: IncidentForMonitorListWithComments[];
   ongoingMaintenances: MaintenanceEventsMonitorList[];
+  upcomingMaintenances: MaintenanceEventsMonitorList[];
   monitorTags: string[];
   monitorGroupMembersByTag: Record<string, string[]>;
   pageDetails: PageRecordTyped;
+  socialPagePreviewImage?: string;
+  metaPageTitle?: string;
+  metaPageDescription?: string;
 }
 
 const BuildPageStatus = (latestData: Array<{ status?: string | null; latency?: number | null }>, nowTs: number) => {
@@ -342,19 +346,39 @@ export const GetPageDashboardData = async (
     updated_at: pageDetails.updated_at,
   };
 
+  let socialPagePreviewImage: string | undefined = layoutData.socialPreviewImage;
+  let metaPageTitle: string | undefined = layoutData.metaSiteTitle;
+  let metaPageDescription: string | undefined = layoutData.metaSiteDescription;
+  if (!!pageDetails.page_settings_json) {
+    try {
+      const pageSettings = JSON.parse(pageDetails.page_settings_json);
+      if (pageSettings) {
+        socialPagePreviewImage = pageSettings.socialPagePreviewImage || layoutData.socialPreviewImage;
+        metaPageTitle = pageSettings.metaPageTitle || layoutData.metaSiteTitle;
+        metaPageDescription = pageSettings.metaPageDescription || layoutData.metaSiteDescription;
+      }
+    } catch (e) {
+      // Ignore JSON parsing errors and fallback to layout data or defaults
+    }
+  }
+
   if (monitorTags.length === 0) {
     return {
       pageStatus: BuildPageStatus([], nowTs),
       ongoingIncidents: [],
       ongoingMaintenances: [],
+      upcomingMaintenances: [],
       monitorTags,
       monitorGroupMembersByTag: {},
       pageDetails: pageDetailsTyped,
+      socialPagePreviewImage,
+      metaPageTitle,
+      metaPageDescription,
     };
   }
   const eventSettings = layoutData.eventDisplaySettings;
   // Fetch all dashboard data in parallel (respecting feature toggles)
-  const [latestData, parsedMonitors, ongoingIncidents, ongoingMaintenances] = await Promise.all([
+  const [latestData, parsedMonitors, ongoingIncidents, ongoingMaintenances, upcomingMaintenances] = await Promise.all([
     GetLatestMonitoringDataAllActive(monitorTags),
     GetMonitorsParsed({ tags: monitorTags, status: "ACTIVE", is_hidden: "NO" }),
     eventSettings.incidents.enabled && eventSettings.incidents.ongoing.show
@@ -363,6 +387,13 @@ export const GetPageDashboardData = async (
     eventSettings.maintenances.enabled && eventSettings.maintenances.ongoing.show
       ? GetOngoingMaintenances(monitorTags, nowTs)
       : Promise.resolve([] as MaintenanceEventsMonitorList[]),
+    eventSettings.maintenances.enabled && eventSettings.maintenances.upcoming.show
+      ? GetUpcomingMaintenanceEventsForMonitorList(
+          monitorTags,
+          eventSettings.maintenances.upcoming.maxCount,
+          eventSettings.maintenances.upcoming.daysInFuture,
+        )
+      : Promise.resolve([] as MaintenanceEventsMonitorList[]),
   ]);
 
   const pageStatus = BuildPageStatus(latestData, nowTs);
@@ -381,8 +412,12 @@ export const GetPageDashboardData = async (
     pageStatus,
     ongoingIncidents,
     ongoingMaintenances,
+    upcomingMaintenances,
     monitorTags,
     monitorGroupMembersByTag,
     pageDetails: pageDetailsTyped,
+    socialPagePreviewImage,
+    metaPageTitle,
+    metaPageDescription,
   };
 };

src/lib/server/controllers/incidentController.ts

@@ -526,3 +526,30 @@ export const ParseIncidentToAPIResp = async (
 
   return resp;
 };
+
+export const DeleteIncident = async (incident_id: number): Promise<{ success: boolean }> => {
+  const incident = await db.getIncidentById(incident_id);
+  if (!incident) {
+    throw new Error(`Incident with id ${incident_id} does not exist`);
+  }
+
+  // Set incident_id to null in monitor_alerts_v2
+  const alerts = await db.getAlertsByIncidentId(incident_id);
+  for (const alert of alerts) {
+    await db.updateMonitorAlertV2(alert.id, { incident_id: null });
+  }
+
+  // Delete incident monitors
+  const monitors = await db.getIncidentMonitorsByIncidentID(incident_id);
+  for (const monitor of monitors) {
+    await db.removeIncidentMonitor(incident_id, monitor.monitor_tag);
+  }
+
+  // Delete incident comments permanently
+  await db.deleteIncidentCommentsByIncidentID(incident_id);
+
+  // Delete the incident
+  await db.deleteIncident(incident_id);
+
+  return { success: true };
+};

src/lib/server/controllers/layoutController.ts

@@ -7,10 +7,10 @@ import {
   GetLoggedInSession,
   GetLocaleFromCookie,
   GetUsersCount,
+  HasRequiredEnv,
   IsEmailSetup,
-  IsSetupComplete,
 } from "./controller.js";
-import type { EventDisplaySettings, GlobalPageVisibilitySettings } from "$lib/types/site.js";
+import type { EventDisplaySettings, GlobalPageVisibilitySettings, SiteDateTimeFormat } from "$lib/types/site.js";
 
 export interface LayoutServerData {
   isMobile: boolean;
@@ -70,6 +70,9 @@ export interface LayoutServerData {
   socialPreviewImage?: string;
   customCSS?: string;
   globalPageVisibilitySettings: GlobalPageVisibilitySettings;
+  dateAndTimeFormat: SiteDateTimeFormat;
+  metaSiteTitle?: string;
+  metaSiteDescription?: string;
 }
 
 export async function GetLayoutServerData(cookies: Cookies, request: Request): Promise<LayoutServerData> {
@@ -83,7 +86,9 @@ export async function GetLayoutServerData(cookies: Cookies, request: Request): P
     GetUsersCount(),
   ]);
 
-  const isSetupComplete = await IsSetupComplete();
+  // Same check as IsSetupComplete, but reuses the site data fetched above
+  // instead of querying it a second time on every request
+  const isSetupComplete = HasRequiredEnv() && Object.keys(siteData).length > 0;
 
   const selectedLang = GetLocaleFromCookie(siteData, cookies);
   const siteStatusColors = siteData.colors;
@@ -137,5 +142,8 @@ export async function GetLayoutServerData(cookies: Cookies, request: Request): P
     socialPreviewImage: siteData.socialPreviewImage,
     customCSS: siteData.customCSS,
     globalPageVisibilitySettings: siteData.globalPageVisibilitySettings || seedSiteData.globalPageVisibilitySettings,
+    dateAndTimeFormat: siteData.dateAndTimeFormat || seedSiteData.dateAndTimeFormat,
+    metaSiteTitle: siteData.metaSiteTitle,
+    metaSiteDescription: siteData.metaSiteDescription,
   };
 }

src/lib/server/controllers/maintenanceController.ts

@@ -16,6 +16,7 @@ import { maintenanceToVariables, siteDataToVariables } from "../notification/not
 import { GetAllSiteData } from "./controller.js";
 import subscriberQueue from "../queues/subscriberQueue.js";
 import GC from "../../global-constants";
+import seedSiteData from "../db/seedSiteData.js";
 
 // ============ Input Interfaces ============
 
@@ -78,6 +79,7 @@ export interface MaintenanceWithEvents extends MaintenanceWithMonitors {
 export function determineEventStatus(
   eventStartTimestamp: number,
   eventEndTimestamp: number,
+  reminderBufferSeconds: number = 3600,
 ): "SCHEDULED" | "READY" | "ONGOING" | "COMPLETED" | "CANCELLED" {
   const nowTimestamp = Math.floor(Date.now() / 1000);
 
@@ -87,38 +89,90 @@ export function determineEventStatus(
   if (nowTimestamp >= eventStartTimestamp) {
     return "ONGOING";
   }
-  // 60 minutes = 3600 seconds
-  if (eventStartTimestamp - nowTimestamp <= 3600) {
+  if (eventStartTimestamp - nowTimestamp <= reminderBufferSeconds) {
     return "READY";
   }
   return "SCHEDULED";
 }
 
+// ============ Helper to create a maintenance event with notification ============
+
+export const CreateMaintenanceEventWithNotification = async (
+  maintenance_id: number,
+  start_date_time: number,
+  end_date_time: number,
+  title: string,
+  description: string | null,
+): Promise<MaintenanceEventRecord> => {
+  const siteData = await GetAllSiteData();
+  const notificationSettings =
+    siteData.globalMaintenanceNotificationSettings || seedSiteData.globalMaintenanceNotificationSettings;
+  const reminderBufferSeconds = notificationSettings.reminder_buffer_hours * 3600;
+
+  const event = await db.createMaintenanceEvent({
+    maintenance_id,
+    start_date_time,
+    end_date_time,
+    status: determineEventStatus(start_date_time, end_date_time, reminderBufferSeconds),
+  });
+
+  try {
+    if (notificationSettings.event_types.created) {
+      const siteVars = siteDataToVariables(siteData);
+      const siteUrl = siteVars.site_url;
+      const monitors = await db.getMonitorsByMaintenanceId(maintenance_id);
+      const monitorNames = monitors.map((m) => `${m.monitor_name}(${m.monitor_impact})`).join(", ");
+      const eventDetailed: MaintenanceEventRecordDetailed = {
+        id: event.id,
+        maintenance_id,
+        start_date_time,
+        end_date_time,
+        status: event.status as MaintenanceEventRecordDetailed["status"],
+        created_at: new Date(),
+        updated_at: new Date(),
+        title,
+        description,
+      };
+      const update = maintenanceToVariables(
+        eventDetailed,
+        monitorNames,
+        "**has been created**",
+        "created",
+        "Maintenance Created",
+        siteUrl,
+      );
+      await subscriberQueue.push(update);
+    }
+  } catch (err) {
+    console.error(`Error sending created notification for maintenance event ${event.id}:`, err);
+  }
+
+  return event;
+};
+
 // ============ Helper to generate upcoming events from RRULE ============
 
 /**
- * Generate maintenance events for the next N days based on the RRULE
+ * Generate maintenance events based on the RRULE
  * @param maintenance_id - The maintenance record ID
  * @param start_date_time - Unix timestamp for the DTSTART
  * @param rrule - The RRULE string (e.g., FREQ=WEEKLY;BYDAY=SU)
  * @param duration_seconds - Duration of each maintenance window
- * @param daysAhead - Number of days to look ahead (default 7)
+ * @param count - Maximum number of events to create (default 1)
  */
 export const GenerateMaintenanceEvents = async (
   maintenance_id: number,
   start_date_time: number,
   rrule: string,
   duration_seconds: number,
-  daysAhead: number = 7,
+  count: number = 1,
 ): Promise<MaintenanceEventRecord[]> => {
   const createdEvents: MaintenanceEventRecord[] = [];
 
   // Convert start timestamp to Date (UTC)
   const dtstart = new Date(start_date_time * 1000);
 
-  // Define the window to generate events
   const now = new Date();
-  const windowEnd = addDays(now, daysAhead);
 
   try {
     // Build the full RRULE string with DTSTART
@@ -127,22 +181,30 @@ export const GenerateMaintenanceEvents = async (
     // Parse the RRULE
     const rule = rrulestr(fullRrule);
 
-    // Get occurrences between now and window end
-    // For one-time (COUNT=1), we use dtstart as the reference
-    let occurrences: Date[];
+    // Get occurrences based on count
+    let occurrences: Date[] = [];
 
     if (rrule.includes("COUNT=1")) {
-      // One-time maintenance: only create event if start_date_time is in the future or within window
-      if (dtstart >= now || (dtstart <= windowEnd && dtstart >= addDays(now, -1))) {
+      // One-time maintenance: only create event if start_date_time is recent or in the future
+      if (dtstart >= now || dtstart >= addDays(now, -1)) {
         occurrences = [dtstart];
-      } else {
-        occurrences = [];
       }
     } else {
-      // Recurring: get all occurrences in the window
-      occurrences = rule.between(now, windowEnd, true);
+      // Recurring: get the next `count` occurrences from now
+      let searchFrom = now;
+      for (let i = 0; i < count; i++) {
+        const next = rule.after(searchFrom, i === 0);
+        if (!next) break;
+        occurrences.push(next);
+        searchFrom = new Date(next.getTime() + 1000);
+      }
     }
 
+    // Fetch maintenance info for notifications
+    const maintenance = await db.getMaintenanceById(maintenance_id);
+    const maintenanceTitle = maintenance?.title || "";
+    const maintenanceDescription = maintenance?.description || null;
+
     // Create events for each occurrence
     for (const occurrence of occurrences) {
       const eventStart = Math.floor(occurrence.getTime() / 1000);
@@ -153,12 +215,13 @@ export const GenerateMaintenanceEvents = async (
       const alreadyExists = existing.some((e) => e.start_date_time === eventStart);
 
       if (!alreadyExists) {
-        const event = await db.createMaintenanceEvent({
+        const event = await CreateMaintenanceEventWithNotification(
           maintenance_id,
-          start_date_time: eventStart,
-          end_date_time: eventEnd,
-          status: determineEventStatus(eventStart, eventEnd),
-        });
+          eventStart,
+          eventEnd,
+          maintenanceTitle,
+          maintenanceDescription,
+        );
         createdEvents.push(event);
       }
     }
@@ -202,8 +265,8 @@ export const CreateMaintenance = async (data: CreateMaintenanceInput): Promise<{
     await db.addMonitorsToMaintenanceWithStatus(maintenance.id, data.monitors);
   }
 
-  // Generate initial events for the next 7 days
-  await GenerateMaintenanceEvents(maintenance.id, data.start_date_time, data.rrule, data.duration_seconds, 7);
+  // Generate initial events
+  await GenerateMaintenanceEvents(maintenance.id, data.start_date_time, data.rrule, data.duration_seconds, 1);
 
   return {
     maintenance_id: maintenance.id,
@@ -336,7 +399,7 @@ export const UpdateMaintenance = async (id: number, data: UpdateMaintenanceInput
           }
         }
         // Regenerate the event
-        await GenerateMaintenanceEvents(id, updated.start_date_time, updated.rrule, updated.duration_seconds, 7);
+        await GenerateMaintenanceEvents(id, updated.start_date_time, updated.rrule, updated.duration_seconds, 1);
       } else {
         // For recurring maintenances: delete future SCHEDULED events and regenerate
         for (const event of events) {
@@ -345,8 +408,8 @@ export const UpdateMaintenance = async (id: number, data: UpdateMaintenanceInput
             await db.deleteMaintenanceEvent(event.id);
           }
         }
-        // Regenerate events for the next 7 days
-        await GenerateMaintenanceEvents(id, updated.start_date_time, updated.rrule, updated.duration_seconds, 7);
+        // Regenerate events
+        await GenerateMaintenanceEvents(id, updated.start_date_time, updated.rrule, updated.duration_seconds, 1);
       }
     }
   }
@@ -377,11 +440,16 @@ export const CreateMaintenanceEvent = async (data: CreateMaintenanceEventInput):
     throw new Error("End date/time must be after start date/time");
   }
 
+  const siteData = await GetAllSiteData();
+  const notificationSettings =
+    siteData.globalMaintenanceNotificationSettings || seedSiteData.globalMaintenanceNotificationSettings;
+  const reminderBufferSeconds = notificationSettings.reminder_buffer_hours * 3600;
+
   const event = await db.createMaintenanceEvent({
     maintenance_id: data.maintenance_id,
     start_date_time: data.start_date_time,
     end_date_time: data.end_date_time,
-    status: determineEventStatus(data.start_date_time, data.end_date_time),
+    status: determineEventStatus(data.start_date_time, data.end_date_time, reminderBufferSeconds),
   });
 
   return event;
@@ -534,20 +602,23 @@ export const formatDurationSeconds = (seconds: number): string => {
 
 /**
  * Update maintenance event statuses based on current time:
- * 1. SCHEDULED events starting within 60 minutes → READY
+ * 1. SCHEDULED events starting within the reminder buffer → READY
  * 2. READY events where current time is within start/end → ONGOING
  * 3. ONGOING events where end_date_time has passed → COMPLETED
  */
 export const UpdateMaintenanceEventStatuses = async (): Promise<void> => {
   const currentTimestamp = GetMinuteStartNowTimestampUTC();
-  const sixtyMinutesInSeconds = 60 * 60;
   const siteData = await GetAllSiteData();
   const siteVars = siteDataToVariables(siteData);
   const siteUrl = siteVars.site_url;
+  //get global maintenance notification settings
+  const notificationSettings =
+    siteData.globalMaintenanceNotificationSettings || seedSiteData.globalMaintenanceNotificationSettings;
 
+  const reminderBufferSeconds = notificationSettings.reminder_buffer_hours * 3600;
   try {
-    // 1. Mark SCHEDULED events starting within 60 minutes as READY
-    const scheduledEvents = await db.getScheduledEventsStartingSoon(currentTimestamp, sixtyMinutesInSeconds);
+    // 1. Mark SCHEDULED events starting within the reminder buffer as READY
+    const scheduledEvents = await db.getScheduledEventsStartingSoon(currentTimestamp, reminderBufferSeconds);
     for (const event of scheduledEvents) {
       await db.updateMaintenanceEventStatus(event.id, GC.READY);
       console.log(`Maintenance event ${event.id} marked as READY (starts at ${event.start_date_time})`);
@@ -557,15 +628,17 @@ export const UpdateMaintenanceEventStatuses = async (): Promise<void> => {
         new Date(event.start_date_time * 1000),
         new Date(currentTimestamp * 1000),
       );
-      const update = maintenanceToVariables(
-        event,
-        monitorNames,
-        `**is starting in ${timeUntilStart}**`,
-        "starting_soon",
-        "Maintenance Starting Soon",
-        siteUrl,
-      );
-      await subscriberQueue.push(update);
+      if (notificationSettings.event_types.reminder) {
+        const update = maintenanceToVariables(
+          event,
+          monitorNames,
+          `**is starting in ${timeUntilStart}**`,
+          "starting_soon",
+          "Maintenance Starting Soon",
+          siteUrl,
+        );
+        await subscriberQueue.push(update);
+      }
     }
 
     // 2. Catch-up: SCHEDULED events that missed the READY window and already started → ONGOING
@@ -575,15 +648,18 @@ export const UpdateMaintenanceEventStatuses = async (): Promise<void> => {
       console.log(`Maintenance event ${event.id} marked as ONGOING (catch-up from SCHEDULED)`);
       const monitors = await db.getMonitorsByMaintenanceId(event.maintenance_id);
       const monitorNames = monitors.map((m) => `${m.monitor_name}(${m.monitor_impact})`).join(", ");
-      const update = maintenanceToVariables(
-        event,
-        monitorNames,
-        "**is now in progress**",
-        "ongoing",
-        "Maintenance In Progress",
-        siteUrl,
-      );
-      await subscriberQueue.push(update);
+
+      if (notificationSettings.event_types.started) {
+        const update = maintenanceToVariables(
+          event,
+          monitorNames,
+          "**is now in progress**",
+          "ongoing",
+          "Maintenance In Progress",
+          siteUrl,
+        );
+        await subscriberQueue.push(update);
+      }
     }
 
     // 3. Mark READY events that are now in progress as ONGOING
@@ -593,15 +669,18 @@ export const UpdateMaintenanceEventStatuses = async (): Promise<void> => {
       console.log(`Maintenance event ${event.id} marked as ONGOING`);
       const monitors = await db.getMonitorsByMaintenanceId(event.maintenance_id);
       const monitorNames = monitors.map((m) => `${m.monitor_name}(${m.monitor_impact})`).join(", ");
-      const update = maintenanceToVariables(
-        event,
-        monitorNames,
-        "**is now in progress**",
-        "ongoing",
-        "Maintenance In Progress",
-        siteUrl,
-      );
-      await subscriberQueue.push(update);
+
+      if (notificationSettings.event_types.started) {
+        const update = maintenanceToVariables(
+          event,
+          monitorNames,
+          "**is now in progress**",
+          "ongoing",
+          "Maintenance In Progress",
+          siteUrl,
+        );
+        await subscriberQueue.push(update);
+      }
     }
 
     // 4. Mark ONGOING events that have ended as COMPLETED
@@ -611,15 +690,18 @@ export const UpdateMaintenanceEventStatuses = async (): Promise<void> => {
       console.log(`Maintenance event ${event.id} marked as COMPLETED`);
       const monitors = await db.getMonitorsByMaintenanceId(event.maintenance_id);
       const monitorNames = monitors.map((m) => `${m.monitor_name}(${m.monitor_impact})`).join(", ");
-      const update = maintenanceToVariables(
-        event,
-        monitorNames,
-        "**has been completed**",
-        "completed",
-        "Maintenance Completed",
-        siteUrl,
-      );
-      await subscriberQueue.push(update);
+
+      if (notificationSettings.event_types.ended) {
+        const update = maintenanceToVariables(
+          event,
+          monitorNames,
+          "**has been completed**",
+          "completed",
+          "Maintenance Completed",
+          siteUrl,
+        );
+        await subscriberQueue.push(update);
+      }
     }
   } catch (error) {
     console.error("Error updating maintenance event statuses:", error);

src/lib/server/controllers/monitorAlertConfigController.ts

@@ -127,19 +127,20 @@ export async function CreateMonitorAlertConfig(
   // Validate input
   validateMonitorAlertConfigInput(data);
 
-  if (!data.monitor_tag) {
-    throw new Error("monitor_tag is required");
+  if (!data.monitor_tags || data.monitor_tags.length === 0) {
+    throw new Error("At least one monitor is required");
   }
 
-  // Check if monitor exists
-  const monitor = await db.getMonitorByTag(data.monitor_tag);
-  if (!monitor) {
-    throw new Error(`Monitor with tag '${data.monitor_tag}' not found`);
+  // Check if all monitors exist
+  for (const tag of data.monitor_tags) {
+    const monitor = await db.getMonitorByTag(tag);
+    if (!monitor) {
+      throw new Error(`Monitor with tag '${tag}' not found`);
+    }
   }
 
   // Prepare insert data
   const insertData: MonitorAlertConfigInsert = {
-    monitor_tag: data.monitor_tag,
     alert_for: data.alert_for,
     alert_value: data.alert_value,
     failure_threshold: data.failure_threshold,
@@ -153,6 +154,9 @@ export async function CreateMonitorAlertConfig(
   // Insert alert config
   const id = await db.insertMonitorAlertConfig(insertData);
 
+  // Add monitors to junction table
+  await db.addMonitorsToAlertConfig(id, data.monitor_tags);
+
   // Add triggers if provided
   if (data.trigger_ids && data.trigger_ids.length > 0) {
     await db.addTriggersToMonitorAlertConfig(id, data.trigger_ids);
@@ -194,6 +198,19 @@ export async function UpdateMonitorAlertConfig(
     validateAlertValue(alertFor, data.alert_value);
   }
 
+  // Validate monitor_tags if provided
+  if (data.monitor_tags !== undefined) {
+    if (data.monitor_tags.length === 0) {
+      throw new Error("At least one monitor is required");
+    }
+    for (const tag of data.monitor_tags) {
+      const monitor = await db.getMonitorByTag(tag);
+      if (!monitor) {
+        throw new Error(`Monitor with tag '${tag}' not found`);
+      }
+    }
+  }
+
   // Prepare update data
   const updateData: MonitorAlertConfigUpdate = {};
   if (data.alert_for !== undefined) updateData.alert_for = data.alert_for;
@@ -210,6 +227,11 @@ export async function UpdateMonitorAlertConfig(
     await db.updateMonitorAlertConfig(data.id, updateData);
   }
 
+  // Update monitors if provided
+  if (data.monitor_tags !== undefined) {
+    await db.replaceAlertConfigMonitors(data.id, data.monitor_tags);
+  }
+
   // Update triggers if provided
   if (data.trigger_ids !== undefined) {
     await db.replaceMonitorAlertConfigTriggers(data.id, data.trigger_ids);
@@ -420,6 +442,7 @@ function validateAlertStatus(value: string): asserts value is MonitorAlertStatus
  */
 export async function CreateMonitorAlertV2(
   configId: number,
+  monitorTag?: string | null,
   incidentId?: number | null,
 ): Promise<MonitorAlertV2Record> {
   // Check if config exists
@@ -438,6 +461,7 @@ export async function CreateMonitorAlertV2(
 
   const insertData: MonitorAlertV2Insert = {
     config_id: configId,
+    monitor_tag: monitorTag || null,
     incident_id: incidentId || null,
     alert_status: "TRIGGERED",
   };

src/lib/server/controllers/monitorsController.ts

@@ -399,9 +399,7 @@ async function removeTagFromGroupMonitors(tag: string): Promise<void> {
       const weight = Math.round((1 / remaining.length) * 1000) / 1000;
       for (let i = 0; i < remaining.length; i++) {
         remaining[i].weight =
-          i === remaining.length - 1
-            ? Math.round((1 - weight * (remaining.length - 1)) * 1000) / 1000
-            : weight;
+          i === remaining.length - 1 ? Math.round((1 - weight * (remaining.length - 1)) * 1000) / 1000 : weight;
       }
     }
 
@@ -573,13 +571,10 @@ export const GetBadge = async (badgeType: BadgeType, params: BadgeParams): Promi
       }
     }
     const defaultLocale = i18nConfig?.defaultLocale || "en";
-    const activatedCodes = new Set(
-      i18nConfig?.locales?.filter((l) => l.selected).map((l) => l.code) ?? ["en"],
-    );
+    const activatedCodes = new Set(i18nConfig?.locales?.filter((l) => l.selected).map((l) => l.code) ?? ["en"]);
     const requestedLocale = params.locale || defaultLocale;
-    const locale = activatedCodes.has(requestedLocale) && isLocaleAvailable(requestedLocale)
-      ? requestedLocale
-      : defaultLocale;
+    const locale =
+      activatedCodes.has(requestedLocale) && isLocaleAvailable(requestedLocale) ? requestedLocale : defaultLocale;
 
     const statusLocaleKey: Record<string, string> = {
       [GC.UP]: "Operational",

src/lib/server/controllers/pagesController.ts

@@ -107,6 +107,7 @@ export async function AddMonitorToPage(
   page_id: number,
   monitor_tag: string,
   monitor_settings_json?: string | null,
+  position?: number,
 ): Promise<void> {
   // Check if page exists
   const page = await db.getPageById(page_id);
@@ -120,13 +121,38 @@ export async function AddMonitorToPage(
     throw new Error(`Monitor "${monitor_tag}" already exists on this page`);
   }
 
+  // If no position specified, append at end
+  let finalPosition = position;
+  if (finalPosition === undefined) {
+    const existing = await db.getPageMonitors(page_id);
+    finalPosition = existing.length > 0 ? Math.max(...existing.map((m) => m.position)) + 1 : 0;
+  }
+
   await db.addMonitorToPage({
     page_id,
     monitor_tag,
     monitor_settings_json: monitor_settings_json || null,
+    position: finalPosition,
   });
 }
 
+/**
+ * Reorder monitors on a page
+ */
+export async function ReorderPageMonitors(page_id: number, monitor_tags: string[]): Promise<void> {
+  const page = await db.getPageById(page_id);
+  if (!page) {
+    throw new Error(`Page with id ${page_id} not found`);
+  }
+
+  const monitorPositions = monitor_tags.map((tag, index) => ({
+    monitor_tag: tag,
+    position: index,
+  }));
+
+  await db.updatePageMonitorPositions(page_id, monitorPositions);
+}
+
 /**
  * Remove monitor from a page
  */

src/lib/server/controllers/siteDataController.ts

@@ -17,7 +17,10 @@ import type {
   SiteNavItem,
   SiteStatusColors,
   SiteSubMenuOptions,
+  SiteDateTimeFormat,
   SiteSubscriptionsSettings,
+  SitemapXMLConfig,
+  GlobalMaintenanceNotificationSettings,
 } from "../../types/site.js";
 
 export interface SiteDataTransformed {
@@ -60,6 +63,11 @@ export interface SiteDataTransformed {
   customCSS?: string;
   globalPageVisibilitySettings?: GlobalPageVisibilitySettings;
   pageOrderingSettings?: PageOrderingSettings;
+  dateAndTimeFormat?: SiteDateTimeFormat;
+  metaSiteTitle?: string;
+  metaSiteDescription?: string;
+  sitemap?: SitemapXMLConfig;
+  globalMaintenanceNotificationSettings?: GlobalMaintenanceNotificationSettings;
 }
 
 export function InsertKeyValue(key: string, value: string): Promise<number[]> {
@@ -100,6 +108,22 @@ export const GetLocaleFromCookie = (site: SiteDataTransformed, cookies: Cookies)
   return selectedLang;
 };
 
+/**
+ * Returns the site URL used for building absolute public URLs, without a trailing slash.
+ * Prefers the configured siteURL and falls back to the ORIGIN env var; only absolute
+ * http(s) values are returned. Returns an empty string when neither is usable, in which
+ * case callers degrade to a relative path.
+ */
+export const GetSiteURL = async (): Promise<string> => {
+  const siteURL = await GetSiteDataByKey("siteURL");
+  for (const candidate of [siteURL, process.env.ORIGIN]) {
+    if (typeof candidate === "string" && /^https?:\/\//i.test(candidate)) {
+      return candidate.replace(/\/+$/, "");
+    }
+  }
+  return "";
+};
+
 export const GetSiteLogoURL = async (siteURL: string, logo: string, base: string): Promise<string> => {
   if (logo.startsWith("http")) {
     return logo;
@@ -130,14 +154,17 @@ export const GetSiteDataByKey = async (key: string): Promise<unknown> => {
   return data.value;
 };
 
+/** Checks the env vars required for setup, without touching the database. */
+export const HasRequiredEnv = (): boolean => {
+  return (
+    process.env.KENER_SECRET_KEY !== undefined &&
+    process.env.ORIGIN !== undefined &&
+    process.env.REDIS_URL !== undefined
+  );
+};
+
 export const IsSetupComplete = async (): Promise<boolean> => {
-  if (process.env.KENER_SECRET_KEY === undefined) {
-    return false;
-  }
-  if (process.env.ORIGIN === undefined) {
-    return false;
-  }
-  if (process.env.REDIS_URL === undefined) {
+  if (!HasRequiredEnv()) {
     return false;
   }
   let data = await db.getAllSiteData();

src/lib/server/controllers/siteDataKeys.ts

@@ -43,12 +43,12 @@ export const siteDataKeys: SiteDataKey[] = [
   },
   {
     key: "favicon",
-    isValid: (value) => typeof value === "string" && value.trim().length > 0,
+    isValid: (value) => typeof value === "string",
     data_type: "string",
   },
   {
     key: "logo",
-    isValid: (value) => typeof value === "string" && value.trim().length > 0,
+    isValid: (value) => typeof value === "string",
     data_type: "string",
   },
   {
@@ -271,4 +271,29 @@ export const siteDataKeys: SiteDataKey[] = [
     isValid: IsValidJSONString,
     data_type: "object",
   },
+  {
+    key: "dateAndTimeFormat",
+    isValid: IsValidJSONString,
+    data_type: "object",
+  },
+  {
+    key: "metaSiteTitle",
+    isValid: (value) => typeof value === "string",
+    data_type: "string",
+  },
+  {
+    key: "metaSiteDescription",
+    isValid: (value) => typeof value === "string",
+    data_type: "string",
+  },
+  {
+    key: "sitemap",
+    isValid: IsValidJSONString,
+    data_type: "object",
+  },
+  {
+    key: "globalMaintenanceNotificationSettings",
+    isValid: IsValidJSONString,
+    data_type: "object",
+  },
 ];

src/lib/server/controllers/userController.ts

@@ -2,7 +2,7 @@ import db from "../db/db.js";
 import type { PaginationInput } from "$lib/types/common";
 import { GenerateToken, HashPassword, ValidatePassword, VerifyToken } from "./commonController.js";
 import type { Cookies } from "@sveltejs/kit";
-import type { UserRecordPublic, UserRecordDashboard } from "../types/db.js";
+import type { UserRecordPublic, UserRecordDashboard, RoleRecord } from "../types/db.js";
 import { GetAllSiteData } from "./controller.js";
 import { siteDataToVariables } from "../notification/notification_utils.js";
 import sendEmail from "../notification/email_notification.js";
@@ -16,7 +16,7 @@ export interface UserUpdateInput {
 
 interface ManualUserUpdateInput {
   updateType: string;
-  role?: string;
+  role_ids?: string[];
   is_active?: number;
   password?: string;
   passwordPlain?: string;
@@ -32,7 +32,7 @@ interface NewUserInput {
   name: string;
   password: string;
   plainPassword: string;
-  role: string;
+  role_ids: string[];
 }
 
 const EMAIL_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
@@ -65,12 +65,18 @@ const validateNameOrThrow = (name: string): string => {
   return normalizedName;
 };
 
-export const GetAllUsersPaginated = async (data: PaginationInput): Promise<UserRecordPublic[]> => {
-  return await db.getUsersPaginated(data.page, data.limit);
+export const GetAllUsersPaginated = async (
+  data: PaginationInput,
+  filter?: { is_active?: number },
+): Promise<UserRecordPublic[]> => {
+  return await db.getUsersPaginated(data.page, data.limit, filter);
 };
 
-export const GetAllUsersPaginatedDashboard = async (data: PaginationInput): Promise<UserRecordDashboard[]> => {
-  const users = await db.getUsersPaginated(data.page, data.limit);
+export const GetAllUsersPaginatedDashboard = async (
+  data: PaginationInput,
+  filter?: { is_active?: number },
+): Promise<UserRecordDashboard[]> => {
+  const users = await db.getUsersPaginated(data.page, data.limit, filter);
   if (users.length === 0) return [];
 
   // Batch fetch password statuses for all users
@@ -88,8 +94,8 @@ export const GetAllUsers = async () => {
   return await db.getAllUsers();
 };
 
-export const GetUsersCount = async () => {
-  return await db.getUsersCount();
+export const GetUsersCount = async (filter?: { is_active?: number }) => {
+  return await db.getTotalUsers(filter);
 };
 
 export const GetUserPasswordHashById = async (id: number) => {
@@ -145,14 +151,20 @@ export const UpdateUserData = async (data: UserUpdateInput): Promise<number> =>
   }
 };
 
-export const CreateNewUser = async (currentUser: { role: string }, data: NewUserInput): Promise<number[]> => {
-  let acceptedRoles = ["member", "editor"];
-  if (!acceptedRoles.includes(data.role)) {
-    throw new Error("Invalid role");
+export const CreateNewUser = async (data: NewUserInput): Promise<number[]> => {
+  if (!data.role_ids || data.role_ids.length === 0) {
+    throw new Error("At least one role is required");
   }
 
-  if (currentUser.role === "member") {
-    throw new Error("Only admins and editors can create new users");
+  // Validate all role_ids exist and are active
+  for (const roleId of data.role_ids) {
+    const role = await db.getRoleById(roleId);
+    if (!role) {
+      throw new Error(`Role "${roleId}" does not exist`);
+    }
+    if (role.status !== "ACTIVE") {
+      throw new Error(`Role "${roleId}" is not active`);
+    }
   }
 
   const normalizedEmail = validateEmailOrThrow(data.email);
@@ -163,11 +175,6 @@ export const CreateNewUser = async (currentUser: { role: string }, data: NewUser
     throw new Error("Password cannot be empty");
   }
 
-  //if data.role empty, throw error
-  if (!!!data.role) {
-    throw new Error("Role cannot be empty");
-  }
-
   //if data.password not equal to data.plainPassword, throw error
   if (data.password !== data.plainPassword) {
     throw new Error("Passwords do not match");
@@ -182,7 +189,7 @@ export const CreateNewUser = async (currentUser: { role: string }, data: NewUser
     email: normalizedEmail,
     password_hash: await HashPassword(data.password),
     name: normalizedName,
-    role: data.role,
+    role_ids: data.role_ids,
   };
   return await db.insertUser(user);
 };
@@ -202,7 +209,7 @@ export const CreateFirstUser = async (data: { email: string; name: string; passw
     email: normalizedEmail,
     password_hash: await HashPassword(data.password),
     name: normalizedName,
-    role: "admin",
+    role_ids: ["admin"],
     is_owner: "YES",
   };
   return await db.insertUser(user);
@@ -229,33 +236,34 @@ export const UpdatePassword = async (data: PasswordUpdateInput): Promise<number>
   });
 };
 
-const VALID_ROLES = ["admin", "editor", "member"] as const;
-
-export const ManualUpdateUserData = async (
-  byUser: { id: number; role: string; is_owner: string },
-  forUserId: number,
-  data: ManualUserUpdateInput,
-): Promise<number | undefined> => {
+export const ManualUpdateUserData = async (forUserId: number, data: ManualUserUpdateInput): Promise<number | void> => {
   let forUser = await db.getUserById(forUserId);
   if (!forUser) {
     throw new Error("User not found");
   }
-  //only admins can update
-  if (byUser.role !== "admin") {
-    throw new Error("You do not have permission to update user");
-  }
-  // non-owner admins cannot modify other admins (self-updates are allowed)
-  if (forUser.role === "admin" && byUser.is_owner !== "YES" && forUser.id !== byUser.id) {
-    throw new Error("Only the owner can modify other admins");
-  }
   if (data.updateType == "role") {
-    if (!data.role) throw new Error("Role is required");
-    if (!VALID_ROLES.includes(data.role as (typeof VALID_ROLES)[number])) {
-      throw new Error(`Invalid role. Must be one of: ${VALID_ROLES.join(", ")}`);
+    if (!data.role_ids || data.role_ids.length === 0) throw new Error("At least one role is required");
+    // Owner must always retain the admin role
+    if (forUser.is_owner === "YES" && !data.role_ids.includes("admin")) {
+      throw new Error("Owner must retain the admin role");
     }
-    return await db.updateUserRole(forUser.id, data.role);
+    // Validate all role_ids exist and are active
+    for (const roleId of data.role_ids) {
+      const role = await db.getRoleById(roleId);
+      if (!role) {
+        throw new Error(`Role "${roleId}" does not exist`);
+      }
+      if (role.status !== "ACTIVE") {
+        throw new Error(`Role "${roleId}" is not active`);
+      }
+    }
+    return await db.updateUserRoles(forUser.id, data.role_ids);
   } else if (data.updateType == "is_active") {
     if (data.is_active === undefined) throw new Error("is_active is required");
+    // Owner cannot be deactivated
+    if (forUser.is_owner === "YES" && data.is_active === 0) {
+      throw new Error("Owner account cannot be deactivated");
+    }
     return await db.updateUserIsActive(forUser.id, data.is_active);
   } else if (data.updateType == "password") {
     if (!data.password || !data.passwordPlain) throw new Error("Password is required");
@@ -297,15 +305,20 @@ export const GetTotalUserPages = async (limit: number): Promise<number> => {
 };
 
 //send invitation email to user for account creation
-export const SendInvitationEmail = async (email: string, role: string, name: string, currentUserRole: string) => {
-  if (currentUserRole === "member") {
-    throw new Error("Only admins and editors can create new users");
+export const SendInvitationEmail = async (email: string, role_ids: string[], name: string) => {
+  if (!role_ids || role_ids.length === 0) {
+    throw new Error("At least one role is required");
   }
 
-  // Admins can add admin, editor, member; Editors can only add editor, member
-  const acceptedRoles = currentUserRole === "admin" ? ["admin", "editor", "member"] : ["editor", "member"];
-  if (!acceptedRoles.includes(role)) {
-    throw new Error("Invalid role");
+  // Validate all role_ids exist and are active
+  for (const roleId of role_ids) {
+    const role = await db.getRoleById(roleId);
+    if (!role) {
+      throw new Error(`Role "${roleId}" does not exist`);
+    }
+    if (role.status !== "ACTIVE") {
+      throw new Error(`Role "${roleId}" is not active`);
+    }
   }
 
   const normalizedEmail = validateEmailOrThrow(email);
@@ -323,7 +336,7 @@ export const SendInvitationEmail = async (email: string, role: string, name: str
       email: normalizedEmail,
       password_hash: "",
       name: normalizedName,
-      role,
+      role_ids: role_ids,
       is_active: 0,
     });
   } catch (error: unknown) {
@@ -364,11 +377,7 @@ export const SendInvitationEmail = async (email: string, role: string, name: str
 };
 
 //resend invitation email to existing user with blank password
-export const ResendInvitationEmail = async (email: string, currentUserRole: string) => {
-  if (currentUserRole === "member") {
-    throw new Error("Only admins and editors can resend invitations");
-  }
-
+export const ResendInvitationEmail = async (email: string) => {
   const normalizedEmail = validateEmailOrThrow(email);
 
   const user = await db.getUserByEmail(normalizedEmail);
@@ -410,17 +419,11 @@ export const ResendInvitationEmail = async (email: string, currentUserRole: stri
 };
 
 // send verification email with verification link
-export const SendVerificationEmail = async (toUserId: number, currentUser: { id: number; role: string }) => {
+export const SendVerificationEmail = async (toUserId: number, currentUserId: number) => {
   if (!toUserId) {
     throw new Error("User ID is required");
   }
 
-  // Only admins/editors can send verification to other users.
-  // Members can only send verification email to themselves.
-  if (currentUser.role === "member" && currentUser.id !== toUserId) {
-    throw new Error("You do not have permission to send verification email for this user");
-  }
-
   const user = await db.getUserById(toUserId);
   if (!user) {
     throw new Error("User not found");
@@ -458,3 +461,221 @@ export const SendVerificationEmail = async (toUserId: number, currentUser: { id:
     template.template_text_body || "",
   );
 };
+
+const RESTRICTED_ROLE_IDS = ["admin", "editor", "member"];
+const ROLE_ID_REGEX = /^[a-z0-9_-]+$/;
+
+const normalizeRoleId = (id: string): string => {
+  return id.trim().toLowerCase().replace(/\s+/g, "_");
+};
+
+export const CreateRole = async (data: { role_id: string; name: string }): Promise<RoleRecord> => {
+  const roleId = normalizeRoleId(data.role_id || "");
+  const roleName = data.name?.trim();
+
+  if (!roleId) {
+    throw new Error("Role ID is required");
+  }
+  if (!ROLE_ID_REGEX.test(roleId)) {
+    throw new Error("Role ID can only contain lowercase letters, numbers, underscores, and hyphens");
+  }
+  if (!roleName) {
+    throw new Error("Role name is required");
+  }
+
+  if (RESTRICTED_ROLE_IDS.includes(roleId)) {
+    throw new Error(`Role ID "${roleId}" is restricted and cannot be used`);
+  }
+
+  const existing = await db.getRoleById(roleId);
+  if (existing) {
+    throw new Error(`Role with ID "${roleId}" already exists`);
+  }
+
+  await db.insertRole({ id: roleId, role_name: roleName });
+
+  const created = await db.getRoleById(roleId);
+  if (!created) {
+    throw new Error("Failed to create role");
+  }
+  return created;
+};
+
+export const UpdateRole = async (roleId: string, data: { name?: string; status?: string }): Promise<RoleRecord> => {
+  if (!roleId) {
+    throw new Error("Role ID is required");
+  }
+
+  const existing = await db.getRoleById(roleId);
+  if (!existing) {
+    throw new Error(`Role "${roleId}" not found`);
+  }
+
+  if (existing.readonly === 1) {
+    throw new Error("Readonly roles cannot be updated");
+  }
+
+  const updates: { role_name?: string; status?: string } = {};
+
+  if (data.name !== undefined) {
+    const trimmed = data.name.trim();
+    if (!trimmed) {
+      throw new Error("Role name cannot be empty");
+    }
+    updates.role_name = trimmed;
+  }
+
+  if (data.status !== undefined) {
+    if (data.status !== "ACTIVE" && data.status !== "INACTIVE") {
+      throw new Error("Status must be ACTIVE or INACTIVE");
+    }
+    updates.status = data.status;
+  }
+
+  if (Object.keys(updates).length === 0) {
+    throw new Error("No valid fields to update");
+  }
+
+  await db.updateRole(roleId, updates);
+
+  const updated = await db.getRoleById(roleId);
+  if (!updated) {
+    throw new Error("Failed to retrieve updated role");
+  }
+  return updated;
+};
+
+export const DeleteRole = async (
+  roleId: string,
+  options: { action: "migrate"; targetRoleId: string } | { action: "remove" },
+): Promise<{ success: true }> => {
+  if (!roleId) {
+    throw new Error("Role ID is required");
+  }
+
+  const existing = await db.getRoleById(roleId);
+  if (!existing) {
+    throw new Error(`Role "${roleId}" not found`);
+  }
+
+  if (existing.readonly === 1) {
+    throw new Error("Readonly roles cannot be deleted");
+  }
+
+  if (options.action === "migrate") {
+    const targetRoleId = options.targetRoleId?.trim();
+    if (!targetRoleId) {
+      throw new Error("Target role ID is required for migration");
+    }
+    if (targetRoleId === roleId) {
+      throw new Error("Target role cannot be the same as the role being deleted");
+    }
+    const targetRole = await db.getRoleById(targetRoleId);
+    if (!targetRole) {
+      throw new Error(`Target role "${targetRoleId}" not found`);
+    }
+    if (targetRole.status !== "ACTIVE") {
+      throw new Error("Cannot migrate users to an inactive role");
+    }
+    await db.migrateUsersRole(roleId, targetRoleId);
+  }
+
+  // CASCADE on FK will clean up users_roles and roles_permissions
+  await db.deleteRole(roleId);
+
+  return { success: true };
+};
+
+export const GetAllRoles = async (): Promise<RoleRecord[]> => {
+  return await db.getAllRoles();
+};
+
+export const GetAllPermissions = async () => {
+  return await db.getAllPermissions();
+};
+
+export const GetRolePermissions = async (roleId: string) => {
+  const role = await db.getRoleById(roleId);
+  if (!role) {
+    throw new Error(`Role "${roleId}" not found`);
+  }
+  return await db.getRolePermissions(roleId);
+};
+
+export const UpdateRolePermissions = async (roleId: string, permissionIds: string[]) => {
+  const role = await db.getRoleById(roleId);
+  if (!role) {
+    throw new Error(`Role "${roleId}" not found`);
+  }
+  if (role.readonly === 1) {
+    throw new Error("Readonly roles cannot have their permissions modified");
+  }
+
+  // Get current permissions
+  const current = await db.getRolePermissions(roleId);
+  const currentIds = new Set(current.map((p) => p.permissions_id));
+  const desiredIds = new Set(permissionIds);
+
+  // Add new permissions
+  for (const pid of permissionIds) {
+    if (!currentIds.has(pid)) {
+      await db.addRolePermission(roleId, pid);
+    }
+  }
+
+  // Remove old permissions
+  for (const pid of currentIds) {
+    if (!desiredIds.has(pid)) {
+      await db.removeRolePermission(roleId, pid);
+    }
+  }
+
+  return await db.getRolePermissions(roleId);
+};
+
+export const GetRoleUsers = async (roleId: string) => {
+  const role = await db.getRoleById(roleId);
+  if (!role) {
+    throw new Error(`Role "${roleId}" not found`);
+  }
+  return await db.getUsersByRoleId(roleId);
+};
+
+export const AddUserToRole = async (roleId: string, userId: number) => {
+  const role = await db.getRoleById(roleId);
+  if (!role) {
+    throw new Error(`Role "${roleId}" not found`);
+  }
+  if (role.status !== "ACTIVE") {
+    throw new Error(`Role "${roleId}" is not active`);
+  }
+  // Check if user already in role
+  const users = await db.getUsersByRoleId(roleId);
+  if (users.some((u) => u.id === userId)) {
+    throw new Error("User is already assigned to this role");
+  }
+  await db.addUserToRole(roleId, userId);
+  return { success: true };
+};
+
+export const RemoveUserFromRole = async (roleId: string, userId: number) => {
+  if (roleId === "admin") {
+    const user = await db.getUserById(userId);
+    if (user && user.is_owner === "YES") {
+      throw new Error("The owner cannot be removed from the admin role");
+    }
+  }
+  await db.removeUserFromRole(roleId, userId);
+  return { success: true };
+};
+
+export const GetUserPermissions = async (userId: number): Promise<Set<string>> => {
+  const permissionIds = await db.getUserPermissionIds(userId);
+  return new Set(permissionIds);
+};
+
+export const RequirePermission = (userPermissions: Set<string>, permissionId: string): void => {
+  if (!userPermissions.has(permissionId)) {
+    throw new Error("You do not have permission to perform this action");
+  }
+};

src/lib/server/db/dbimpl.ts

@@ -115,11 +115,29 @@ class DbImpl {
   getUsersPaginated!: UsersRepository["getUsersPaginated"];
   getTotalUsers!: UsersRepository["getTotalUsers"];
   updateUserName!: UsersRepository["updateUserName"];
-  updateUserRole!: UsersRepository["updateUserRole"];
+  updateUserRoles!: UsersRepository["updateUserRoles"];
   updateUserIsActive!: UsersRepository["updateUserIsActive"];
   updateUserPasswordById!: UsersRepository["updateUserPasswordById"];
   updateIsVerified!: UsersRepository["updateIsVerified"];
 
+  // ============ Roles ============
+  getRoleById!: UsersRepository["getRoleById"];
+  getAllRoles!: UsersRepository["getAllRoles"];
+  insertRole!: UsersRepository["insertRole"];
+  updateRole!: UsersRepository["updateRole"];
+  deleteRole!: UsersRepository["deleteRole"];
+  getUsersCountByRoleId!: UsersRepository["getUsersCountByRoleId"];
+  migrateUsersRole!: UsersRepository["migrateUsersRole"];
+  getRolePermissions!: UsersRepository["getRolePermissions"];
+  getAllPermissions!: UsersRepository["getAllPermissions"];
+  addRolePermission!: UsersRepository["addRolePermission"];
+  removeRolePermission!: UsersRepository["removeRolePermission"];
+  getUsersByRoleId!: UsersRepository["getUsersByRoleId"];
+  addUserToRole!: UsersRepository["addUserToRole"];
+  removeUserFromRole!: UsersRepository["removeUserFromRole"];
+  getUserPermissionIds!: UsersRepository["getUserPermissionIds"];
+  getUserRoleIds!: UsersRepository["getUserRoleIds"];
+
   // ============ API Keys ============
   createNewApiKey!: UsersRepository["createNewApiKey"];
   updateApiKeyStatus!: UsersRepository["updateApiKeyStatus"];
@@ -187,6 +205,7 @@ class DbImpl {
   updateIncidentCommentByID!: IncidentsRepository["updateIncidentCommentByID"];
   updateIncidentCommentStatusByID!: IncidentsRepository["updateIncidentCommentStatusByID"];
   getIncidentCommentByID!: IncidentsRepository["getIncidentCommentByID"];
+  deleteIncidentCommentsByIncidentID!: IncidentsRepository["deleteIncidentCommentsByIncidentID"];
 
   // ============ Images ============
   insertImage!: ImagesRepository["insertImage"];
@@ -212,6 +231,7 @@ class DbImpl {
   monitorExistsOnPage!: PagesRepository["monitorExistsOnPage"];
   deletePageMonitorsByTag!: PagesRepository["deletePageMonitorsByTag"];
   deletePageMonitorsByPageId!: PagesRepository["deletePageMonitorsByPageId"];
+  updatePageMonitorPositions!: PagesRepository["updatePageMonitorPositions"];
 
   // ============ Maintenances ============
   createMaintenance!: MaintenancesRepository["createMaintenance"];
@@ -290,6 +310,12 @@ class DbImpl {
   isTriggerUsedInMonitorAlertConfig!: MonitorAlertConfigRepository["isTriggerUsedInMonitorAlertConfig"];
   getMonitorAlertConfigsByTriggerId!: MonitorAlertConfigRepository["getMonitorAlertConfigsByTriggerId"];
 
+  // ============ Monitor Alert Config Monitors ============
+  addMonitorsToAlertConfig!: MonitorAlertConfigRepository["addMonitorsToAlertConfig"];
+  removeAllMonitorsFromAlertConfig!: MonitorAlertConfigRepository["removeAllMonitorsFromAlertConfig"];
+  replaceAlertConfigMonitors!: MonitorAlertConfigRepository["replaceAlertConfigMonitors"];
+  getAlertConfigMonitorTags!: MonitorAlertConfigRepository["getAlertConfigMonitorTags"];
+
   // ============ Monitor Alerts V2 ============
   insertMonitorAlertV2!: MonitorAlertConfigRepository["insertMonitorAlertV2"];
   updateMonitorAlertV2!: MonitorAlertConfigRepository["updateMonitorAlertV2"];
@@ -452,7 +478,7 @@ class DbImpl {
     this.getUsersPaginated = this.users.getUsersPaginated.bind(this.users);
     this.getTotalUsers = this.users.getTotalUsers.bind(this.users);
     this.updateUserName = this.users.updateUserName.bind(this.users);
-    this.updateUserRole = this.users.updateUserRole.bind(this.users);
+    this.updateUserRoles = this.users.updateUserRoles.bind(this.users);
     this.updateUserIsActive = this.users.updateUserIsActive.bind(this.users);
     this.updateUserPasswordById = this.users.updateUserPasswordById.bind(this.users);
     this.updateIsVerified = this.users.updateIsVerified.bind(this.users);
@@ -461,6 +487,24 @@ class DbImpl {
     this.deleteApiKey = this.users.deleteApiKey.bind(this.users);
     this.getApiKeyByHashedKey = this.users.getApiKeyByHashedKey.bind(this.users);
     this.getAllApiKeys = this.users.getAllApiKeys.bind(this.users);
+
+    // Roles
+    this.getRoleById = this.users.getRoleById.bind(this.users);
+    this.getAllRoles = this.users.getAllRoles.bind(this.users);
+    this.insertRole = this.users.insertRole.bind(this.users);
+    this.updateRole = this.users.updateRole.bind(this.users);
+    this.deleteRole = this.users.deleteRole.bind(this.users);
+    this.getUsersCountByRoleId = this.users.getUsersCountByRoleId.bind(this.users);
+    this.migrateUsersRole = this.users.migrateUsersRole.bind(this.users);
+    this.getRolePermissions = this.users.getRolePermissions.bind(this.users);
+    this.getAllPermissions = this.users.getAllPermissions.bind(this.users);
+    this.addRolePermission = this.users.addRolePermission.bind(this.users);
+    this.removeRolePermission = this.users.removeRolePermission.bind(this.users);
+    this.getUsersByRoleId = this.users.getUsersByRoleId.bind(this.users);
+    this.addUserToRole = this.users.addUserToRole.bind(this.users);
+    this.removeUserFromRole = this.users.removeUserFromRole.bind(this.users);
+    this.getUserPermissionIds = this.users.getUserPermissionIds.bind(this.users);
+    this.getUserRoleIds = this.users.getUserRoleIds.bind(this.users);
   }
 
   private bindSiteDataMethods(): void {
@@ -529,6 +573,7 @@ class DbImpl {
     this.updateIncidentCommentByID = this.incidents.updateIncidentCommentByID.bind(this.incidents);
     this.updateIncidentCommentStatusByID = this.incidents.updateIncidentCommentStatusByID.bind(this.incidents);
     this.getIncidentCommentByID = this.incidents.getIncidentCommentByID.bind(this.incidents);
+    this.deleteIncidentCommentsByIncidentID = this.incidents.deleteIncidentCommentsByIncidentID.bind(this.incidents);
   }
 
   private bindImagesMethods(): void {
@@ -554,6 +599,7 @@ class DbImpl {
     this.monitorExistsOnPage = this.pages.monitorExistsOnPage.bind(this.pages);
     this.deletePageMonitorsByTag = this.pages.deletePageMonitorsByTag.bind(this.pages);
     this.deletePageMonitorsByPageId = this.pages.deletePageMonitorsByPageId.bind(this.pages);
+    this.updatePageMonitorPositions = this.pages.updatePageMonitorPositions.bind(this.pages);
   }
 
   private bindMaintenancesMethods(): void {
@@ -688,6 +734,14 @@ class DbImpl {
       this.monitorAlertConfig,
     );
 
+    // Monitor Alert Config Monitors
+    this.addMonitorsToAlertConfig = this.monitorAlertConfig.addMonitorsToAlertConfig.bind(this.monitorAlertConfig);
+    this.removeAllMonitorsFromAlertConfig = this.monitorAlertConfig.removeAllMonitorsFromAlertConfig.bind(
+      this.monitorAlertConfig,
+    );
+    this.replaceAlertConfigMonitors = this.monitorAlertConfig.replaceAlertConfigMonitors.bind(this.monitorAlertConfig);
+    this.getAlertConfigMonitorTags = this.monitorAlertConfig.getAlertConfigMonitorTags.bind(this.monitorAlertConfig);
+
     // Monitor Alerts V2
     this.insertMonitorAlertV2 = this.monitorAlertConfig.insertMonitorAlertV2.bind(this.monitorAlertConfig);
     this.updateMonitorAlertV2 = this.monitorAlertConfig.updateMonitorAlertV2.bind(this.monitorAlertConfig);
@@ -780,6 +834,16 @@ class DbImpl {
 
   async init(): Promise<void> {}
 
+  /** Probes database connectivity with a trivial query. Never throws. */
+  async ping(): Promise<boolean> {
+    try {
+      await this.knex.raw("select 1");
+      return true;
+    } catch {
+      return false;
+    }
+  }
+
   async close(): Promise<void> {
     return await this.knex.destroy();
   }

src/lib/server/db/repositories/incidents.ts

@@ -818,6 +818,10 @@ export class IncidentsRepository extends BaseRepository {
     return await this.knex("incident_comments").where({ id }).first();
   }
 
+  async deleteIncidentCommentsByIncidentID(incident_id: number): Promise<number> {
+    return await this.knex("incident_comments").where({ incident_id }).del();
+  }
+
   /**
    * Get incidents within a date range for the events page
    * Returns incidents that started within the given date range

src/lib/server/db/repositories/monitorAlertConfig.ts

@@ -7,6 +7,8 @@ import type {
   MonitorAlertConfigTriggerRecord,
   MonitorAlertConfigTriggerInsert,
   MonitorAlertConfigWithTriggers,
+  MonitorAlertConfigMonitorRecord,
+  MonitorAlertConfigMonitorInsert,
   TriggerRecord,
   MonitorAlertV2Record,
   MonitorAlertV2Insert,
@@ -29,7 +31,7 @@ export class MonitorAlertConfigRepository extends BaseRepository {
   async insertMonitorAlertConfig(data: MonitorAlertConfigInsert): Promise<number> {
     const dbType = GetDbType();
     const insertData = {
-      monitor_tag: data.monitor_tag,
+      monitor_tag: data.monitor_tag || null,
       alert_for: data.alert_for,
       alert_value: data.alert_value,
       failure_threshold: data.failure_threshold,
@@ -88,29 +90,35 @@ export class MonitorAlertConfigRepository extends BaseRepository {
    * Get monitor alert configs with optional filtering
    */
   async getMonitorAlertConfigs(filter: MonitorAlertConfigFilter): Promise<MonitorAlertConfigRecord[]> {
-    let query = this.knex("monitor_alerts_config").whereRaw("1=1");
+    let query = this.knex("monitor_alerts_config as mac").select("mac.*").whereRaw("1=1");
 
     if (filter.id !== undefined) {
-      query = query.andWhere("id", filter.id);
+      query = query.andWhere("mac.id", filter.id);
     }
     if (filter.monitor_tag !== undefined) {
-      query = query.andWhere("monitor_tag", filter.monitor_tag);
+      query = query
+        .join("monitor_alerts_config_monitors as macm", "mac.id", "macm.monitor_alerts_id")
+        .andWhere("macm.monitor_tag", filter.monitor_tag);
     }
     if (filter.alert_for !== undefined) {
-      query = query.andWhere("alert_for", filter.alert_for);
+      query = query.andWhere("mac.alert_for", filter.alert_for);
     }
     if (filter.is_active !== undefined) {
-      query = query.andWhere("is_active", filter.is_active);
+      query = query.andWhere("mac.is_active", filter.is_active);
     }
 
-    return await query.orderBy("id", "desc");
+    return await query.orderBy("mac.id", "desc");
   }
 
   /**
    * Get all monitor alert configs for a specific monitor tag
    */
   async getMonitorAlertConfigsByMonitorTag(monitorTag: string): Promise<MonitorAlertConfigRecord[]> {
-    return await this.knex("monitor_alerts_config").where({ monitor_tag: monitorTag }).orderBy("id", "desc");
+    return await this.knex("monitor_alerts_config as mac")
+      .select("mac.*")
+      .join("monitor_alerts_config_monitors as macm", "mac.id", "macm.monitor_alerts_id")
+      .where("macm.monitor_tag", monitorTag)
+      .orderBy("mac.id", "desc");
   }
 
   /**
@@ -124,9 +132,12 @@ export class MonitorAlertConfigRepository extends BaseRepository {
    * Get all active monitor alert configs for a specific monitor
    */
   async getActiveMonitorAlertConfigsByMonitorTag(monitorTag: string): Promise<MonitorAlertConfigRecord[]> {
-    return await this.knex("monitor_alerts_config")
-      .where({ monitor_tag: monitorTag, is_active: "YES" })
-      .orderBy("id", "desc");
+    return await this.knex("monitor_alerts_config as mac")
+      .select("mac.*")
+      .join("monitor_alerts_config_monitors as macm", "mac.id", "macm.monitor_alerts_id")
+      .where("macm.monitor_tag", monitorTag)
+      .andWhere("mac.is_active", "YES")
+      .orderBy("mac.id", "desc");
   }
 
   /**
@@ -140,26 +151,51 @@ export class MonitorAlertConfigRepository extends BaseRepository {
    * Delete all monitor alert configs for a specific monitor tag
    */
   async deleteMonitorAlertConfigsByMonitorTag(monitorTag: string): Promise<number> {
-    return await this.knex("monitor_alerts_config").where({ monitor_tag: monitorTag }).del();
+    // Find all config IDs that have this monitor tag in the junction table
+    const configIds = await this.knex("monitor_alerts_config_monitors")
+      .select("monitor_alerts_id")
+      .where({ monitor_tag: monitorTag });
+
+    if (configIds.length === 0) return 0;
+
+    // Remove the monitor from the junction table
+    await this.knex("monitor_alerts_config_monitors").where({ monitor_tag: monitorTag }).del();
+
+    // Delete any configs that now have zero monitors
+    const ids = configIds.map((r: { monitor_alerts_id: number }) => r.monitor_alerts_id);
+    let deletedCount = 0;
+    for (const id of ids) {
+      const remainingMonitors = await this.knex("monitor_alerts_config_monitors")
+        .count("* as count")
+        .where({ monitor_alerts_id: id })
+        .first<CountResult>();
+      if (Number(remainingMonitors?.count) === 0) {
+        await this.knex("monitor_alerts_config").where({ id }).del();
+        deletedCount++;
+      }
+    }
+    return deletedCount;
   }
 
   /**
    * Count monitor alert configs with optional filtering
    */
   async getMonitorAlertConfigsCount(filter: MonitorAlertConfigFilter): Promise<CountResult | undefined> {
-    let query = this.knex("monitor_alerts_config").count("* as count");
+    let query = this.knex("monitor_alerts_config as mac").count("* as count");
 
     if (filter.id !== undefined) {
-      query = query.andWhere("id", filter.id);
+      query = query.andWhere("mac.id", filter.id);
     }
     if (filter.monitor_tag !== undefined) {
-      query = query.andWhere("monitor_tag", filter.monitor_tag);
+      query = query
+        .join("monitor_alerts_config_monitors as macm", "mac.id", "macm.monitor_alerts_id")
+        .andWhere("macm.monitor_tag", filter.monitor_tag);
     }
     if (filter.alert_for !== undefined) {
-      query = query.andWhere("alert_for", filter.alert_for);
+      query = query.andWhere("mac.alert_for", filter.alert_for);
     }
     if (filter.is_active !== undefined) {
-      query = query.andWhere("is_active", filter.is_active);
+      query = query.andWhere("mac.is_active", filter.is_active);
     }
 
     return await query.first<CountResult>();
@@ -174,29 +210,33 @@ export class MonitorAlertConfigRepository extends BaseRepository {
     filter?: MonitorAlertConfigFilter,
   ): Promise<{ configs: MonitorAlertConfigRecord[]; total: number }> {
     // Build count query
-    let countQuery = this.knex("monitor_alerts_config").count("* as count");
+    let countQuery = this.knex("monitor_alerts_config as mac").count("* as count");
     if (filter?.monitor_tag) {
-      countQuery = countQuery.where("monitor_tag", filter.monitor_tag);
+      countQuery = countQuery
+        .join("monitor_alerts_config_monitors as macm", "mac.id", "macm.monitor_alerts_id")
+        .where("macm.monitor_tag", filter.monitor_tag);
     }
     if (filter?.is_active) {
-      countQuery = countQuery.andWhere("is_active", filter.is_active);
+      countQuery = countQuery.andWhere("mac.is_active", filter.is_active);
     }
     if (filter?.alert_for) {
-      countQuery = countQuery.andWhere("alert_for", filter.alert_for);
+      countQuery = countQuery.andWhere("mac.alert_for", filter.alert_for);
     }
     const totalResult = await countQuery.first<CountResult>();
     const total = totalResult ? Number(totalResult.count) : 0;
 
     // Build paginated query
-    let query = this.knex("monitor_alerts_config").orderBy("id", "desc");
+    let query = this.knex("monitor_alerts_config as mac").select("mac.*").orderBy("mac.id", "desc");
     if (filter?.monitor_tag) {
-      query = query.where("monitor_tag", filter.monitor_tag);
+      query = query
+        .join("monitor_alerts_config_monitors as macm", "mac.id", "macm.monitor_alerts_id")
+        .where("macm.monitor_tag", filter.monitor_tag);
     }
     if (filter?.is_active) {
-      query = query.andWhere("is_active", filter.is_active);
+      query = query.andWhere("mac.is_active", filter.is_active);
     }
     if (filter?.alert_for) {
-      query = query.andWhere("alert_for", filter.alert_for);
+      query = query.andWhere("mac.alert_for", filter.alert_for);
     }
     const configs = await query.limit(limit).offset((page - 1) * limit);
 
@@ -278,6 +318,51 @@ export class MonitorAlertConfigRepository extends BaseRepository {
     }
   }
 
+  // ============ Monitor Alert Config Monitors CRUD ============
+
+  /**
+   * Add multiple monitors to an alert config
+   */
+  async addMonitorsToAlertConfig(alertConfigId: number, monitorTags: string[]): Promise<void> {
+    if (monitorTags.length === 0) return;
+
+    const inserts = monitorTags.map((monitorTag) => ({
+      monitor_alerts_id: alertConfigId,
+      monitor_tag: monitorTag,
+      created_at: this.knex.fn.now(),
+      updated_at: this.knex.fn.now(),
+    }));
+
+    await this.knex("monitor_alerts_config_monitors").insert(inserts);
+  }
+
+  /**
+   * Remove all monitors from an alert config
+   */
+  async removeAllMonitorsFromAlertConfig(alertConfigId: number): Promise<number> {
+    return await this.knex("monitor_alerts_config_monitors").where({ monitor_alerts_id: alertConfigId }).del();
+  }
+
+  /**
+   * Replace all monitors for an alert config (remove old, add new)
+   */
+  async replaceAlertConfigMonitors(alertConfigId: number, monitorTags: string[]): Promise<void> {
+    await this.removeAllMonitorsFromAlertConfig(alertConfigId);
+    if (monitorTags.length > 0) {
+      await this.addMonitorsToAlertConfig(alertConfigId, monitorTags);
+    }
+  }
+
+  /**
+   * Get monitor tags for an alert config
+   */
+  async getAlertConfigMonitorTags(alertConfigId: number): Promise<string[]> {
+    const records = await this.knex("monitor_alerts_config_monitors")
+      .select("monitor_tag")
+      .where({ monitor_alerts_id: alertConfigId });
+    return records.map((r: { monitor_tag: string }) => r.monitor_tag);
+  }
+
   // ============ Composite / Join Operations ============
 
   /**
@@ -292,9 +377,12 @@ export class MonitorAlertConfigRepository extends BaseRepository {
       .select("t.*")
       .where("mact.monitor_alerts_id", id);
 
+    const monitorTags = await this.getAlertConfigMonitorTags(id);
+
     return {
       ...config,
       triggers: triggerRecords as TriggerRecord[],
+      monitor_tags: monitorTags,
     };
   }
 
@@ -311,9 +399,12 @@ export class MonitorAlertConfigRepository extends BaseRepository {
         .select("t.*")
         .where("mact.monitor_alerts_id", config.id);
 
+      const monitorTags = await this.getAlertConfigMonitorTags(config.id);
+
       result.push({
         ...config,
         triggers: triggerRecords as TriggerRecord[],
+        monitor_tags: monitorTags,
       });
     }
 
@@ -333,9 +424,12 @@ export class MonitorAlertConfigRepository extends BaseRepository {
         .select("t.*")
         .where("mact.monitor_alerts_id", config.id);
 
+      const monitorTags = await this.getAlertConfigMonitorTags(config.id);
+
       result.push({
         ...config,
         triggers: triggerRecords as TriggerRecord[],
+        monitor_tags: monitorTags,
       });
     }
 
@@ -373,6 +467,7 @@ export class MonitorAlertConfigRepository extends BaseRepository {
     const dbType = GetDbType();
     const insertData: Record<string, unknown> = {
       config_id: data.config_id,
+      monitor_tag: data.monitor_tag || null,
       incident_id: data.incident_id || null,
       alert_status: data.alert_status,
       created_at: this.knex.fn.now(),
@@ -432,6 +527,9 @@ export class MonitorAlertConfigRepository extends BaseRepository {
     if (filter.config_id !== undefined) {
       query = query.andWhere("config_id", filter.config_id);
     }
+    if (filter.monitor_tag !== undefined) {
+      query = query.andWhere("monitor_tag", filter.monitor_tag);
+    }
     if (filter.incident_id !== undefined) {
       query = query.andWhere("incident_id", filter.incident_id);
     }

src/lib/server/db/repositories/monitoring.ts

@@ -372,8 +372,18 @@ export class MonitoringRepository extends BaseRepository {
     });
   }
 
-  async deleteMonitorDataByTag(tag: string): Promise<number> {
-    return await this.knex("monitoring_data").where("monitor_tag", tag).del();
+  async deleteMonitorDataByTag(tag?: string, start?: number, end?: number): Promise<number> {
+    const query = this.knex("monitoring_data");
+    if (tag) {
+      query.where("monitor_tag", tag);
+    }
+    if (start !== undefined) {
+      query.where("timestamp", ">=", start);
+    }
+    if (end !== undefined) {
+      query.where("timestamp", "<=", end);
+    }
+    return await query.del();
   }
 
   /**

src/lib/server/db/repositories/pages.ts

@@ -65,6 +65,7 @@ export class PagesRepository extends BaseRepository {
       page_id: data.page_id,
       monitor_tag: data.monitor_tag,
       monitor_settings_json: data.monitor_settings_json,
+      position: data.position ?? 0,
       created_at: this.knex.fn.now(),
       updated_at: this.knex.fn.now(),
     });
@@ -75,7 +76,7 @@ export class PagesRepository extends BaseRepository {
   }
 
   async getPageMonitors(page_id: number): Promise<PageMonitorRecord[]> {
-    return await this.knex("pages_monitors").where("page_id", page_id).orderBy("created_at", "desc");
+    return await this.knex("pages_monitors").where("page_id", page_id).orderBy("position", "asc");
   }
 
   async getPageMonitorsExcludeHidden(page_id: number): Promise<PageMonitorRecord[]> {
@@ -84,7 +85,7 @@ export class PagesRepository extends BaseRepository {
       .where("pages_monitors.page_id", page_id)
       .andWhere("monitors.is_hidden", "NO")
       .andWhere("monitors.status", "ACTIVE")
-      .orderBy("pages_monitors.created_at", "desc")
+      .orderBy("pages_monitors.position", "asc")
       .select("pages_monitors.*");
   }
 
@@ -115,4 +116,17 @@ export class PagesRepository extends BaseRepository {
   async deletePageMonitorsByPageId(page_id: number): Promise<number> {
     return await this.knex("pages_monitors").where({ page_id }).del();
   }
+
+  async updatePageMonitorPositions(
+    page_id: number,
+    monitorPositions: { monitor_tag: string; position: number }[],
+  ): Promise<void> {
+    await this.knex.transaction(async (trx) => {
+      for (const mp of monitorPositions) {
+        await trx("pages_monitors")
+          .where({ page_id, monitor_tag: mp.monitor_tag })
+          .update({ position: mp.position, updated_at: trx.fn.now() });
+      }
+    });
+  }
 }

src/lib/server/db/repositories/users.ts

@@ -1,5 +1,14 @@
 import { BaseRepository, type CountResult } from "./base.js";
-import type { UserRecordInsert, UserRecordPublic, ApiKeyRecord, ApiKeyRecordInsert } from "../../types/db.js";
+import type {
+  UserRecordInsert,
+  UserRecordPublic,
+  ApiKeyRecord,
+  ApiKeyRecordInsert,
+  RoleRecord,
+  RolePermissionRecord,
+  UserRoleRecord,
+} from "../../types/db.js";
+import { GetDbType } from "../../tool.js";
 
 /**
  * Repository for users, API keys operations
@@ -11,11 +20,46 @@ export class UsersRepository extends BaseRepository {
     return await this.knex("users").count("* as count").first<CountResult>();
   }
 
+  private readonly userColumns = [
+    "id",
+    "email",
+    "name",
+    "is_active",
+    "is_verified",
+    "is_owner",
+    "created_at",
+    "updated_at",
+  ] as const;
+
+  private async enrichWithRoleIds(user: Record<string, unknown>): Promise<UserRecordPublic> {
+    const roleIds = await this.getUserRoleIds(user.id as number);
+    return { ...user, role_ids: roleIds } as UserRecordPublic;
+  }
+
+  private async enrichManyWithRoleIds(users: Record<string, unknown>[]): Promise<UserRecordPublic[]> {
+    if (users.length === 0) return [];
+    const userIds = users.map((u) => u.id as number);
+    const roleRows = await this.knex("users_roles")
+      .join("roles", "users_roles.roles_id", "roles.id")
+      .whereIn("users_roles.users_id", userIds)
+      .where("roles.status", "ACTIVE")
+      .select("users_roles.users_id as users_id", "roles.id as role_id");
+    const roleMap = new Map<number, string[]>();
+    for (const row of roleRows) {
+      const list = roleMap.get(row.users_id) || [];
+      list.push(row.role_id);
+      roleMap.set(row.users_id, list);
+    }
+    return users.map((u) => ({ ...u, role_ids: roleMap.get(u.id as number) || [] }) as UserRecordPublic);
+  }
+
   async getUserByEmail(email: string): Promise<UserRecordPublic | undefined> {
-    return await this.knex("users")
-      .select("id", "email", "name", "is_active", "is_verified", "is_owner", "role", "created_at", "updated_at")
+    const row = await this.knex("users")
+      .select(...this.userColumns)
       .where("email", email)
       .first();
+    if (!row) return undefined;
+    return await this.enrichWithRoleIds(row);
   }
 
   async getUserPasswordHashById(id: number): Promise<{ password_hash: string } | undefined> {
@@ -28,22 +72,43 @@ export class UsersRepository extends BaseRepository {
   }
 
   async getUserById(id: number): Promise<UserRecordPublic | undefined> {
-    return await this.knex("users")
-      .select("id", "email", "name", "is_active", "is_verified", "is_owner", "role", "created_at", "updated_at")
+    const row = await this.knex("users")
+      .select(...this.userColumns)
       .where("id", id)
       .first();
+    if (!row) return undefined;
+    return await this.enrichWithRoleIds(row);
   }
 
   async insertUser(data: UserRecordInsert): Promise<number[]> {
-    return await this.knex("users").insert({
+    const dbType = GetDbType();
+
+    const insertData = {
       email: data.email,
       name: data.name,
       password_hash: data.password_hash,
-      role: data.role,
       is_owner: data.is_owner || "NO",
       created_at: this.knex.fn.now(),
       updated_at: this.knex.fn.now(),
-    });
+    };
+
+    let userId: number;
+    if (dbType === "postgresql") {
+      const [row] = await this.knex("users").insert(insertData).returning("id");
+      userId = typeof row === "object" ? (row as { id: number }).id : (row as number);
+    } else {
+      const result = await this.knex("users").insert(insertData);
+      userId = result[0];
+    }
+
+    if (data.role_ids && data.role_ids.length > 0) {
+      const roleInserts = data.role_ids.map((roleId) => ({
+        users_id: userId,
+        roles_id: roleId,
+      }));
+      await this.knex("users_roles").insert(roleInserts);
+    }
+    return [userId];
   }
 
   async updateUserPassword(data: { id: number; password_hash: string }): Promise<number> {
@@ -54,21 +119,31 @@ export class UsersRepository extends BaseRepository {
   }
 
   async getAllUsers(): Promise<UserRecordPublic[]> {
-    return await this.knex("users")
-      .select("id", "email", "name", "role", "is_active", "is_verified", "is_owner", "created_at", "updated_at")
+    const rows = await this.knex("users")
+      .select(...this.userColumns)
       .orderBy("created_at", "desc");
+    return await this.enrichManyWithRoleIds(rows);
   }
 
-  async getUsersPaginated(page: number, limit: number): Promise<UserRecordPublic[]> {
-    return await this.knex("users")
-      .select("id", "email", "name", "role", "is_active", "is_verified", "is_owner", "created_at", "updated_at")
+  async getUsersPaginated(page: number, limit: number, filter?: { is_active?: number }): Promise<UserRecordPublic[]> {
+    const query = this.knex("users")
+      .select(...this.userColumns)
       .orderBy("created_at", "desc")
       .limit(limit)
       .offset((page - 1) * limit);
+    if (filter?.is_active !== undefined) {
+      query.where("is_active", filter.is_active);
+    }
+    const rows = await query;
+    return await this.enrichManyWithRoleIds(rows);
   }
 
-  async getTotalUsers(): Promise<CountResult | undefined> {
-    return await this.knex("users").count("* as count").first<CountResult>();
+  async getTotalUsers(filter?: { is_active?: number }): Promise<CountResult | undefined> {
+    const query = this.knex("users").count("* as count");
+    if (filter?.is_active !== undefined) {
+      query.where("is_active", filter.is_active);
+    }
+    return await query.first<CountResult>();
   }
 
   async updateUserName(id: number, name: string): Promise<number> {
@@ -78,11 +153,18 @@ export class UsersRepository extends BaseRepository {
     });
   }
 
-  async updateUserRole(id: number, role: string): Promise<number> {
-    return await this.knex("users").where({ id }).update({
-      role,
-      updated_at: this.knex.fn.now(),
-    });
+  async updateUserRoles(id: number, roleIds: string[]): Promise<void> {
+    await this.knex("users_roles").where("users_id", id).delete();
+    if (roleIds.length > 0) {
+      const inserts = roleIds.map((roleId) => ({
+        users_id: id,
+        roles_id: roleId,
+        created_at: this.knex.fn.now(),
+        updated_at: this.knex.fn.now(),
+      }));
+      await this.knex("users_roles").insert(inserts);
+    }
+    await this.knex("users").where({ id }).update({ updated_at: this.knex.fn.now() });
   }
 
   async updateUserIsActive(id: number, is_active: number): Promise<number> {
@@ -138,4 +220,140 @@ export class UsersRepository extends BaseRepository {
   }
 
   // ============ Invitations ============
+
+  // ============ Roles ============
+
+  async getRoleById(id: string): Promise<RoleRecord | undefined> {
+    return await this.knex("roles").where("id", id).first();
+  }
+
+  async getAllRoles(): Promise<RoleRecord[]> {
+    return await this.knex("roles").orderBy("created_at", "asc");
+  }
+
+  async insertRole(data: { id: string; role_name: string; readonly?: number }): Promise<void> {
+    await this.knex("roles").insert({
+      id: data.id,
+      role_name: data.role_name,
+      readonly: data.readonly ?? 0,
+      status: "ACTIVE",
+      created_at: this.knex.fn.now(),
+      updated_at: this.knex.fn.now(),
+    });
+  }
+
+  async updateRole(id: string, data: { role_name?: string; status?: string }): Promise<number> {
+    const updateData: Record<string, unknown> = { updated_at: this.knex.fn.now() };
+    if (data.role_name !== undefined) updateData.role_name = data.role_name;
+    if (data.status !== undefined) updateData.status = data.status;
+    return await this.knex("roles").where("id", id).update(updateData);
+  }
+
+  async deleteRole(id: string): Promise<number> {
+    return await this.knex("roles").where("id", id).delete();
+  }
+
+  async getUsersCountByRoleId(roleId: string): Promise<number> {
+    const result = await this.knex("users_roles").where("roles_id", roleId).count("* as count").first<CountResult>();
+    return result ? Number(result.count) : 0;
+  }
+
+  async migrateUsersRole(fromRoleId: string, toRoleId: string): Promise<void> {
+    // Find users who already have the target role to avoid duplicate PK
+    const usersWithTarget = this.knex("users_roles").where("roles_id", toRoleId).select("users_id");
+
+    // Update users who don't already have the target role
+    await this.knex("users_roles").where("roles_id", fromRoleId).whereNotIn("users_id", usersWithTarget).update({
+      roles_id: toRoleId,
+      updated_at: this.knex.fn.now(),
+    });
+
+    // Delete remaining assignments (users who already had the target role)
+    await this.knex("users_roles").where("roles_id", fromRoleId).delete();
+  }
+
+  // ============ Role Permissions ============
+
+  async getRolePermissions(roleId: string): Promise<RolePermissionRecord[]> {
+    return await this.knex("roles_permissions").where("roles_id", roleId);
+  }
+
+  async getAllPermissions(): Promise<Array<{ id: string; permission_name: string }>> {
+    return await this.knex("permissions").select("id", "permission_name").orderBy("id", "asc");
+  }
+
+  async addRolePermission(roleId: string, permissionId: string): Promise<void> {
+    await this.knex("roles_permissions").insert({
+      roles_id: roleId,
+      permissions_id: permissionId,
+      status: "ACTIVE",
+      created_at: this.knex.fn.now(),
+      updated_at: this.knex.fn.now(),
+    });
+  }
+
+  async removeRolePermission(roleId: string, permissionId: string): Promise<number> {
+    return await this.knex("roles_permissions").where({ roles_id: roleId, permissions_id: permissionId }).delete();
+  }
+
+  // ============ Role Users ============
+
+  async getUsersByRoleId(roleId: string): Promise<Array<UserRecordPublic & { roles_id: string }>> {
+    const rows = await this.knex("users_roles")
+      .join("users", "users_roles.users_id", "users.id")
+      .where("users_roles.roles_id", roleId)
+      .select(
+        "users.id",
+        "users.email",
+        "users.name",
+        "users.is_active",
+        "users.is_verified",
+        "users.is_owner",
+        "users.created_at",
+        "users.updated_at",
+        "users_roles.roles_id",
+      );
+    const enriched = await this.enrichManyWithRoleIds(rows);
+    return enriched.map((u, i) => ({ ...u, roles_id: rows[i].roles_id }));
+  }
+
+  async addUserToRole(roleId: string, userId: number): Promise<void> {
+    await this.knex("users_roles").insert({
+      roles_id: roleId,
+      users_id: userId,
+      created_at: this.knex.fn.now(),
+      updated_at: this.knex.fn.now(),
+    });
+  }
+
+  async removeUserFromRole(roleId: string, userId: number): Promise<number> {
+    return await this.knex("users_roles").where({ roles_id: roleId, users_id: userId }).delete();
+  }
+
+  async getUserRoleIds(userId: number): Promise<string[]> {
+    const rows = await this.knex("users_roles")
+      .join("roles", function () {
+        this.on("users_roles.roles_id", "roles.id");
+      })
+      .where("users_roles.users_id", userId)
+      .where("roles.status", "ACTIVE")
+      .distinct("roles.id as id")
+      .select();
+    return rows.map((r: { id: string }) => r.id);
+  }
+
+  async getUserPermissionIds(userId: number): Promise<string[]> {
+    const knex = this.knex;
+    const rows = await knex("users_roles")
+      .join("roles", function () {
+        this.on("users_roles.roles_id", "roles.id").andOn("roles.status", knex.raw("?", ["ACTIVE"]));
+      })
+      .join("roles_permissions", function () {
+        this.on("roles_permissions.roles_id", "roles.id").andOn("roles_permissions.status", knex.raw("?", ["ACTIVE"]));
+      })
+      .where("users_roles.users_id", userId)
+      .distinct("roles_permissions.permissions_id as id")
+      .select();
+    return rows.map((r: { id: string }) => r.id);
+  }
 }

src/lib/server/db/seedSiteData.ts

@@ -159,6 +159,24 @@ const seedSiteData = {
     showSwitcher: true,
     forceExclusivity: false,
   },
+  dateAndTimeFormat: {
+    datePlusTime: "PPp",
+    dateOnly: "PP",
+    timeOnly: "p",
+  },
+  sitemap: {
+    mode: "off",
+    urls: [],
+  },
+  globalMaintenanceNotificationSettings: {
+    event_types: {
+      created: false,
+      reminder: true,
+      started: true,
+      ended: true,
+    },
+    reminder_buffer_hours: 1,
+  },
 };
 
 export default seedSiteData;

src/lib/server/notification/notification_utils.ts

@@ -10,9 +10,11 @@ export function alertToVariables(
   config: MonitorAlertConfigRecord,
   alert: MonitorAlertV2Record,
   siteVars: SiteDataForNotification,
+  monitorTag?: string,
 ): AlertVariableMap {
   const createdAtDate = alert.created_at instanceof Date ? alert.created_at : new Date(alert.created_at);
-  const alert_name = `Alert ${config.monitor_tag} for ${config.alert_for} ${config.alert_value} ${alert.alert_status} at ${createdAtDate.toISOString()}`;
+  const effectiveMonitorTag = monitorTag || config.monitor_tag || "unknown";
+  const alert_name = `Alert ${effectiveMonitorTag} for ${config.alert_for} ${config.alert_value} ${alert.alert_status} at ${createdAtDate.toISOString()}`;
 
   return {
     alert_id: alert.id,
@@ -24,7 +26,7 @@ export function alertToVariables(
     alert_message: config.alert_description || "",
     alert_source: GC.ALERT,
     alert_timestamp: createdAtDate.toISOString(),
-    alert_cta_url: siteVars.site_url + "monitors/" + config.monitor_tag,
+    alert_cta_url: siteVars.site_url + "monitors/" + effectiveMonitorTag,
     alert_cta_text: "Open Alert Details",
     alert_incident_id: alert.incident_id ? alert.incident_id : undefined,
     alert_incident_url: alert.incident_id ? siteVars.site_url + "incidents/" + alert.incident_id : undefined,

src/lib/server/queues/alertingQueue.ts

@@ -141,8 +141,9 @@ async function sendAlertNotifications(
   activeAlert: MonitorAlertV2Record,
   monitor_alerts_configured: MonitorAlertConfigRecord,
   templateSiteVars: SiteDataForNotification,
+  monitorTag?: string,
 ): Promise<void> {
-  const templateAlertVars = alertToVariables(monitor_alerts_configured, activeAlert, templateSiteVars);
+  const templateAlertVars = alertToVariables(monitor_alerts_configured, activeAlert, templateSiteVars, monitorTag);
   const triggers = await GetTriggersByMonitorAlertConfigId(monitor_alerts_configured.id);
 
   for (let i = 0; i < triggers.length; i++) {
@@ -233,9 +234,10 @@ const addWorker = () => {
         return;
       }
 
-      // Get existing alerts
+      // Get existing alerts for this specific monitor + config combination
       let alertsExisting = await GetMonitorAlertsV2({
         config_id: monitor_alerts_configured.id,
+        monitor_tag: monitor_tag,
         alert_status: GC.TRIGGERED,
       });
       let activeAlert = null;
@@ -244,9 +246,9 @@ const addWorker = () => {
       }
 
       if (isAffected) {
-        // Trigger alert if not already active
+        // Trigger alert if not already active for this monitor
         if (!activeAlert) {
-          activeAlert = await CreateMonitorAlertV2(monitor_alerts_configured.id);
+          activeAlert = await CreateMonitorAlertV2(monitor_alerts_configured.id, monitor_tag);
           if (monitor_alerts_configured.create_incident === GC.YES) {
             let newIncidentNumber = await createNewIncident(
               activeAlert,
@@ -261,7 +263,7 @@ const addWorker = () => {
             }
           }
           // Send triggered alert notifications
-          await sendAlertNotifications(activeAlert, monitor_alerts_configured, templateSiteVars);
+          await sendAlertNotifications(activeAlert, monitor_alerts_configured, templateSiteVars, monitor_tag);
         }
       } else {
         // Resolve any existing alert
@@ -302,7 +304,7 @@ const addWorker = () => {
           }
 
           // Send resolution notifications
-          await sendAlertNotifications(activeAlert, monitor_alerts_configured, templateSiteVars);
+          await sendAlertNotifications(activeAlert, monitor_alerts_configured, templateSiteVars, monitor_tag);
         }
       }
     } catch (error) {
@@ -348,6 +350,7 @@ export const push = async (monitor_tag: string, ts: number, status: string, opti
     monitor_tag: monitor.tag,
     is_active: GC.YES,
   });
+
   if (monitorAlertsConfigurations.length === 0) {
     return;
   }

src/lib/server/queues/emailQueue.ts

@@ -46,7 +46,7 @@ const addWorker = () => {
         fromEmail,
         templateTextBody,
       );
-      console.log(`📧 Email sent to ${toEmails}`);
+      // console.log(`📧 Email sent to ${toEmails}`);
     } catch (error) {
       console.error(`Failed to send email to ${toEmails}:`, error);
       throw error; // Re-throw to trigger retry

src/lib/server/queues/monitorResponseQueue.ts

@@ -42,6 +42,7 @@ const addWorker = () => {
     });
 
     if (!dbRes) {
+      console.error("Failed to insert monitoring data for monitorTag:", monitorTag, "timestamp:", ts);
       throw new Error("Failed to insert monitoring data");
     }
 
@@ -52,7 +53,6 @@ const addWorker = () => {
       latency: latency,
       type: type,
     });
-
     alertingQueue.push(monitorTag, ts, status);
 
     return dbRes;

src/lib/server/schedulers/maintenanceScheduler.ts

@@ -4,7 +4,7 @@ import db from "../db/db.js";
 import { rrulestr } from "rrule";
 import { addDays } from "date-fns";
 import type { MaintenanceRecord, MaintenanceEventRecord } from "../types/db.js";
-import { determineEventStatus } from "../controllers/maintenanceController.js";
+import { determineEventStatus, CreateMaintenanceEventWithNotification } from "../controllers/maintenanceController.js";
 
 let maintenanceSchedulerQueue: Queue | null = null;
 let worker: Worker | null = null;
@@ -58,12 +58,13 @@ const generateEventsForMaintenance = async (maintenance: MaintenanceRecord): Pro
 
       // Check if event already exists for this start time
       if (!existingStartTimes.has(eventStart)) {
-        await db.createMaintenanceEvent({
-          maintenance_id: maintenance.id,
-          start_date_time: eventStart,
-          end_date_time: eventEnd,
-          status: determineEventStatus(eventStart, eventEnd),
-        });
+        await CreateMaintenanceEventWithNotification(
+          maintenance.id,
+          eventStart,
+          eventEnd,
+          maintenance.title,
+          maintenance.description || null,
+        );
         eventsCreated++;
         console.log(
           `Created maintenance event for "${maintenance.title}" at ${new Date(eventStart * 1000).toISOString()}`,

src/lib/server/services/apiCall.ts

@@ -154,25 +154,32 @@ class ApiCall {
       }
     }
 
-    if (!!!evalResp) {
+    if (!evalResp || typeof evalResp !== "object") {
       evalResp = {
         status: GC.DOWN,
         latency: latency,
         type: GC.ERROR,
       };
-    } else if (
-      !!!evalResp.status ||
-      ([GC.UP, GC.DOWN, GC.DEGRADED, GC.MAINTENANCE] as string[]).indexOf(evalResp.status) === -1
-    ) {
+      errorMessage += " | Eval must return an object with 'status' and 'latency' fields, got no response";
+    } else if (evalResp.status === undefined) {
       evalResp = {
         status: GC.DOWN,
         latency: latency,
         type: GC.ERROR,
       };
+      errorMessage += ` | Eval must return an object with a 'status' field (one of: ${GC.UP}, ${GC.DOWN}, ${GC.DEGRADED}, ${GC.MAINTENANCE}), but 'status' was missing`;
+    } else if (([GC.UP, GC.DOWN, GC.DEGRADED, GC.MAINTENANCE] as string[]).indexOf(evalResp.status) === -1) {
+      evalResp = {
+        status: GC.DOWN,
+        latency: latency,
+        type: GC.ERROR,
+      };
+      errorMessage += ` | Eval returned invalid 'status' value "${evalResp.status}". Must be one of: ${GC.UP}, ${GC.DOWN}, ${GC.DEGRADED}, ${GC.MAINTENANCE}`;
     } else {
       evalResp.type = GC.REALTIME;
-      // Ensure latency is a valid number
+      // Ensure latency is a valid number; fall back to measured latency
       if (typeof evalResp.latency !== "number" || isNaN(evalResp.latency)) {
+        errorMessage += ` | Eval 'latency' must be a number, got ${JSON.stringify(evalResp.latency)}. Using measured latency instead`;
         evalResp.latency = latency;
       }
     }

src/lib/server/services/grpcCall.ts

@@ -0,0 +1,139 @@
+import * as grpc from "@grpc/grpc-js";
+import * as protoLoader from "@grpc/proto-loader";
+import { writeFileSync, unlinkSync, mkdtempSync } from "fs";
+import { tmpdir } from "os";
+import path from "path";
+import { performance } from "node:perf_hooks";
+import GC from "../../global-constants.js";
+import type { GrpcMonitor, MonitoringResult } from "../types/monitor.js";
+
+// Standard gRPC Health Checking Protocol proto definition (grpc.health.v1).
+// Embedded as a string to avoid file-path issues in bundled production builds.
+const HEALTH_PROTO = `syntax = "proto3";
+
+package grpc.health.v1;
+
+message HealthCheckRequest {
+  string service = 1;
+}
+
+message HealthCheckResponse {
+  enum ServingStatus {
+    UNKNOWN = 0;
+    SERVING = 1;
+    NOT_SERVING = 2;
+    SERVICE_UNKNOWN = 3;
+  }
+  ServingStatus status = 1;
+}
+
+service Health {
+  rpc Check(HealthCheckRequest) returns (HealthCheckResponse);
+  rpc Watch(HealthCheckRequest) returns (stream HealthCheckResponse);
+}`;
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+let cachedProto: any = null;
+
+function getHealthProto() {
+  if (!cachedProto) {
+    const tmpDir = mkdtempSync(path.join(tmpdir(), "kener-grpc-"));
+    const protoPath = path.join(tmpDir, "health.proto");
+    writeFileSync(protoPath, HEALTH_PROTO);
+    const packageDef = protoLoader.loadSync(protoPath, {
+      keepCase: true,
+      longs: String,
+      enums: String,
+      defaults: true,
+      oneofs: true,
+    });
+    cachedProto = grpc.loadPackageDefinition(packageDef);
+    unlinkSync(protoPath);
+  }
+  return cachedProto;
+}
+
+class GrpcCall {
+  monitor: GrpcMonitor;
+
+  constructor(monitor: GrpcMonitor) {
+    this.monitor = monitor;
+  }
+
+  async execute(): Promise<MonitoringResult> {
+    const { host, port, service, tls, timeout } = this.monitor.type_data;
+    const timeoutMs = timeout || 10000;
+    const target = `${host}:${port}`;
+
+    const start = performance.now();
+
+    try {
+      const proto = getHealthProto();
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const healthService = (proto.grpc as any).health.v1.Health;
+
+      const credentials = tls ? grpc.credentials.createSsl() : grpc.credentials.createInsecure();
+      const client = new healthService(target, credentials);
+      const deadline = new Date(Date.now() + timeoutMs);
+
+      const result = await new Promise<{ status: string }>((resolve, reject) => {
+        client.Check(
+          { service: service || "" },
+          { deadline },
+          (err: grpc.ServiceError | null, response: { status: string }) => {
+            client.close();
+            if (err) {
+              reject(err);
+            } else {
+              resolve(response);
+            }
+          },
+        );
+      });
+
+      const latency = Math.round(performance.now() - start);
+
+      if (result.status === "SERVING") {
+        return {
+          status: GC.UP,
+          latency,
+          type: GC.REALTIME,
+        };
+      } else if (result.status === "NOT_SERVING") {
+        return {
+          status: GC.DOWN,
+          latency,
+          type: GC.REALTIME,
+          error_message: `Service status: ${result.status}`,
+        };
+      } else {
+        return {
+          status: GC.DEGRADED,
+          latency,
+          type: GC.REALTIME,
+          error_message: `Service status: ${result.status}`,
+        };
+      }
+    } catch (err: unknown) {
+      const latency = Math.round(performance.now() - start);
+      const error = err as { code?: number; details?: string; message?: string };
+
+      let errorMessage = error.details || error.message || "Unknown gRPC error";
+      let isTimeout = false;
+
+      if (error.code === grpc.status.DEADLINE_EXCEEDED) {
+        isTimeout = true;
+        errorMessage = "Request timed out";
+      }
+
+      return {
+        status: GC.DOWN,
+        latency,
+        type: isTimeout ? GC.TIMEOUT : GC.ERROR,
+        error_message: errorMessage,
+      };
+    }
+  }
+}
+
+export default GrpcCall;