From ba7b6938b572152c65d72bf5d5e58b11c815e1ac Mon Sep 17 00:00:00 2001
From: ryanohnemus <ryanohnemus@gmail.com>
Date: Thu, 9 Jan 2025 13:32:53 -0600
Subject: [PATCH] readd static cri parser

Signed-off-by: ryanohnemus <ryanohnemus@gmail.com>
---
 src/flb_parser_cri.c              | 2 +-
 src/multiline/flb_ml_parser_cri.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/flb_parser_cri.c b/src/flb_parser_cri.c
index dd791a1d927..36c09187fb3 100644
--- a/src/flb_parser_cri.c
+++ b/src/flb_parser_cri.c
@@ -74,7 +74,7 @@ int flb_parser_cri_do(struct flb_parser *parser,
     msgpack_pack_map(&tmp_pck, map_size);
 
     struct flb_tm tm = {0};
-    ret = flb_parser_time_lookup(in_buf, token_end-in_buf-1,
+    ret = flb_parser_time_lookup(in_buf, token_end-in_buf,
         0, parser, &tm, &tmfrac);
     if (ret == -1) {
         flb_error("[parser:%s] Invalid time format %s",
diff --git a/src/multiline/flb_ml_parser_cri.c b/src/multiline/flb_ml_parser_cri.c
index 4e20d966903..60fd73ac27c 100644
--- a/src/multiline/flb_ml_parser_cri.c
+++ b/src/multiline/flb_ml_parser_cri.c
@@ -21,9 +21,6 @@
 #include <fluent-bit/multiline/flb_ml.h>
 #include <fluent-bit/multiline/flb_ml_parser.h>
 
-//Reverting change for fuzz test... 
-#define FLB_ML_CRI_REGEX                                                \
-  "^(?<time>.+?) (?<stream>stdout|stderr) (?<_p>F|P) (?<log>.*)$"
 #define FLB_ML_CRI_TIME                         \
   "%Y-%m-%dT%H:%M:%S.%L%z"
 
@@ -33,8 +30,8 @@ static struct flb_parser *cri_parser_create(struct flb_config *config)
     struct flb_parser *p;
 
     p = flb_parser_create("_ml_cri",               /* parser name */
-                          "regex", //"cri",                   /* backend type */
-                          FLB_ML_CRI_REGEX, //NULL,                    /* regex */
+                          "cri",                   /* backend type */
+                          NULL,                    /* regex */
                           FLB_FALSE,               /* skip_empty */
                           FLB_ML_CRI_TIME,         /* time format */
                           "time",                  /* time key */