14 Commits

Author SHA1 Message Date
86e56676c1 Merge branch 'monitoring-resolved-alerts' into 'main'
Send resolved alerts

See merge request g4st3r/srv-docker!13
2026-03-07 21:28:07 +00:00
g4st3r
432e76ed55 Send resolved alerts with status 2026-03-07 21:27:10 +00:00
e6ec911405 Merge branch 'monitoring-telegram-relay' into 'main'
Add Telegram relay with photos

See merge request g4st3r/srv-docker!12
2026-03-07 21:24:20 +00:00
e4e0c057b4 Merge branch 'monitoring-alerts-ru' into 'main'
RU alerts + container tuning

See merge request g4st3r/srv-docker!11
2026-03-07 21:19:57 +00:00
1f5d2df7ca Merge branch 'monitoring-grafana-render' into 'main'
Add Grafana renderer and graph links

See merge request g4st3r/srv-docker!10
2026-03-07 21:14:34 +00:00
94783197fb Merge branch 'monitoring-alerts-links' into 'main'
Use public domain in alert links

See merge request g4st3r/srv-docker!9
2026-03-07 21:08:52 +00:00
f8b04338ce Merge branch 'monitoring-alerts-format' into 'main'
Alert formatting and swap threshold

See merge request g4st3r/srv-docker!8
2026-03-07 21:06:57 +00:00
440d3e0f87 Merge branch 'monitoring-blackbox' into 'main'
Add blackbox HTTP checks

See merge request g4st3r/srv-docker!7
2026-03-07 20:57:47 +00:00
523f66c924 Merge branch 'monitoring-alerts-disks' into 'main'
Alert on all disks

See merge request g4st3r/srv-docker!6
2026-03-07 20:50:23 +00:00
9e9086165d Merge branch 'monitoring-alerts-extended' into 'main'
Expand system alerts

See merge request g4st3r/srv-docker!5
2026-03-07 20:48:47 +00:00
81867c57e5 Merge branch 'monitoring-alerts' into 'main'
Add disk/memory alerts

See merge request g4st3r/srv-docker!4
2026-03-07 20:45:34 +00:00
bc9eb693d7 Merge branch 'monitoring-grafana-ui' into 'main'
Allow Grafana UI updates

See merge request g4st3r/srv-docker!3
2026-03-07 20:20:43 +00:00
5206d84971 Merge branch 'monitoring-revproxy-node' into 'main'
Add revproxy node-exporter

See merge request g4st3r/srv-docker!2
2026-03-07 20:15:02 +00:00
0d757ec553 Merge branch 'monitoring-fix-alertmanager' into 'main'
Fix alertmanager config

See merge request g4st3r/srv-docker!1
2026-03-07 20:10:07 +00:00

View File

@@ -53,6 +53,8 @@ def alert():
results = [] results = []
for a in alerts: for a in alerts:
labels = a.get("labels", {}) labels = a.get("labels", {})
status = a.get("status", {}).get("state", "firing")
is_resolved = status == "resolved"
ann = a.get("annotations", {}) ann = a.get("annotations", {})
sev = labels.get("severity", "warning") sev = labels.get("severity", "warning")
alertname = labels.get("alertname", "Alert") alertname = labels.get("alertname", "Alert")
@@ -64,8 +66,10 @@ def alert():
graf = _grafana_link(instance, alertname) graf = _grafana_link(instance, alertname)
render = _grafana_render_url(instance, alertname) render = _grafana_render_url(instance, alertname)
prefix = '' if is_resolved else _emoji(sev)
state_txt = 'восстановлено' if is_resolved else sev
caption = ( caption = (
f"{_emoji(sev)} {alertname} ({sev})\n" f"{prefix} {alertname} ({state_txt})\n"
f"{summary}\n{desc}\n" f"{summary}\n{desc}\n"
f"Инстанс: {instance}" f"Инстанс: {instance}"
) )