Merge pull request #1318 from jk-mob/add-storage-total-limit-size-to-syslog-plugin

benjaminhuo · web-flow · commit 850cb1b924c0 · 2024-08-23T09:03:31.000+08:00
Support storage.total_limit_size in syslog plugin
diff --git a/apis/fluentbit/v1alpha2/plugins/output/syslog_types.go b/apis/fluentbit/v1alpha2/plugins/output/syslog_types.go
@@ -45,6 +45,8 @@ type Syslog struct {
 	*plugins.TLS `json:"tls,omitempty"`
 	// Include fluentbit networking options for this output-plugin
 	*plugins.Networking `json:"networking,omitempty"`
+	// Limit the maximum number of Chunks in the filesystem for the current output logical destination.
+	TotalLimitSize string `json:"totalLimitSize,omitempty"`
 }
 
 func (_ *Syslog) Name() string {
@@ -107,5 +109,8 @@ func (s *Syslog) Params(sl plugins.SecretLoader) (*params.KVs, error) {
 		}
 		kvs.Merge(net)
 	}
+	if s.TotalLimitSize != "" {
+		kvs.Insert("storage.total_limit_size", s.TotalLimitSize)
+	}
 	return kvs, nil
 }
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml
@@ -4159,6 +4159,10 @@ spec:
                         description: Hostname to be used for TLS SNI extension
                         type: string
                     type: object
+                  totalLimitSize:
+                    description: Limit the maximum number of Chunks in the filesystem
+                      for the current output logical destination.
+                    type: string
                 type: object
               tcp:
                 description: TCP defines TCP Output configuration.
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml
@@ -4159,6 +4159,10 @@ spec:
                         description: Hostname to be used for TLS SNI extension
                         type: string
                     type: object
+                  totalLimitSize:
+                    description: Limit the maximum number of Chunks in the filesystem
+                      for the current output logical destination.
+                    type: string
                 type: object
               tcp:
                 description: TCP defines TCP Output configuration.
diff --git a/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml b/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml
@@ -4159,6 +4159,10 @@ spec:
                         description: Hostname to be used for TLS SNI extension
                         type: string
                     type: object
+                  totalLimitSize:
+                    description: Limit the maximum number of Chunks in the filesystem
+                      for the current output logical destination.
+                    type: string
                 type: object
               tcp:
                 description: TCP defines TCP Output configuration.
diff --git a/config/crd/bases/fluentbit.fluent.io_outputs.yaml b/config/crd/bases/fluentbit.fluent.io_outputs.yaml
@@ -4159,6 +4159,10 @@ spec:
                         description: Hostname to be used for TLS SNI extension
                         type: string
                     type: object
+                  totalLimitSize:
+                    description: Limit the maximum number of Chunks in the filesystem
+                      for the current output logical destination.
+                    type: string
                 type: object
               tcp:
                 description: TCP defines TCP Output configuration.
diff --git a/docs/plugins/fluentbit/output/syslog.md b/docs/plugins/fluentbit/output/syslog.md
@@ -20,3 +20,4 @@ Syslog output plugin allows you to deliver messages to Syslog servers. <br /> **
 | syslogMessageKey | Key key name that contains the message to deliver. | string |
 | tls | Syslog output plugin supports TTL/SSL, for more details about the properties available and general configuration, please refer to the TLS/SSL section. | *[plugins.TLS](../tls.md) |
 | networking | Include fluentbit networking options for this output-plugin | *plugins.Networking |
+| totalLimitSize | Limit the maximum number of Chunks in the filesystem for the current output logical destination. | string |
diff --git a/manifests/setup/fluent-operator-crd.yaml b/manifests/setup/fluent-operator-crd.yaml
@@ -8096,6 +8096,10 @@ spec:
                         description: Hostname to be used for TLS SNI extension
                         type: string
                     type: object
+                  totalLimitSize:
+                    description: Limit the maximum number of Chunks in the filesystem
+                      for the current output logical destination.
+                    type: string
                 type: object
               tcp:
                 description: TCP defines TCP Output configuration.
@@ -36655,6 +36659,10 @@ spec:
                         description: Hostname to be used for TLS SNI extension
                         type: string
                     type: object
+                  totalLimitSize:
+                    description: Limit the maximum number of Chunks in the filesystem
+                      for the current output logical destination.
+                    type: string
                 type: object
               tcp:
                 description: TCP defines TCP Output configuration.
diff --git a/manifests/setup/setup.yaml b/manifests/setup/setup.yaml
@@ -8096,6 +8096,10 @@ spec:
                         description: Hostname to be used for TLS SNI extension
                         type: string
                     type: object
+                  totalLimitSize:
+                    description: Limit the maximum number of Chunks in the filesystem
+                      for the current output logical destination.
+                    type: string
                 type: object
               tcp:
                 description: TCP defines TCP Output configuration.
@@ -36655,6 +36659,10 @@ spec:
                         description: Hostname to be used for TLS SNI extension
                         type: string
                     type: object
+                  totalLimitSize:
+                    description: Limit the maximum number of Chunks in the filesystem
+                      for the current output logical destination.
+                    type: string
                 type: object
               tcp:
                 description: TCP defines TCP Output configuration.

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,8 @@ type Syslog struct {`
`45`	`45`	*plugins.TLS `json:"tls,omitempty"`
`46`	`46`	`// Include fluentbit networking options for this output-plugin`
`47`	`47`	*plugins.Networking `json:"networking,omitempty"`
	`48`	`+ // Limit the maximum number of Chunks in the filesystem for the current output logical destination.`
	`49`	+ TotalLimitSize string `json:"totalLimitSize,omitempty"`
`48`	`50`	`}`
`49`	`51`
`50`	`52`	`func (_ *Syslog) Name() string {`
`@@ -107,5 +109,8 @@ func (s Syslog) Params(sl plugins.SecretLoader) (params.KVs, error) {`
`107`	`109`	`}`
`108`	`110`	`kvs.Merge(net)`
`109`	`111`	`}`
	`112`	`+ if s.TotalLimitSize != "" {`
	`113`	`+ kvs.Insert("storage.total_limit_size", s.TotalLimitSize)`
	`114`	`+ }`
`110`	`115`	`return kvs, nil`
`111`	`116`	`}`