yaml fixes

DataDog · Nov 22, 2024 · cd9b3ae · cd9b3ae
1 parent cbd2776
commit cd9b3ae
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/nvidia_nim/assets/logs/nvidia_nim.yaml b/nvidia_nim/assets/logs/nvidia_nim.yaml
@@ -21,10 +21,15 @@ pipeline:
         - "[1730325496.647520] [dd317ab0670e:126  :0]          parser.c:2305 UCX  WARN  (set UCX_WARN_UNUSED_ENV_VARS=n to suppress this warning)"
       grok:
         matchRules: |
-          nvidia_nim %{date("yyyy-MM-dd HH:mm:ss,SSS"):timestamp} \[%{word:level}\] \[%{data:component_name}\] \[%{word}\] %{data:msg}
-          nvidia_nim_logger %{word:level} %{date("yyyy-MM-dd HH:mm:ss.SSS"):timestamp} %{data:logger.name}:%{data:logger.line}\] %{data:msg}
-          generic_log %{date("yyyy-MM-dd HH:mm:ss,SSS"):timestamp} \[%{word:level}\] %{data:msg}
-          componont_log \[%{number:timestamp}\]\W+\[%{data:container_id}:%{number:pid}\W+:%{number:thread_id}\W+%{data:logger.name}:%{data:logger.line} %{word:component_name}\W+%{word:level}\W+\(%{data:msg}\)
+          nvidia_nim %{date("yyyy-MM-dd HH:mm:ss,SSS"):timestamp} \[%{_level}\] \[%{data:component_name}\] \[%{word}\] %{_msg}
+          nvidia_nim_logger %{_level} %{date("yyyy-MM-dd HH:mm:ss.SSS"):timestamp} %{_logger_name}:%{_logger_line}\] %{_msg}
+          generic_log %{date("yyyy-MM-dd HH:mm:ss,SSS"):timestamp} \[%{_level}\] %{_msg}
+          componont_log \[%{number:timestamp}\]\W+\[%{data:container_id}:%{number:pid}\W+:%{number:thread_id}\W+%{_logger_name}:%{_logger_line} %{word:component_name}\W+%{_level}\W+\(%{_msg}\)
+        supportRules: |
+          _logger_line %{data:logger.line}
+          _logger_name %{data:logger.name}
+          _level %{word:level}
+          _msg %{data:msg}
     - type: message-remapper
       name: Define `msg` as the official message of the log
       enabled: true

diff --git a/nvidia_nim/assets/logs/nvidia_nim_tests.yaml b/nvidia_nim/assets/logs/nvidia_nim_tests.yaml
@@ -27,9 +27,9 @@ tests:
      - "source:LOGS_SOURCE"
     timestamp: 1730325506914
  -
- sample: |-
-   "INFO 2024-10-30 21:56:28.831 ngc_injector.py:152] Valid profile: e45b4b991bbc51d0df3ce53e87060fc3a7f76555406ed534a8479c6faa706987 (tensorrt_llm-a10g-bf16-tp4-latency) on GPUs [0, 1, 2, 3]"
- result:
+  sample: |-
+    "INFO 2024-10-30 21:56:28.831 ngc_injector.py:152] Valid profile: e45b4b991bbc51d0df3ce53e87060fc3a7f76555406ed534a8479c6faa706987 (tensorrt_llm-a10g-bf16-tp4-latency) on GPUs [0, 1, 2, 3]"
+  result:
     custom:
       level: "INFO"
       timestamp: 1730325388831