19994 FIX HTML email: Use originating site's timezone for 'Event date'

SUP-29059

Change-Id: Ia8fa86784ee9dbcc0fb9cb14701d26c598d362b1

Author: makanakoeln

.werks/19994.md

@@ -0,0 +1,26 @@
+[//]: # (werk v3)
+# HTML email: Use originating site's timezone for 'Event date'
+
+key        | value
+---------- | ---
+date       | 2026-05-19T06:00:02.416865+00:00
+version    | 2.5.0p4
+class      | fix
+edition    | community
+component  | notifications
+level      | 1
+compatible | yes
+
+In distributed setups, HTML email notifications previously rendered the
+"Event date" using the timezone of the site that sent the email. When the
+central site processed notifications forwarded from a remote site in a
+different timezone, the timestamp neither reflected when the event actually
+occurred on the remote nor included a timezone indicator, making it
+ambiguous.
+
+The state-change timestamps for "Event date" are now pre-rendered on the
+originating site, so the email shows the event time in the timezone of the
+site where the state change happened and includes the timezone abbreviation,
+e.g. "2026-05-19 14:32:11 AEST".
+
+This also affects the "Event date" column in HTML bulk notifications.

cmk/base/events.py

@@ -356,6 +356,19 @@ def complete_raw_context(
             # from that one, but we try to keep this simple here.
             enriched_context["MICROTIME"] = "%d" % (time.time() * 1000000)
 
+        # Pre-render the state-change timestamps in the originating site's local
+        # timezone. In distributed setups the central site processes forwarded
+        # notifications in its own timezone, which would otherwise hide where
+        # and when the event actually happened.
+        if host_state_change := enriched_context.get("LASTHOSTSTATECHANGE"):
+            enriched_context["LASTHOSTSTATECHANGE_LOCAL"] = time.strftime(
+                "%Y-%m-%d %H:%M:%S %Z", time.localtime(int(host_state_change))
+            )
+        if service_state_change := enriched_context.get("LASTSERVICESTATECHANGE"):
+            enriched_context["LASTSERVICESTATECHANGE_LOCAL"] = time.strftime(
+                "%Y-%m-%d %H:%M:%S %Z", time.localtime(int(service_state_change))
+            )
+
         enriched_context["HOSTURL"] = "/check_mk/index.py?start_url=view.py?%s" % quote(
             urlencode(
                 [

notifications/templates/mail/bulk.html.jinja

@@ -56,9 +56,9 @@
                         </td>
                         <td align="right" width="100%" style="padding: 0; vertical-align: middle">
                             {% if bulk_service_notification %}
-                                {{ entry.LASTSERVICESTATECHANGE | timestamp() if entry.get('LASTSERVICESTATECHANGE') else entry.SHORTDATETIME }}
+                                {{ entry.LASTSERVICESTATECHANGE_LOCAL if entry.get("LASTSERVICESTATECHANGE_LOCAL") else (entry.LASTSERVICESTATECHANGE | timestamp() if entry.get('LASTSERVICESTATECHANGE') else entry.SHORTDATETIME) }}
                             {% else %}
-                                {{ entry.LASTHOSTSTATECHANGE | timestamp() if entry.get('LASTHOSTSTATECHANGE') else entry.SHORTDATETIME }}
+                                {{ entry.LASTHOSTSTATECHANGE_LOCAL if entry.get("LASTHOSTSTATECHANGE_LOCAL") else (entry.LASTHOSTSTATECHANGE | timestamp() if entry.get('LASTHOSTSTATECHANGE') else entry.SHORTDATETIME) }}
                             {% endif %}
                         </td>
                     </tr>

notifications/templates/mail/event_overview.html.jinja

@@ -34,9 +34,9 @@
         <td width="120" style="padding:5px 0;font-weight:600;line-height:1.4;">Event date:</td>
         <td style="padding:5px 0;line-height:1.4;">
             {% if service_notification %}
-                {{ data.get("LASTSERVICESTATECHANGE") | timestamp() if data.get('LASTSERVICESTATECHANGE') else 'N/A' }}
+                {{ data.LASTSERVICESTATECHANGE_LOCAL if data.get("LASTSERVICESTATECHANGE_LOCAL") else (data.LASTSERVICESTATECHANGE | timestamp() if data.get('LASTSERVICESTATECHANGE') else 'N/A') }}
             {% else %}
-                {{ data.get("LASTHOSTSTATECHANGE") | timestamp() if data.get('LASTHOSTSTATECHANGE') else 'N/A' }}
+                {{ data.LASTHOSTSTATECHANGE_LOCAL if data.get("LASTHOSTSTATECHANGE_LOCAL") else (data.LASTHOSTSTATECHANGE | timestamp() if data.get('LASTHOSTSTATECHANGE') else 'N/A') }}
             {% endif %}
         </td>
     </tr>

packages/cmk-events/cmk/events/event_context.py

@@ -86,9 +86,11 @@ class EnrichedEventContext(EventContext, total=False):
     HOSTURL: str
     HOSTSHORTSTATE: str
     LASTHOSTSHORTSTATE: str
+    LASTHOSTSTATECHANGE_LOCAL: str
     LASTHOSTSTATECHANGE_REL: str
     LASTHOSTUP_REL: str
     LASTSERVICESHORTSTATE: str
+    LASTSERVICESTATECHANGE_LOCAL: str
     LASTSERVICESTATECHANGE_REL: str
     LASTSERVICEOK_REL: str
     PREVIOUSHOSTHARDSHORTSTATE: str

tests/unit/cmk/base/test_events.py

@@ -3,21 +3,25 @@
 # This file is part of Checkmk (https://checkmk.com). It is subject to the terms and
 # conditions defined in the file COPYING, which is part of this source code package.
 
+import datetime
 from collections.abc import Mapping
 from typing import Final
+from zoneinfo import ZoneInfo
 
 import pytest
+import time_machine
 from pytest import MonkeyPatch
 
 import cmk.base.events
 from cmk.base.events import (
     _update_enriched_context_from_notify_host_file,
     add_to_event_context,
     apply_matchers,
+    complete_raw_context,
     event_match_hosttags,
     raw_context_from_string,
 )
-from cmk.events.event_context import EnrichedEventContext, EventContext
+from cmk.events.event_context import EnrichedEventContext, EventContext, HostName
 from cmk.utils.http_proxy_config import (
     EnvironmentProxyConfig,
     HTTPProxySpec,
@@ -60,6 +64,58 @@ def test_raw_context_from_string(context: str, expected: EventContext) -> None:
     assert raw_context_from_string(context) == expected
 
 
+@pytest.mark.parametrize(
+    "tz, expected_host, expected_service",
+    [
+        ("Australia/Brisbane", "2025-05-12 18:11:34 AEST", "2025-05-12 18:15:00 AEST"),
+        ("UTC", "2025-05-12 08:11:34 UTC", "2025-05-12 08:15:00 UTC"),
+    ],
+)
+def test_complete_raw_context_pre_formats_state_change_with_local_tz(
+    tz: str, expected_host: str, expected_service: str
+) -> None:
+    raw_context = EventContext(
+        HOSTNAME=HostName("heute"),
+        CONTACTS="cmkadmin",
+        MICROTIME="1747037494000000",
+        LASTHOSTSTATECHANGE="1747037494",
+        LASTSERVICESTATECHANGE="1747037700",
+    )
+
+    with time_machine.travel(datetime.datetime.now(tz=ZoneInfo(tz)), tick=False):
+        enriched = complete_raw_context(
+            raw_context,
+            ensure_nagios=lambda _msg: None,
+            with_dump=False,
+            contacts_needed=False,
+            analyse=False,
+        )
+
+    assert enriched["LASTHOSTSTATECHANGE_LOCAL"] == expected_host
+    assert enriched["LASTSERVICESTATECHANGE_LOCAL"] == expected_service
+
+
+def test_complete_raw_context_skips_local_field_for_host_notification() -> None:
+    raw_context = EventContext(
+        HOSTNAME=HostName("heute"),
+        CONTACTS="cmkadmin",
+        MICROTIME="1747037494000000",
+        LASTHOSTSTATECHANGE="1747037494",
+    )
+
+    with time_machine.travel(datetime.datetime.now(tz=ZoneInfo("UTC")), tick=False):
+        enriched = complete_raw_context(
+            raw_context,
+            ensure_nagios=lambda _msg: None,
+            with_dump=False,
+            contacts_needed=False,
+            analyse=False,
+        )
+
+    assert enriched["LASTHOSTSTATECHANGE_LOCAL"] == "2025-05-12 08:11:34 UTC"
+    assert "LASTSERVICESTATECHANGE_LOCAL" not in enriched
+
+
 def test_add_to_event_context_param_overrides_context() -> None:
     context = {"FOO": "bar", "BAZ": "old"}
     add_to_event_context(context, "BAZ", "new", lambda *args, **kw: HTTP_PROXY)