diff --git a/fluent.conf.rt b/fluent.conf.rt
index 15a02c4..0d808f5 100644
--- a/fluent.conf.rt
+++ b/fluent.conf.rt
@@ -165,8 +165,8 @@
@type multiline
format_firstline /\d{4}-\d{1,2}-\d{1,2}/
- format1 /^(?[^ ]*) \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?.*)\] \[(?.*)\] \[\] -(?.*)$/
- time_key timestamp
+ format1 /^(?[^ ]*) \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?.*)\] \[(?.*)\] \[\] -(?.*)$/
+ time_key log_timestamp
time_format %Y-%m-%dT%H:%M:%S.%LZ
@@ -179,8 +179,8 @@
tag jfrog.rt.access.request
@type regexp
- expression ^(?[^ ]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?.+)$
- time_key timestamp
+ expression ^(?[^ ]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?.+)$
+ time_key log_timestamp
time_format %Y-%m-%dT%H:%M:%S.%LZ
types response_content_length:integer, request_content_length:integer, return_status:integer
@@ -236,8 +236,8 @@
tag jfrog.rt.artifactory.access
@type regexp
- expression /^(?[^ ]*) \[(?[^\]]*)\] \[(?[^\]]*)\] (?.*) for client : (?.+)\/(?\s*\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3})\.(?.+)?$/
- time_key timestamp
+ expression /^(?[^ ]*) \[(?[^\]]*)\] \[(?[^\]]*)\] (?.*) for client : (?.+)\/(?\s*\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3})\.(?.+)?$/
+ time_key log_timestamp
time_format %Y-%m-%dT%H:%M:%S.%LZ
@@ -250,8 +250,8 @@
tag jfrog.rt.access.audit
@type regexp
- expression /^(?[^ ]*)\|(?[^ ]*)\|(?[^ ]*)\|(?[^ ]*)\|(?[^ ]*)\|(?[^ ]*)\|(?[^ ]*)\|(?[^ ]*)\|(?.*)/
- time_key timestamp
+ expression /^(?[^ ]*)\|(?[^ ]*)\|(?[^ ]*)\|(?[^ ]*)\|(?[^ ]*)\|(?[^ ]*)\|(?[^ ]*)\|(?[^ ]*)\|(?.*)/
+ time_key log_timestamp
time_format %Y-%m-%dT%H:%M:%S.%LZ
@@ -285,8 +285,8 @@
@type multiline
format_firstline /\d{4}-\d{1,2}-\d{1,2}/
- format1 /^(?[^ ]*) \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?.*)\] \[(?.*)\] -(?.*)$/
- time_key timestamp
+ format1 /^(?[^ ]*) \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?.*)\] \[(?.*)\] -(?.*)$/
+ time_key log_timestamp
time_format %Y-%m-%dT%H:%M:%S.%LZ
@@ -296,8 +296,8 @@
@type multiline
format_firstline /\d{4}-\d{1,2}-\d{1,2}/
- format1 /^(?[^ ]*) \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?.*)\] \[(?.*)\] -(?.*)$/
- time_key timestamp
+ format1 /^(?[^ ]*) \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?.*)\] \[(?.*)\] -(?.*)$/
+ time_key log_timestamp
time_format %Y-%m-%dT%H:%M:%S.%LZ
@@ -307,8 +307,8 @@
@type multiline
format_firstline /\d{4}-\d{1,2}-\d{1,2}/
- format1 /^(?[^ ]*) \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?.*)\] \[(?.*)\] \[\] -(?.*)$/
- time_key timestamp
+ format1 /^(?[^ ]*) \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?.*)\] \[(?.*)\] \[\] -(?.*)$/
+ time_key log_timestamp
time_format %Y-%m-%dT%H:%M:%S.%LZ
@@ -318,8 +318,8 @@
@type multiline
format_firstline /\d{4}-\d{1,2}-\d{1,2}/
- format1 /^(?[^ ]*) \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?.*)\] \[(?.*)\] \[\] -(?.*)$/
- time_key timestamp
+ format1 /^(?[^ ]*) \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?.*)\] \[(?.*)\] \[\] -(?.*)$/
+ time_key log_timestamp
time_format %Y-%m-%dT%H:%M:%S.%LZ
@@ -329,8 +329,8 @@
key_name message
@type regexp
- expression ^(?[^ ]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?.+)$
- time_key timestamp
+ expression ^(?[^ ]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?.+)$
+ time_key log_timestamp
time_format %Y-%m-%dT%H:%M:%S.%LZ
@@ -347,8 +347,8 @@
key_name message
@type regexp
- expression ^(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?.+)$
- time_key timestamp
+ expression ^(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?.+)$
+ time_key log_timestamp
time_format %Y-%m-%dT%H:%M:%S.%LZ
@@ -357,8 +357,8 @@
key_name message
@type regexp
- expression ^(?[^ ]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?.+)$
- time_key timestamp
+ expression ^(?[^ ]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?.+)$
+ time_key log_timestamp
time_format %Y-%m-%dT%H:%M:%S.%LZ
diff --git a/fluent.conf.xray b/fluent.conf.xray
index aed5616..f043266 100644
--- a/fluent.conf.xray
+++ b/fluent.conf.xray
@@ -222,8 +222,8 @@
tag jfrog.xray.router.traefik
@type regexp
- expression ^(?[^ ]*) \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?.*)\] \[(?.*)\] -(?.+)$
- time_key timestamp
+ expression ^(?[^ ]*) \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?.*)\] \[(?.*)\] -(?.+)$
+ time_key log_timestamp
time_format %Y-%m-%dT%H:%M:%S.%LZ
@@ -248,8 +248,8 @@
tag jfrog.xray.xray.request
@type regexp
- expression ^(?[^ ]*)\|(?[^ ]*)\|(?[^|]++)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?.*)$
- time_key timestamp
+ expression ^(?[^ ]*)\|(?[^ ]*)\|(?[^|]++)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?[^\|]*)\|(?.*)$
+ time_key log_timestamp
time_format %Y-%m-%dT%H:%M:%S.%LZ
@@ -283,8 +283,8 @@
@type multiline
format_firstline /\d{4}-\d{1,2}-\d{1,2}/
- format1 /^(?[^ ]*) \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?.*)\] \[(?.*)\] (?.*)$/
- time_key timestamp
+ format1 /^(?[^ ]*) \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?.*)\] \[(?.*)\] (?.*)$/
+ time_key log_timestamp
time_format %Y-%m-%dT%H:%M:%S.%LZ
emit_invalid_record_to_error false
@@ -295,8 +295,8 @@
@type multiline
format_firstline /\d{4}-\d{1,2}-\d{1,2}/
- format1 /^(?[^ ]*) \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?.*)\] \[(?.*)\] (?.*)$/
- time_key timestamp
+ format1 /^(?[^ ]*) \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?.*)\] \[(?.*)\] (?.*)$/
+ time_key log_timestamp
time_format %Y-%m-%dT%H:%M:%S.%LZ
emit_invalid_record_to_error false
@@ -307,8 +307,8 @@
@type multiline
format_firstline /\d{4}-\d{1,2}-\d{1,2}/
- format1 /^(?[^ ]*) \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?.*)\] \[(?.*)\] (?.*)$/
- time_key timestamp
+ format1 /^(?[^ ]*) \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?.*)\] \[(?.*)\] (?.*)$/
+ time_key log_timestamp
time_format %Y-%m-%dT%H:%M:%S.%LZ
@@ -318,8 +318,8 @@
@type multiline
format_firstline /\d{4}-\d{1,2}-\d{1,2}/
- format1 /^(?[^ ]*) \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?.*)\] \[(?.*)\] \[\] -(?.*)$/
- time_key timestamp
+ format1 /^(?[^ ]*) \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?.*)\] \[(?.*)\] \[\] -(?.*)$/
+ time_key log_timestamp
time_format %Y-%m-%dT%H:%M:%S.%LZ
@@ -329,8 +329,8 @@
@type multiline
format_firstline /\d{4}-\d{1,2}-\d{1,2}/
- format1 /^(?[^ ]*) \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?.*)\] \[(?.*)\] (?.*)$/
- time_key timestamp
+ format1 /^(?[^ ]*) \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?[^\]]*)\] \[(?.*)\] \[(?.*)\] (?.*)$/
+ time_key log_timestamp
time_format %Y-%m-%dT%H:%M:%S.%LZ