fixes

Author: Kyle-Neale

celery/assets/logs/celery.yaml

@@ -57,14 +57,14 @@ pipeline:
       grok:
         supportRules: |
           _date_standard %{date("yyyy-MM-dd HH:mm:ss,SSS"):timestamp}
-          _date_worker %{date("yyyy-MM-dd HH:mm:ss.SSS"):timestamp}
+          _date_worker %{date("yyyy-MM-dd HH:mm:ss.SSSSSS"):timestamp}
           _level %{word:level}
           _task_name %{word:task_name}
           _task_id %{notSpace:task_id}
         matchRules: |
+          celery_heartbeat celery@%{notSpace:worker_id} \[%{_date_worker}\] heartbeat: clock=%{number:clock}, freq=%{number:freq}, local_received=%{number:local_received}, pid=%{number:pid}, sw_ident=%{notSpace:sw_ident}, sw_sys=%{notSpace:sw_sys}, sw_ver=%{data:sw_ver}, utcoffset=%{number:utcoffset}
+          celery_task_status celery@%{notSpace:worker_id} \[%{_date_worker}\] task %{word:task_status}: %{data:task_name}\(%{notSpace:task_id}\) args=%{data:args} kwargs=%{data:kwargs} %{data:keyvalue("=", "", "", " ,")}
           celery_standard \[%{_date_standard}:\s+%{_level}/%{data}\]\s*%{data:message}
-          celery_worker celery@%{notSpace:worker_id} \[%{_date_worker}\] heartbeat: clock=%{number:heartbeat.clock}, freq=%{number:heartbeat.freq}, local_received=%{number:heartbeat.local_received}, pid=%{number:heartbeat.pid}, sw_ident=%{word:heartbeat.sw_ident}, sw_sys=%{word:heartbeat.sw_sys}, sw_ver=%{data:heartbeat.sw_ver}, utcoffset=%{number:heartbeat.utcoffset}
-          celery_task_status celery@%{notSpace:worker_id} \[%{_date_worker}\] task %{word:task_status}: %{data:task_name}\(%{notSpace:task_id}\) args=%{data:args} kwargs=%{data:kwargs} clock=%{number:clock}, local_received=%{number:local_received}, pid=%{number:pid}, result=%{data:result}, runtime=%{number:runtime}, utcoffset=%{number:utcoffset}
 
     - type: date-remapper
       name: Define `timestamp` as the official date of the log

celery/assets/logs/celery_tests.yaml

@@ -5,6 +5,7 @@ tests:
   result:
     custom:
       level: "INFO"
+      timestamp: 1761249745658
     message: "Task tasks.multiply[c05345e1-cfa5-43cb-9671-30a98115c5db] received"
     status: "info"
     tags:
@@ -15,6 +16,7 @@ tests:
   result:
     custom:
       level: "INFO"
+      timestamp: 1761249745660
     message: "Task tasks.add[c25d9c94-4ef6-4828-a1a7-37f6f5a328da] succeeded in 0.00030375000278581865s: 9"
     status: "info"
     tags:
@@ -24,17 +26,16 @@ tests:
   sample: "celery@17133dbfe7a6 [2025-10-01 13:33:33.400755] heartbeat: clock=1452, freq=5, local_received=1743702813.4011424, pid=1, sw_ident=py-celery, sw_sys=Linux, sw_ver=5.4.0, utcoffset=0"
   result:
     custom:
-      level: "INFO"
       worker_id: "17133dbfe7a6"
-      heartbeat:
-        clock: 1452
-        freq: 5
-        local_received: 1743702813.4011424
-        pid: 1
-        sw_ident: "py-celery"
-        sw_sys: "Linux"
-        sw_ver: "5.4.0"
-        utcoffset: 0
+      timestamp: 1743702813400
+      clock: 1452
+      freq: 5
+      local_received: 1743702813.4011424
+      pid: 1
+      sw_ident: "py-celery"
+      sw_sys: "Linux"
+      sw_ver: "5.4.0"
+      utcoffset: 0
     message: "heartbeat: clock=1452, freq=5, local_received=1743702813.4011424, pid=1, sw_ident=py-celery, sw_sys=Linux, sw_ver=5.4.0, utcoffset=0"
     status: "info"
     tags:
@@ -44,7 +45,6 @@ tests:
   sample: "celery@17133dbfe7a6 [2025-10-01 13:33:34.982177] task received: tasks.add(eaae3cff-f198-4fe3-9f69-ad59b0412bed) args=(4, 5) kwargs={} clock=1455, eta=None, expires=None, local_received=1743702814.983349, parent_id=None, pid=1, retries=0, root_id=eaae3cff-f198-4fe3-9f69-ad59b0412bed, utcoffset=0"
   result:
     custom:
-      level: "INFO"
       worker_id: "17133dbfe7a6"
       task_status: "received"
       task_name: "tasks.add"
@@ -69,7 +69,6 @@ tests:
   sample: "celery@17133dbfe7a6 [2025-10-01 13:33:34.986589] task succeeded: tasks.add(eaae3cff-f198-4fe3-9f69-ad59b0412bed) args=(4, 5) kwargs={} clock=1458, local_received=1743702814.987442, pid=1, result=9, runtime=0.00012291595339775085, utcoffset=0"
   result:
     custom:
-      level: "INFO"
       worker_id: "17133dbfe7a6"
       task_status: "succeeded"
       task_name: "tasks.add"