Skip to content

Add workers param for s3 output #1647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 26, 2025
Merged

Add workers param for s3 output #1647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2adead6
Add 'Workers' parameter for S3 Output plugin
hercynium Jun 25, 2025
6349d2e
Files generated when using make test
hercynium Jun 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion apis/fluentbit/v1alpha2/plugins/output/s3_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@ type S3 struct {
// Specify an external ID for the STS API, can be used with the role_arn parameter if your role requires an external ID.
ExternalId string `json:"ExternalId,omitempty"`
// Option to specify an AWS Profile for credentials.
Profile string `json:"Profile,omitempty"`
Profile string `json:"Profile,omitempty"`
// Specify number of worker threads to use to output to S3
Workers *int32 `json:"Workers,omitempty"`
*plugins.TLS `json:"tls,omitempty"`
}

Expand Down Expand Up @@ -159,6 +161,9 @@ func (o *S3) Params(sl plugins.SecretLoader) (*params.KVs, error) {
if o.Profile != "" {
kvs.Insert("profile", o.Profile)
}
if o.Workers != nil {
kvs.Insert("workers", fmt.Sprint(*o.Workers))
}
if o.TLS != nil {
tls, err := o.TLS.Params(sl)
if err != nil {
Expand Down
2 changes: 2 additions & 0 deletions apis/fluentbit/v1alpha2/plugins/output/s3_types_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ func TestOutput_S3_Params(t *testing.T) {
RetryLimit: ptrAny(int32(1)),
ExternalId: "external_id",
Profile: "my-profile",
Workers: ptrAny(int32(1)),
}

expected := params.NewKVs()
Expand Down Expand Up @@ -71,6 +72,7 @@ func TestOutput_S3_Params(t *testing.T) {
expected.Insert("retry_limit", "1")
expected.Insert("external_id", "external_id")
expected.Insert("profile", "my-profile")
expected.Insert("workers", "1")

kvs, err := s3.Params(sl)
g.Expect(err).NotTo(HaveOccurred())
Expand Down
5 changes: 5 additions & 0 deletions apis/fluentbit/v1alpha2/plugins/output/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3523,6 +3523,11 @@ spec:
description: Use the S3 PutObject API, instead of the multipart
upload API.
type: boolean
Workers:
description: Specify number of worker threads to use to output
to S3
format: int32
type: integer
tls:
description: Fluent Bit provides integrated support for Transport
Layer Security (TLS) and it predecessor Secure Sockets Layer
Expand Down
5 changes: 5 additions & 0 deletions charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3523,6 +3523,11 @@ spec:
description: Use the S3 PutObject API, instead of the multipart
upload API.
type: boolean
Workers:
description: Specify number of worker threads to use to output
to S3
format: int32
type: integer
tls:
description: Fluent Bit provides integrated support for Transport
Layer Security (TLS) and it predecessor Secure Sockets Layer
Expand Down
5 changes: 5 additions & 0 deletions config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3523,6 +3523,11 @@ spec:
description: Use the S3 PutObject API, instead of the multipart
upload API.
type: boolean
Workers:
description: Specify number of worker threads to use to output
to S3
format: int32
type: integer
tls:
description: Fluent Bit provides integrated support for Transport
Layer Security (TLS) and it predecessor Secure Sockets Layer
Expand Down
5 changes: 5 additions & 0 deletions config/crd/bases/fluentbit.fluent.io_outputs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3523,6 +3523,11 @@ spec:
description: Use the S3 PutObject API, instead of the multipart
upload API.
type: boolean
Workers:
description: Specify number of worker threads to use to output
to S3
format: int32
type: integer
tls:
description: Fluent Bit provides integrated support for Transport
Layer Security (TLS) and it predecessor Secure Sockets Layer
Expand Down
1 change: 1 addition & 0 deletions docs/plugins/fluentbit/output/s3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,5 @@ The S3 output plugin, allows to flush your records into a S3 time series databas
| RetryLimit | Integer value to set the maximum number of retries allowed. | *int32 |
| ExternalId | Specify an external ID for the STS API, can be used with the role_arn parameter if your role requires an external ID. | string |
| Profile | Option to specify an AWS Profile for credentials. | string |
| Workers | Specify number of worker threads to use to output to S3 | *int32 |
| tls | | *[plugins.TLS](../tls.md) |
10 changes: 10 additions & 0 deletions manifests/setup/fluent-operator-crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7659,6 +7659,11 @@ spec:
description: Use the S3 PutObject API, instead of the multipart
upload API.
type: boolean
Workers:
description: Specify number of worker threads to use to output
to S3
format: int32
type: integer
tls:
description: Fluent Bit provides integrated support for Transport
Layer Security (TLS) and it predecessor Secure Sockets Layer
Expand Down Expand Up @@ -36558,6 +36563,11 @@ spec:
description: Use the S3 PutObject API, instead of the multipart
upload API.
type: boolean
Workers:
description: Specify number of worker threads to use to output
to S3
format: int32
type: integer
tls:
description: Fluent Bit provides integrated support for Transport
Layer Security (TLS) and it predecessor Secure Sockets Layer
Expand Down
10 changes: 10 additions & 0 deletions manifests/setup/setup.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7659,6 +7659,11 @@ spec:
description: Use the S3 PutObject API, instead of the multipart
upload API.
type: boolean
Workers:
description: Specify number of worker threads to use to output
to S3
format: int32
type: integer
tls:
description: Fluent Bit provides integrated support for Transport
Layer Security (TLS) and it predecessor Secure Sockets Layer
Expand Down Expand Up @@ -36558,6 +36563,11 @@ spec:
description: Use the S3 PutObject API, instead of the multipart
upload API.
type: boolean
Workers:
description: Specify number of worker threads to use to output
to S3
format: int32
type: integer
tls:
description: Fluent Bit provides integrated support for Transport
Layer Security (TLS) and it predecessor Secure Sockets Layer
Expand Down
Loading