Merge pull request #1988 from bmichalkiewicz/gelf

chart: add udp_transport_type for gelf output plugin

Author: pepov

charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_clusteroutputs.yaml

@@ -2696,6 +2696,8 @@ spec:
                     additionalProperties:
                       type: string
                     type: object
+                  udp_transport_type:
+                    type: string
                 required:
                 - host
                 - port
@@ -10139,6 +10141,8 @@ spec:
                     additionalProperties:
                       type: string
                     type: object
+                  udp_transport_type:
+                    type: string
                 required:
                 - host
                 - port

charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_outputs.yaml

@@ -2696,6 +2696,8 @@ spec:
                     additionalProperties:
                       type: string
                     type: object
+                  udp_transport_type:
+                    type: string
                 required:
                 - host
                 - port
@@ -9417,6 +9419,8 @@ spec:
                     additionalProperties:
                       type: string
                     type: object
+                  udp_transport_type:
+                    type: string
                 required:
                 - host
                 - port

charts/logging-operator/crds/logging.banzaicloud.io_clusteroutputs.yaml

@@ -2693,6 +2693,8 @@ spec:
                     additionalProperties:
                       type: string
                     type: object
+                  udp_transport_type:
+                    type: string
                 required:
                 - host
                 - port
@@ -10136,6 +10138,8 @@ spec:
                     additionalProperties:
                       type: string
                     type: object
+                  udp_transport_type:
+                    type: string
                 required:
                 - host
                 - port

charts/logging-operator/crds/logging.banzaicloud.io_outputs.yaml

@@ -2693,6 +2693,8 @@ spec:
                     additionalProperties:
                       type: string
                     type: object
+                  udp_transport_type:
+                    type: string
                 required:
                 - host
                 - port
@@ -9414,6 +9416,8 @@ spec:
                     additionalProperties:
                       type: string
                     type: object
+                  udp_transport_type:
+                    type: string
                 required:
                 - host
                 - port

config/crd/bases/logging.banzaicloud.io_clusteroutputs.yaml

@@ -2693,6 +2693,8 @@ spec:
                     additionalProperties:
                       type: string
                     type: object
+                  udp_transport_type:
+                    type: string
                 required:
                 - host
                 - port
@@ -10136,6 +10138,8 @@ spec:
                     additionalProperties:
                       type: string
                     type: object
+                  udp_transport_type:
+                    type: string
                 required:
                 - host
                 - port

config/crd/bases/logging.banzaicloud.io_outputs.yaml

@@ -2693,6 +2693,8 @@ spec:
                     additionalProperties:
                       type: string
                     type: object
+                  udp_transport_type:
+                    type: string
                 required:
                 - host
                 - port
@@ -9414,6 +9416,8 @@ spec:
                     additionalProperties:
                       type: string
                     type: object
+                  udp_transport_type:
+                    type: string
                 required:
                 - host
                 - port

docs/configuration/plugins/outputs/gelf.md

