new: added support for ecs logs format

Cargo.toml

@@ -4,7 +4,7 @@ categories = ["command-line-utilities"]
 description = "Utility for viewing json-formatted log files."
 keywords = ["cli", "human", "log"]
 name = "hl"
-version = "0.21.0"
+version = "0.22.0"
 edition = "2021"
 build = "build.rs"
 

etc/defaults/config-ecs.yaml

@@ -0,0 +1,61 @@
+# Time format, see https://man7.org/linux/man-pages/man1/date.1.html for details.
+time-format: '%b %d %T.%3N'
+
+# Time zone name, see column "TZ identifier" at
+# https://en.wikipedia.org/wiki/List_of_tz_database_time_zones page.
+time-zone: UTC
+
+# Settings for fields processing.
+fields:
+  # Configuration of the predefined set of fields.
+  predefined:
+    time:
+      names: ['@timestamp']
+    logger:
+      names: [log.logger]
+    level:
+      variants:
+        - names: [log.level]
+          values:
+            debug: [debug, dbg, d]
+            info: [info, inf, i, informational]
+            warning: [warning, warn, wrn, w]
+            error: [error, err, fatal, critical, panic, e]
+    message:
+      names: [message]
+    caller:
+      names: []
+    caller-file:
+      names: [log.origin.file.name]
+    caller-line:
+      names: [log.origin.file.line]
+  # List of wildcard field names to ignore.
+  ignore: ['_*']
+  # List of exact field names to hide.
+  hide:
+    - log
+
+# Formatting settings.
+formatting:
+  punctuation:
+    logger-name-separator: ':'
+    field-key-value-separator: '='
+    string-opening-quote: "'"
+    string-closing-quote: "'"
+    source-location-separator: '@ '
+    hidden-fields-indicator: ' ...'
+    level-left-separator: '|'
+    level-right-separator: '|'
+    input-number-prefix: '#'
+    input-number-left-separator: ''
+    input-number-right-separator: ' | '
+    input-name-left-separator: ''
+    input-name-right-separator: ' | '
+    input-name-clipping: '...'
+    input-name-common-part: '...'
+
+# Number of processing threads, configured automatically based on CPU count if not specified.
+concurrency: ~
+
+# Currently selected theme.
+theme: universal

etc/defaults/config.yaml

@@ -41,6 +41,10 @@ fields:
       names: [msg, message, MESSAGE, Message]
     caller:
       names: [caller, CALLER, Caller]
+    caller-file:
+      names: []
+    caller-line:
+      names: []
   # List of wildcard field names to ignore.
   ignore: ['_*']
   # List of exact field names to hide.

src/formatting.rs

@@ -15,7 +15,7 @@ use crate::theme;
 use crate::IncludeExcludeKeyFilter;
 use datefmt::DateTimeFormatter;
 use fmtx::{aligned_left, centered};
-use model::Level;
+use model::{Caller, Level};
 use theme::{Element, StylingPush, Theme};
 
 // ---
@@ -176,14 +176,25 @@ impl RecordFormatter {
             //
             // caller
             //
-            if let Some(text) = rec.caller {
+            if let Some(caller) = &rec.caller {
                 s.element(Element::Caller, |s| {
                     s.batch(|buf| {
                         buf.push(b' ');
                         buf.extend_from_slice(self.cfg.punctuation.source_location_separator.as_bytes())
                     });
                     s.element(Element::CallerInner, |s| {
-                        s.batch(|buf| buf.extend_from_slice(text.as_bytes()))
+                        s.batch(|buf| {
+                            match caller {
+                                Caller::Text(text) => {
+                                    buf.extend_from_slice(text.as_bytes());
+                                }
+                                Caller::FileLine(file, line) => {
+                                    buf.extend_from_slice(file.as_bytes());
+                                    buf.push(b':');
+                                    buf.extend_from_slice(line.as_bytes());
+                                }
+                            };
+                        });
                     });
                 });
             };
@@ -491,7 +502,7 @@ mod tests {
                 message: Some(RawValue::from_string(r#""tm""#.into()).unwrap().as_ref()),
                 level: Some(Level::Debug),
                 logger: Some("tl"),
-                caller: Some("tc"),
+                caller: Some(Caller::Text("tc")),
                 extra: heapless::Vec::from_slice(&[
                     ("ka", RawValue::from_string(r#"{"va":{"kb":42}}"#.into()).unwrap().as_ref()),
                 ]).unwrap(),