From 7f91660cd08416a80f25d2d2280a5b741bf78245 Mon Sep 17 00:00:00 2001
From: g4st3r <g4st3r@localhost>
Date: Sat, 7 Mar 2026 21:06:24 +0000
Subject: [PATCH] Alert formatting and swap threshold

---
 monitoring/alertmanager/alertmanager.yml | 4 +++-
 monitoring/rules/base-alerts.yml         | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/monitoring/alertmanager/alertmanager.yml b/monitoring/alertmanager/alertmanager.yml
index e96205b..a1b1aae 100644
--- a/monitoring/alertmanager/alertmanager.yml
+++ b/monitoring/alertmanager/alertmanager.yml
@@ -15,9 +15,11 @@ receivers:
         chat_id: -1003779247128
         message: |-
           {{ range .Alerts }}
-          *{{ .Labels.alertname }}* ({{ .Labels.severity }})
+          {{ if eq .Labels.severity "critical" }}🔴{{ else }}⚠️{{ end }} *{{ .Labels.alertname }}* ({{ .Labels.severity }})
           {{ .Annotations.summary }}
           {{ .Annotations.description }}
+          Instance: {{ .Labels.instance }}
+          Details: {{ .GeneratorURL }}
           {{ end }}
         parse_mode: Markdown
         disable_notifications: false
diff --git a/monitoring/rules/base-alerts.yml b/monitoring/rules/base-alerts.yml
index 75b6efa..47e0aea 100644
--- a/monitoring/rules/base-alerts.yml
+++ b/monitoring/rules/base-alerts.yml
@@ -47,13 +47,13 @@ groups:
           description: "MemAvailable < 8%"
 
       - alert: SwapUsageHigh
-        expr: (1 - (node_memory_SwapFree_bytes / node_memory_SwapTotal_bytes)) > 0.30
-        for: 15m
+        expr: (1 - (node_memory_SwapFree_bytes / node_memory_SwapTotal_bytes)) > 0.50
+        for: 20m
         labels:
           severity: warning
         annotations:
           summary: "Swap usage high on {{ $labels.instance }}"
-          description: "Swap usage > 30%"
+          description: "Swap usage > 50%"
 
       - alert: DiskFull
         expr: (node_filesystem_avail_bytes{fstype!~"tmpfs|overlay"} / node_filesystem_size_bytes{fstype!~"tmpfs|overlay"}) < 0.10