Merge pull request #1753 from kube-logging/release-4.6

Release 4.6 back to master
kube-logging · Jun 3, 2024 · ace8f63 · ace8f63
2 parents e8d7192 + c4df1e5
commit ace8f63
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 0 deletions.
diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_fluentbitagents.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_fluentbitagents.yaml
@@ -1739,6 +1739,8 @@ spec:
                   keepaliveMaxRecycle:
                     format: int32
                     type: integer
+                  maxWorkerConnections:
+                    type: integer
                   sourceAddress:
                     type: string
                 type: object

diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_loggings.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_loggings.yaml
@@ -2784,6 +2784,8 @@ spec:
                       keepaliveMaxRecycle:
                         format: int32
                         type: integer
+                      maxWorkerConnections:
+                        type: integer
                       sourceAddress:
                         type: string
                     type: object
@@ -11863,6 +11865,8 @@ spec:
                             keepaliveMaxRecycle:
                               format: int32
                               type: integer
+                            maxWorkerConnections:
+                              type: integer
                             sourceAddress:
                               type: string
                           type: object

diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_nodeagents.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_nodeagents.yaml
@@ -4335,6 +4335,8 @@ spec:
                       keepaliveMaxRecycle:
                         format: int32
                         type: integer
+                      maxWorkerConnections:
+                        type: integer
                       sourceAddress:
                         type: string
                     type: object

diff --git a/config/crd/bases/logging.banzaicloud.io_fluentbitagents.yaml b/config/crd/bases/logging.banzaicloud.io_fluentbitagents.yaml
@@ -1739,6 +1739,8 @@ spec:
                   keepaliveMaxRecycle:
                     format: int32
                     type: integer
+                  maxWorkerConnections:
+                    type: integer
                   sourceAddress:
                     type: string
                 type: object

diff --git a/config/crd/bases/logging.banzaicloud.io_loggings.yaml b/config/crd/bases/logging.banzaicloud.io_loggings.yaml
@@ -2784,6 +2784,8 @@ spec:
                       keepaliveMaxRecycle:
                         format: int32
                         type: integer
+                      maxWorkerConnections:
+                        type: integer
                       sourceAddress:
                         type: string
                     type: object
@@ -11863,6 +11865,8 @@ spec:
                             keepaliveMaxRecycle:
                               format: int32
                               type: integer
+                            maxWorkerConnections:
+                              type: integer
                             sourceAddress:
                               type: string
                           type: object

diff --git a/config/crd/bases/logging.banzaicloud.io_nodeagents.yaml b/config/crd/bases/logging.banzaicloud.io_nodeagents.yaml
@@ -4335,6 +4335,8 @@ spec:
                       keepaliveMaxRecycle:
                         format: int32
                         type: integer
+                      maxWorkerConnections:
+                        type: integer
                       sourceAddress:
                         type: string
                     type: object

diff --git a/config/samples/syslog-ng-simple.yaml b/config/samples/syslog-ng-simple.yaml
@@ -5,6 +5,10 @@ metadata:
 spec:
   controlNamespace: default
   fluentbit: {}
+#    network:
+#      maxWorkerConnections: 2
+#    syslogng_output:
+#      Workers: 5
   syslogNG:
     globalOptions:
       log_level: trace

diff --git a/docs/configuration/crds/v1beta1/fluentbit_types.md b/docs/configuration/crds/v1beta1/fluentbit_types.md
@@ -313,6 +313,12 @@ How many times a TCP keepalive connection can be used before being recycled
 
 Default: 0, disabled
 
+### maxWorkerConnections (int, optional) {#fluentbitnetwork-maxworkerconnections}
+
+Set maximum number of TCP connections that can be established per worker.
+
+Default: 0, unlimited
+
 ### sourceAddress (string, optional) {#fluentbitnetwork-sourceaddress}
 
 Specify network address (interface) to use for connection and data traffic.

diff --git a/pkg/resources/fluentbit/config.go b/pkg/resources/fluentbit/config.go
@@ -185,6 +185,9 @@ var fluentbitNetworkTemplate = `
     {{- if .Network.SourceAddress }}
     net.source_address {{ .Network.SourceAddress }}
     {{- end }}
+    {{- if .Network.MaxWorkerConnections }}
+    net.max_worker_connections {{ .Network.MaxWorkerConnections }}
+    {{- end }}
     {{- end }}
 `
 

diff --git a/pkg/resources/fluentbit/configsecret.go b/pkg/resources/fluentbit/configsecret.go
@@ -125,6 +125,7 @@ type FluentbitNetwork struct {
 	KeepaliveMaxRecycleSet    bool
 	KeepaliveMaxRecycle       uint32
 	SourceAddress             string
+	MaxWorkerConnections      int
 }
 
 // https://docs.fluentbit.io/manual/pipeline/outputs/tcp-and-tls
@@ -187,6 +188,10 @@ func newFluentbitNetwork(network v1beta1.FluentbitNetwork) (result FluentbitNetw
 	if network.SourceAddress != "" {
 		result.SourceAddress = network.SourceAddress
 	}
+
+	if network.MaxWorkerConnections != 0 {
+		result.MaxWorkerConnections = network.MaxWorkerConnections
+	}
 	return
 }
 

diff --git a/pkg/sdk/logging/api/v1beta1/fluentbit_types.go b/pkg/sdk/logging/api/v1beta1/fluentbit_types.go
@@ -175,6 +175,8 @@ type FluentbitNetwork struct {
 	KeepaliveMaxRecycle *uint32 `json:"keepaliveMaxRecycle,omitempty"`
 	// Specify network address (interface) to use for connection and data traffic. (default: disabled)
 	SourceAddress string `json:"sourceAddress,omitempty"`
+	// Set maximum number of TCP connections that can be established per worker. (default: 0, unlimited)
+	MaxWorkerConnections int `json:"maxWorkerConnections,omitempty"`
 }
 
 // GetPrometheusPortFromAnnotation gets the port value from annotation