fix(provider): Zabbix enhancements (#1773)

Author: talboren

keep-ui/app/alerts/alert-menu.tsx

@@ -260,7 +260,7 @@ export default function AlertMenu({
                       active ? "bg-slate-200" : "text-gray-900"
                     } ${
                       !methodEnabled ? "text-slate-300 cursor-not-allowed" : ""
-                    } group flex items-center rounded-md px-2 py-2 text-xs`}
+                    } group flex w-full items-center rounded-md px-2 py-2 text-xs`}
                     disabled={!methodEnabled}
                     title={!methodEnabled ? "Missing required scopes" : ""}
                     onClick={() => {

keep/api/logging.py

@@ -143,6 +143,11 @@ def dump(self):
             "level": "CRITICAL",
             "propagate": False,
         },
+        "Environment": {
+            "handlers": [],
+            "level": "CRITICAL",
+            "propagate": False,
+        },
     },
 }
 

keep/providers/zabbix_provider/zabbix_provider.py

@@ -170,6 +170,7 @@ class ZabbixProvider(BaseProvider):
     STATUS_MAP = {
         "problem": AlertStatus.FIRING,
         "ok": AlertStatus.RESOLVED,
+        "resolved": AlertStatus.RESOLVED,
         "acknowledged": AlertStatus.ACKNOWLEDGED,
         "suppressed": AlertStatus.SUPPRESSED,
     }
