support option dont-parse-log in log-forward section

Signed-off-by: Vincent Gramer <vgramer@haproxy.com>

Author: vgramer

config-parser/section-parsers.go

@@ -977,6 +977,7 @@ func (p *configParser) getLogForwardParser() *Parsers {
 	addParser(parser, &sequence, &parsers.Bind{})
 	addParser(parser, &sequence, &parsers.Log{})
 	addParser(parser, &sequence, &simple.Option{Name: "assume-rfc6587-ntf"})
+	addParser(parser, &sequence, &simple.Option{Name: "dont-parse-log"})
 	addParser(parser, &sequence, &simple.Number{Name: "backlog"})
 	addParser(parser, &sequence, &simple.Number{Name: "maxconn"})
 	addParser(parser, &sequence, &simple.Timeout{Name: "client"})

config-parser/tests/configs/haproxy.cfg.go

@@ -189,6 +189,7 @@ traces
 
 log-forward
   option assume-rfc6587-ntf
+  option dont-parse-log
 
 crt-store tpm2
   crt-base /c

configuration/log_forward.go

@@ -109,6 +109,15 @@ func ParseLogForward(p parser.Parser, lf *models.LogForward) error {
 		lf.AssumeRfc6587Ntf = true
 	}
 
+	// get option dont-parse-log
+	_, err = p.Get(parser.LogForward, lf.Name, "option dont-parse-log", false)
+	if err != nil && !errors.Is(err, parsererrors.ErrFetch) {
+		return err
+	}
+	if err == nil {
+		lf.DontParseLog = true
+	}
+
 	backlog, err := p.Get(parser.LogForward, lf.Name, "backlog", false)
 	if err != nil && !errors.Is(err, parsererrors.ErrFetch) {
 		return err
@@ -272,5 +281,13 @@ func SerializeLogForwardSection(p parser.Parser, data *models.LogForward, opt *o
 		return err
 	}
 
+	var dontParseLogOption common.ParserData
+	if data.DontParseLog {
+		dontParseLogOption = types.SimpleOption{}
+	}
+	if err = p.Set(parser.LogForward, data.Name, "option dont-parse-log", dontParseLogOption); err != nil {
+		return err
+	}
+
 	return err
 }

models/log_forward_base.go

@@ -4194,6 +4194,9 @@ definitions:
       backlog:
         type: integer
         x-nullable: true
+      dont-parse-log:
+        type: boolean
+        x-display-name: Don't Parse Log
       maxconn:
         type: integer
         x-nullable: true

models/log_forward_base_compare.go

@@ -30,6 +30,9 @@ log_forward_base:
     assume-rfc6587-ntf:
       type: boolean
       x-display-name: Assume RFC-6587 Non-Transparent Framing
+    dont-parse-log:
+      type: boolean
+      x-display-name: Don't Parse Log
     backlog:
       type: integer
       x-nullable: true

models/log_forward_base_compare_test.go

@@ -968,6 +968,7 @@ ring myring
 
 log-forward sylog-loadb
   option assume-rfc6587-ntf
+  option dont-parse-log
   dgram-bind 127.0.0.1:1514 transparent name webserv
   bind 127.0.0.1:1514
   backlog 10

specification/build/haproxy_spec.yaml

@@ -3016,6 +3016,7 @@
     "log_forwards": {
         "sylog-loadb": {
             "assume-rfc6587-ntf": true,
+            "dont-parse-log": true,
             "backlog": 10,
             "maxconn": 1000,
             "name": "sylog-loadb",