Merge d46b74f7ca into ec1bfefbb9

fix: grafana timestamp parsing

alertbot.py

@@ -1,6 +1,6 @@
-import datetime
 import json
 
+import dateutil.parser
 from aiohttp.web import Request, Response, json_response
 from maubot import Plugin, MessageEvent
 from maubot.handlers import web, command
@@ -78,11 +78,11 @@ def get_alert_type(data):
 
     # Grafana
     try:
-        data["alerts"][0]["labels"]["grafana_folder"]
-        if data['status'] == "firing":
-            return "grafana-alert"
-        else:
-            return "grafana-resolved"
+        if data["alerts"][0]["labels"]["grafana_folder"]:
+            if data['status'] == "firing":
+                return "grafana-alert"
+            else:
+                return "grafana-resolved"
     except KeyError:
         pass
 
@@ -189,7 +189,6 @@ def grafana_alert_to_markdown(alert_data: dict) -> list:
     """
     messages = []
     for alert in alert_data["alerts"]:
-        datetime_format = "%Y-%m-%dT%H:%M:%S%z"
         if alert['status'] == "firing":
             message = (
                 f"""**Firing 🔥**: {alert['labels']['alertname']}  
@@ -201,8 +200,8 @@ def grafana_alert_to_markdown(alert_data: dict) -> list:
                 """
             )
         if alert['status'] == "resolved":
-            end_at = datetime.datetime.strptime(alert['endsAt'], datetime_format)
-            start_at = datetime.datetime.strptime(alert['startsAt'], datetime_format)
+            end_at = dateutil.parser.isoparse(alert['endsAt'])
+            start_at = dateutil.parser.isoparse(alert['startsAt'])
             message = (
                 f"""**Resolved 🥳**: {alert['labels']['alertname']}
     

maubot.yaml

@@ -5,4 +5,6 @@ license: AGPL-3.0-or-later
 modules:
   - alertbot
 main_class: AlertBot
+dependencies:
+  - python-dateutil>=2.8.2,<3.0.0
 webapp: true

requirements.txt

@@ -1,3 +1,3 @@
 maubot
 aiohttp
-datetime
+python-dateutil