From 6cfc1a53c6c64d253e35601634c6fddc6df18819 Mon Sep 17 00:00:00 2001
From: g4st3r <g4st3r@localhost>
Date: Sat, 7 Mar 2026 20:48:14 +0000
Subject: [PATCH] Expand alert rules

---
 monitoring/rules/base-alerts.yml | 46 ++++++++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 5 deletions(-)

diff --git a/monitoring/rules/base-alerts.yml b/monitoring/rules/base-alerts.yml
index f1d7870..08daece 100644
--- a/monitoring/rules/base-alerts.yml
+++ b/monitoring/rules/base-alerts.yml
@@ -10,6 +10,15 @@ groups:
           summary: "{{ $labels.instance }} down"
           description: "{{ $labels.job }} on {{ $labels.instance }} is not responding"
 
+      - alert: NodeExporterDown
+        expr: up{job=~"node|revproxy-node"} == 0
+        for: 2m
+        labels:
+          severity: critical
+        annotations:
+          summary: "Node exporter down on {{ $labels.instance }}"
+          description: "node_exporter is not responding"
+
       - alert: HighCPU
         expr: (1 - avg by(instance) (rate(node_cpu_seconds_total{mode="idle"}[5m]))) > 0.90
         for: 10m
@@ -28,6 +37,24 @@ groups:
           summary: "High memory on {{ $labels.instance }}"
           description: "Memory usage > 90% for 10m"
 
+      - alert: MemAvailableLow
+        expr: (node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes) < 0.08
+        for: 10m
+        labels:
+          severity: warning
+        annotations:
+          summary: "Low available memory on {{ $labels.instance }}"
+          description: "MemAvailable < 8%"
+
+      - alert: SwapUsageHigh
+        expr: (1 - (node_memory_SwapFree_bytes / node_memory_SwapTotal_bytes)) > 0.30
+        for: 15m
+        labels:
+          severity: warning
+        annotations:
+          summary: "Swap usage high on {{ $labels.instance }}"
+          description: "Swap usage > 30%"
+
       - alert: DiskFull
         expr: (node_filesystem_avail_bytes{fstype!~"tmpfs|overlay"} / node_filesystem_size_bytes{fstype!~"tmpfs|overlay"}) < 0.10
         for: 15m
@@ -46,11 +73,20 @@ groups:
           summary: "Disk usage >85% on {{ $labels.instance }}"
           description: "Root filesystem usage above 85%"
 
-      - alert: MemAvailableLow
-        expr: (node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes) < 0.08
-        for: 10m
+      - alert: DiskUsageCritical
+        expr: (1 - (node_filesystem_avail_bytes{mountpoint="/",fstype!~"tmpfs|overlay"} / node_filesystem_size_bytes{mountpoint="/",fstype!~"tmpfs|overlay"})) > 0.95
+        for: 5m
+        labels:
+          severity: critical
+        annotations:
+          summary: "Disk usage >95% on {{ $labels.instance }}"
+          description: "Root filesystem usage above 95%"
+
+      - alert: DockerContainerDown
+        expr: time() - container_last_seen > 120
+        for: 2m
         labels:
           severity: warning
         annotations:
-          summary: "Low available memory on {{ $labels.instance }}"
-          description: "MemAvailable < 8%"
+          summary: "Container down"
+          description: "A container has not been seen for >2m"