@@ -60,4 +60,10 @@ TLS Options. For details, see [https://github.com/graylog-labs/gelf-rb/blob/7291
 
 Default: {}
 
+### udp_transport_type (string, optional) {#output config-udp_transport_type}
+
+UdpTransportType specifies the UDP chunk size by choosing either WAN or LAN mode. The choice between WAN and LAN affects the UDP chunk size depending on whether you are sending logs within your local network (LAN) or over a longer route (e.g., through the internet). Set this option accordingly. For more details, see: [https://github.com/manet-marketing/gelf_redux/blob/9db64353b6672805152c17642ea8ad39eafb5875/lib/gelf/notifier.rb#L22](https://github.com/manet-marketing/gelf_redux/blob/9db64353b6672805152c17642ea8ad39eafb5875/lib/gelf/notifier.rb#L22) Available since ghcr.io/kube-logging/logging-operator/fluentd:5.3.0-full
+
+Default: WAN
+
 

images/fluentd/outputs/Gemfile

@@ -18,7 +18,7 @@ gem 'fluent-plugin-remote-syslog', '1.1.0'
 gem 'fluent-plugin-webhdfs', '1.6.0'
 gem 'fluent-plugin-vmware-loginsight', '1.4.2'
 gem 'fluent-plugin-vmware-log-intelligence', '2.0.8'
-gem 'fluent-plugin-gelf-best', '1.3.4'
+gem 'fluent-plugin-gelf-best', '1.4.1'
 gem 'fluent-plugin-s3', '1.8.3'
 gem 'fluent-plugin-gcs', '0.4.4'
 gem 'rdkafka', '0.21.0'

images/fluentd/outputs/Gemfile.lock

@@ -109,9 +109,10 @@ GEM
     fluent-plugin-gcs (0.4.4)
       fluentd (>= 0.14.22, < 2)
       google-cloud-storage (~> 1.1)
-    fluent-plugin-gelf-best (1.3.4)
-      fluentd (>= 1.0.0)
-      gelf (>= 3.1.0)
+    fluent-plugin-gelf-best (1.4.1)
+      fluentd (>= 1.8.0)
+      gelf_redux (>= 4.1.0)
+      oj
     fluent-plugin-grafana-loki (1.2.20)
       fluentd (>= 1.9.3, < 2)
     fluent-plugin-kafka (0.19.3)
@@ -191,7 +192,7 @@ GEM
       tzinfo-data (~> 1.0)
       webrick (~> 1.4)
       yajl-ruby (~> 1.0)
-    gelf (3.1.0)
+    gelf_redux (4.1.0)
       json
     google-apis-core (0.15.1)
       addressable (~> 2.5, >= 2.5.1)
@@ -242,7 +243,7 @@ GEM
     i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     jmespath (1.6.2)
-    json (2.6.3)
+    json (2.10.2)
     json-jwt (1.15.3.1)
       activesupport (>= 4.2)
       aes_key_wrap
@@ -285,6 +286,9 @@ GEM
     nokogiri (1.18.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
+    oj (3.16.10)
+      bigdecimal (>= 3.0)
+      ostruct (>= 0.2)
     openid_connect (1.1.8)
       activemodel
       attr_required (>= 1.0.0)
@@ -299,6 +303,7 @@ GEM
       faraday (>= 1.0, < 3)
       multi_json (>= 1.0)
     os (1.1.4)
+    ostruct (0.6.1)
     prometheus-client (4.2.1)
     public_suffix (5.0.3)
     racc (1.8.1)
@@ -378,7 +383,7 @@ DEPENDENCIES
   fluent-plugin-datadog (= 0.14.4)
   fluent-plugin-elasticsearch (= 5.4.3)
   fluent-plugin-gcs (= 0.4.4)
-  fluent-plugin-gelf-best (= 1.3.4)
+  fluent-plugin-gelf-best (= 1.4.1)
   fluent-plugin-grafana-loki (= 1.2.20)
   fluent-plugin-kafka (= 0.19.3)
   fluent-plugin-kinesis (= 3.5.0)

pkg/sdk/logging/model/output/gelf.go

@@ -63,6 +63,12 @@ type GelfOutputConfig struct {
 	// For details, see [https://github.com/Graylog2/graylog2-server/issues/873](https://github.com/Graylog2/graylog2-server/issues/873)
 	// Available since ghcr.io/kube-logging/fluentd:v1.16-4.10-full (default: 3200)
 	MaxBytes int `json:"max_bytes,omitempty"`
+	// UdpTransportType specifies the UDP chunk size by choosing either WAN or LAN mode.
+	// The choice between WAN and LAN affects the UDP chunk size depending on whether you are sending logs within your local network (LAN) or over a longer route (e.g., through the internet). Set this option accordingly.
+	// For more details, see:
+	// [https://github.com/manet-marketing/gelf_redux/blob/9db64353b6672805152c17642ea8ad39eafb5875/lib/gelf/notifier.rb#L22](https://github.com/manet-marketing/gelf_redux/blob/9db64353b6672805152c17642ea8ad39eafb5875/lib/gelf/notifier.rb#L22)
+	// Available since ghcr.io/kube-logging/logging-operator/fluentd:5.3.0-full (default: WAN)
+	UdpTransportType string `json:"udp_transport_type,omitempty"`
 	// Available since ghcr.io/kube-logging/fluentd:v1.16-4.8-full
 	// +docLink:"Buffer,../buffer/"
 	Buffer *Buffer `json:"buffer,omitempty"`