Merge pull request #2038 from josefhandl/add-syslog-ip-protocol

csatib02 · web-flow · commit d99038a1265e · 2025-05-10T09:13:08.000+02:00
diff --git a/charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_syslogngclusteroutputs.yaml b/charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_syslogngclusteroutputs.yaml
@@ -953,6 +953,11 @@ spec:
                     type: integer
                   host:
                     type: string
+                  ip-protocol:
+                    enum:
+                    - 4
+                    - 6
+                    type: integer
                   persist_name:
                     type: string
                   port:
@@ -3155,6 +3160,11 @@ spec:
                     type: integer
                   host:
                     type: string
+                  ip-protocol:
+                    enum:
+                    - 4
+                    - 6
+                    type: integer
                   persist_name:
                     type: string
                   port:
diff --git a/charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_syslogngoutputs.yaml b/charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_syslogngoutputs.yaml
@@ -953,6 +953,11 @@ spec:
                     type: integer
                   host:
                     type: string
+                  ip-protocol:
+                    enum:
+                    - 4
+                    - 6
+                    type: integer
                   persist_name:
                     type: string
                   port:
@@ -3153,6 +3158,11 @@ spec:
                     type: integer
                   host:
                     type: string
+                  ip-protocol:
+                    enum:
+                    - 4
+                    - 6
+                    type: integer
                   persist_name:
                     type: string
                   port:
diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_syslogngclusteroutputs.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_syslogngclusteroutputs.yaml
@@ -950,6 +950,11 @@ spec:
                     type: integer
                   host:
                     type: string
+                  ip-protocol:
+                    enum:
+                    - 4
+                    - 6
+                    type: integer
                   persist_name:
                     type: string
                   port:
@@ -3152,6 +3157,11 @@ spec:
                     type: integer
                   host:
                     type: string
+                  ip-protocol:
+                    enum:
+                    - 4
+                    - 6
+                    type: integer
                   persist_name:
                     type: string
                   port:
diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_syslogngoutputs.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_syslogngoutputs.yaml
@@ -950,6 +950,11 @@ spec:
                     type: integer
                   host:
                     type: string
+                  ip-protocol:
+                    enum:
+                    - 4
+                    - 6
+                    type: integer
                   persist_name:
                     type: string
                   port:
@@ -3150,6 +3155,11 @@ spec:
                     type: integer
                   host:
                     type: string
+                  ip-protocol:
+                    enum:
+                    - 4
+                    - 6
+                    type: integer
                   persist_name:
                     type: string
                   port:
diff --git a/config/crd/bases/logging.banzaicloud.io_syslogngclusteroutputs.yaml b/config/crd/bases/logging.banzaicloud.io_syslogngclusteroutputs.yaml
@@ -950,6 +950,11 @@ spec:
                     type: integer
                   host:
                     type: string
+                  ip-protocol:
+                    enum:
+                    - 4
+                    - 6
+                    type: integer
                   persist_name:
                     type: string
                   port:
@@ -3152,6 +3157,11 @@ spec:
                     type: integer
                   host:
                     type: string
+                  ip-protocol:
+                    enum:
+                    - 4
+                    - 6
+                    type: integer
                   persist_name:
                     type: string
                   port:
diff --git a/config/crd/bases/logging.banzaicloud.io_syslogngoutputs.yaml b/config/crd/bases/logging.banzaicloud.io_syslogngoutputs.yaml
@@ -950,6 +950,11 @@ spec:
                     type: integer
                   host:
                     type: string
+                  ip-protocol:
+                    enum:
+                    - 4
+                    - 6
+                    type: integer
                   persist_name:
                     type: string
                   port:
@@ -3150,6 +3155,11 @@ spec:
                     type: integer
                   host:
                     type: string
+                  ip-protocol:
+                    enum:
+                    - 4
+                    - 6
+                    type: integer
                   persist_name:
                     type: string
                   port:
diff --git a/docs/configuration/plugins/syslogng-outputs/syslog.md b/docs/configuration/plugins/syslogng-outputs/syslog.md
@@ -109,6 +109,12 @@ Specifies how many lines are flushed to a destination at a time. For details, se
 Address of the destination host 
 
 
+### ip-protocol (*int, optional) {#syslogoutput-ip-protocol}
+
+IP protocol
+
+Default: 4
+
 ### persist_name (string, optional) {#syslogoutput-persist_name}
 
 Unique name for the syslog-ng driver. If you receive the following error message during syslog-ng startup, set the `persist-name()` option of the duplicate drivers: `Error checking the uniqueness of the persist names, please override it with persist-name option. Shutting down.` See the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-http-nonjava/reference-destination-http-nonjava/#persist-name) for more information. 
diff --git a/pkg/sdk/logging/model/syslogng/output/syslog.go b/pkg/sdk/logging/model/syslogng/output/syslog.go
@@ -104,6 +104,9 @@ type _metaSyslogOutput interface{} //nolint:deadcode,unused
 type SyslogOutput struct {
 	// Address of the destination host
 	Host string `json:"host,omitempty" syslog-ng:"pos=0"`
+	// IP protocol (default: 4)
+	// +kubebuilder:validation:Enum=4;6
+	IpProtocol *int `json:"ip-protocol,omitempty"`
 	// The port number to connect to. For details, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-syslog/reference-destination-syslog-chapter/#port-or-destport).
 	Port int `json:"port,omitempty"`
 	// Specifies the protocol used to send messages to the destination server. For details, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-syslog/reference-destination-syslog-chapter/#transport).
diff --git a/pkg/sdk/logging/model/syslogng/output/zz_generated.deepcopy.go b/pkg/sdk/logging/model/syslogng/output/zz_generated.deepcopy.go
