Skip to content

Commit 5d54779

Browse files
committed
Tailer ChunkSize parameter support
1 parent d23ad2d commit 5d54779

File tree

6 files changed

+15
-5
lines changed

6 files changed

+15
-5
lines changed

charts/logging-operator/crds/logging-extensions.banzaicloud.io_hosttailers.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ spec:
3333
fileTailers:
3434
items:
3535
properties:
36+
buffer_chunk_size:
37+
type: string
3638
buffer_max_size:
3739
type: string
3840
containerOverrides:

config/crd/bases/logging-extensions.banzaicloud.io_hosttailers.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ spec:
3333
fileTailers:
3434
items:
3535
properties:
36+
buffer_chunk_size:
37+
type: string
3638
buffer_max_size:
3739
type: string
3840
containerOverrides:

pkg/sdk/extensions/api/v1alpha1/filetailer.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ func (f FileTailer) defaults() FileTailer {
2727
if result.BufferMaxSize == "" {
2828
result.BufferMaxSize = "32k"
2929
}
30+
if result.BufferChunkSize == "" {
31+
result.BufferChunkSize = result.BufferMaxSize
32+
}
33+
3034
if result.SkipLongLines == "" {
3135
result.SkipLongLines = "On"
3236
}

pkg/sdk/extensions/api/v1alpha1/hosttailer_types.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,10 @@ type FileTailer struct {
8080
Path string `json:"path,omitempty"`
8181
// Disable tailing the file
8282
Disabled bool `json:"disabled,omitempty"`
83-
// Set the limit of the buffer size per monitored file
83+
// Set the limit of the buffer size per active filetailer
8484
BufferMaxSize string `json:"buffer_max_size,omitempty"`
85+
// Set the buffer chunk size per active filetailer
86+
BufferChunkSize string `json:"buffer_chunk_size,omitempty"`
8587
// Skip long line when exceeding Buffer_Max_Size
8688
SkipLongLines string `json:"skip_long_lines,omitempty"`
8789
// Override container fields for the given tailer

pkg/sdk/extensions/extensionsconfig/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ var Global = GlobalConfig{
7272

7373
// HostTailer configuration
7474
var HostTailer = HostTailerConfig{
75-
FluentBitImage: "fluent/fluent-bit:1.6.1",
75+
FluentBitImage: "fluent/fluent-bit:1.8.15",
7676
TailerAffix: "host-tailer",
7777
}
7878

@@ -85,7 +85,7 @@ var EventTailer = EventTailerConfig{
8585

8686
// TailerWebhook configuration
8787
var TailerWebhook = TailerWebhookConfig{
88-
FluentBitImage: "fluent/fluent-bit:1.6.1",
88+
FluentBitImage: "fluent/fluent-bit:1.8.15",
8989
AnnotationKey: "sidecar.logging-extensions.banzaicloud.io/tail",
9090
ServerPath: "/tailer-webhook",
9191
ServerPort: 9443,

0 commit comments

Comments
 (0)