Skip to content

fix(zabbix): populate hostname on pulled and pushed alerts #6612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
washosk wants to merge 5 commits into
base: main
Choose a base branch
from
+58 −6
Open

fix(zabbix): populate hostname on pulled and pushed alerts #6612

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
53945a6
fix(zabbix): populate hostname on pulled and pushed alerts
washosk Jul 3, 2026
ef914e6
fix(zabbix): keep legacy host field fallbacks for backward compat
washosk Jul 10, 2026
e0d33d0
fix(zabbix): problem.get doesn't support selectHosts, use event.get
washosk Jul 10, 2026
bbf54bf
fix(zabbix): derive status from acknowledged/suppressed on pull
washosk Jul 10, 2026
670e354
Merge branch 'main' into fix/zabbix-missing-hostname
shahargl Jul 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions keep/providers/zabbix_provider/zabbix_provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,7 @@ def _get_alerts(self) -> list[AlertDto]:
{
"recent": False,
"selectSuppressionData": "extend",
"selectHosts": ["host", "name"],
"time_from": time_from,
},
)
Expand All @@ -546,6 +547,9 @@ def _get_alerts(self) -> list[AlertDto]:
problem.pop("status", "").lower(), AlertStatus.FIRING
)

hosts = problem.pop("hosts", None) or []
hostname = hosts[0].get("name") or hosts[0].get("host") if hosts else None

formatted_alerts.append(
AlertDto(
id=problem.pop("eventid"),
Expand All @@ -559,6 +563,8 @@ def _get_alerts(self) -> list[AlertDto]:
message=name,
severity=severity,
environment=environment,
service=hostname,
hostname=hostname,
problem=problem,
)
)
Expand Down Expand Up @@ -735,8 +741,8 @@ def _format_alert(
event_id = event.get("id")
trigger_id = event.get("triggerId")
zabbix_url = event.pop("url", None)
hostname = event.pop("service", None) or event.get("hostName")
ip_address = event.get("hostIp")
hostname = event.pop("service", None) or event.pop("host_name", None)
ip_address = event.pop("host_ip", None)

if zabbix_url == "{$ZABBIX.URL}":
# This means user did not configure $ZABBIX.URL in Zabbix probably
Expand Down
Loading