@@ -427,12 +428,11 @@ def setup_webhook(
             {"name": "message", "value": "{ALERT.MESSAGE}"},
             {"name": "name", "value": "{EVENT.NAME}"},
             {"name": "service", "value": "{HOST.HOST}"},
-            {"name": "severity", "value": "{TRIGGER.SEVERITY}"},
-            {"name": "status", "value": "{TRIGGER.STATUS}"},
+            {"name": "severity", "value": "{EVENT.SEVERITY}"},
+            {"name": "status", "value": "{EVENT.STATUS}"},
             {"name": "tags", "value": "{EVENT.TAGSJSON}"},
             {"name": "description", "value": "{TRIGGER.DESCRIPTION}"},
             {"name": "ALERT.SUBJECT", "value": "{ALERT.SUBJECT}"},
-            {"name": "EVENT.SEVERITY", "value": "{EVENT.SEVERITY}"},
             {"name": "EVENT.TIME", "value": "{EVENT.TIME}"},
             {"name": "EVENT.VALUE", "value": "{EVENT.VALUE}"},
             {"name": "HOST.IP", "value": "{HOST.IP}"},
@@ -577,18 +577,40 @@ def _format_alert(
         event_id = event.get("id")
         trigger_id = event.get("triggerId")
         zabbix_url = event.pop("ZABBIX.URL", None)
+
+        if zabbix_url == "{$ZABBIX.URL}":
+            # This means user did not configure $ZABBIX.URL in Zabbix probably
+            zabbix_url = None
+
         url = None
         if event_id and trigger_id and zabbix_url:
             url = (
                 f"{zabbix_url}/tr_events.php?triggerid={trigger_id}&eventid={event_id}"
             )
 
-        severity = ZabbixProvider.SEVERITIES_MAP.get(
-            event.pop("severity", "").lower(), AlertSeverity.INFO
-        )
-        status = ZabbixProvider.STATUS_MAP.get(
-            event.pop("status", "").lower(), AlertStatus.FIRING
+        severity = event.pop("severity", "").lower()
+        severity = ZabbixProvider.SEVERITIES_MAP.get(severity, AlertSeverity.INFO)
+
+        status = event.pop("status", "").lower()
+        status = ZabbixProvider.STATUS_MAP.get(status, AlertStatus.FIRING)
+
+        last_received = event.pop(
+            "lastReceived", datetime.datetime.now(tz=datetime.timezone.utc).isoformat()
         )
+        if last_received == "{DATE} {TIME}":
+            # This means it's a test message, just override.
+            last_received = datetime.datetime.now(tz=datetime.timezone.utc).isoformat()
+        else:
+            last_received = datetime.datetime.strptime(
+                last_received, "%Y.%m.%d %H:%M:%S"
+            ).isoformat()
+
+        message = event.pop("message", "")
+        if "acknowledged problem" in message:
+            status = AlertStatus.ACKNOWLEDGED
+        elif "suppressed problem" in message:
+            status = AlertStatus.SUPPRESSED
+
         return AlertDto(
             **event,
             environment=environment,
@@ -597,6 +619,7 @@ def _format_alert(
             severity=severity,
             status=status,
             url=url,
+            lastReceived=last_received,
             tags=tags,
         )
 

keep/providers/zabbix_provider/zabbix_provider_script.js

@@ -2,47 +2,51 @@ try {
   var result = { tags: {} },
     params = JSON.parse(value),
     req = new HttpRequest(),
-    resp = '';
+    resp = "";
 
-  if (typeof params.HTTPProxy === 'string' && params.HTTPProxy.trim() !== '') {
-      req.setProxy(params.HTTPProxy);
+  if (typeof params.HTTPProxy === "string" && params.HTTPProxy.trim() !== "") {
+    req.setProxy(params.HTTPProxy);
   }
 
-  keepApiUrl = params['keepApiUrl'];
-  if (!keepApiUrl || (typeof keepApiUrl === 'string' && keepApiUrl.trim() === '')) {
-      throw 'incorrect value for variable "keepApiUrl". The value must be a non-empty URL.';
+  keepApiUrl = params["keepApiUrl"];
+  if (
+    !keepApiUrl ||
+    (typeof keepApiUrl === "string" && keepApiUrl.trim() === "")
+  ) {
+    throw 'incorrect value for variable "keepApiUrl". The value must be a non-empty URL.';
   }
 
-  keepApiKey = params['keepApiKey'];
-  if (!keepApiKey || (typeof keepApiKey === 'string' && keepApiKey.trim() === '')) {
-      throw 'incorrect value for variable "keepApiKey". The value must be a non-empty API key.';
+  keepApiKey = params["keepApiKey"];
+  if (
+    !keepApiKey ||
+    (typeof keepApiKey === "string" && keepApiKey.trim() === "")
+  ) {
+    throw 'incorrect value for variable "keepApiKey". The value must be a non-empty API key.';
   }
 
-  delete params['keepApiUrl'];
-  delete params['keepApiKey'];
-  delete params['HTTPProxy'];
+  delete params["keepApiUrl"];
+  delete params["keepApiKey"];
+  delete params["HTTPProxy"];
 
-  var incidentKey = "zabbix-" + params['EVENT.ID'];
+  var incidentKey = "zabbix-" + params["EVENT.ID"];
 
-  req.addHeader('Accept: application/json');
-  req.addHeader('Content-Type: application/json');
-  req.addHeader('X-API-KEY: ' + keepApiKey);
+  req.addHeader("Accept: application/json");
+  req.addHeader("Content-Type: application/json");
+  req.addHeader("X-API-KEY: " + keepApiKey);
 
-  Zabbix.log(4, '[Keep Webhook] keepApiUrl:' + keepApiUrl);
-  Zabbix.log(4, '[Keep Webhook] keepApiKey:' + keepApiKey);
-  Zabbix.log(4, '[Keep Webhook] Sending request:' + JSON.stringify(params));
+  Zabbix.log(4, "[Keep Webhook] keepApiUrl:" + keepApiUrl);
+  Zabbix.log(4, "[Keep Webhook] keepApiKey:" + keepApiKey);
+  Zabbix.log(4, "[Keep Webhook] Sending request:" + JSON.stringify(params));
 
   resp = req.post(keepApiUrl, JSON.stringify(params));
-  Zabbix.log(4, '[Keep Webhook] Received response: HTTP ' + req.getStatus() + ': ' + resp);
+  Zabbix.log(4, "[Keep Webhook] Received response: HTTP " + req.getStatus());
 
   if (req.getStatus() != 202) {
-    throw 'Response code not 202';
-  }
-  else {
+    throw "Response code not 202";
+  } else {
     return resp;
   }
-}
-catch (error) {
-  Zabbix.log(3, '[Keep Webhook] Notification failed : ' + error);
-  throw 'Keep notification failed : ' + error;
+} catch (error) {
+  Zabbix.log(3, "[Keep Webhook] Notification failed : " + error);
+  throw "Keep notification failed : " + error;
 }