Tailer ChunkSize parameter support

kube-logging · Apr 8, 2022 · 5d54779 · 5d54779
1 parent d23ad2d
commit 5d54779
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 5 deletions.
diff --git a/charts/logging-operator/crds/logging-extensions.banzaicloud.io_hosttailers.yaml b/charts/logging-operator/crds/logging-extensions.banzaicloud.io_hosttailers.yaml
@@ -33,6 +33,8 @@ spec:
               fileTailers:
                 items:
                   properties:
+                    buffer_chunk_size:
+                      type: string
                     buffer_max_size:
                       type: string
                     containerOverrides:

diff --git a/config/crd/bases/logging-extensions.banzaicloud.io_hosttailers.yaml b/config/crd/bases/logging-extensions.banzaicloud.io_hosttailers.yaml
@@ -33,6 +33,8 @@ spec:
               fileTailers:
                 items:
                   properties:
+                    buffer_chunk_size:
+                      type: string
                     buffer_max_size:
                       type: string
                     containerOverrides:

diff --git a/pkg/sdk/extensions/api/v1alpha1/filetailer.go b/pkg/sdk/extensions/api/v1alpha1/filetailer.go
@@ -27,6 +27,10 @@ func (f FileTailer) defaults() FileTailer {
 	if result.BufferMaxSize == "" {
 		result.BufferMaxSize = "32k"
 	}
+	if result.BufferChunkSize == "" {
+		result.BufferChunkSize = result.BufferMaxSize
+	}
+
 	if result.SkipLongLines == "" {
 		result.SkipLongLines = "On"
 	}

diff --git a/pkg/sdk/extensions/api/v1alpha1/hosttailer_types.go b/pkg/sdk/extensions/api/v1alpha1/hosttailer_types.go
@@ -80,8 +80,10 @@ type FileTailer struct {
 	Path string `json:"path,omitempty"`
 	// Disable tailing the file
 	Disabled bool `json:"disabled,omitempty"`
-	// Set the limit of the buffer size per monitored file
+	// Set the limit of the buffer size per active filetailer
 	BufferMaxSize string `json:"buffer_max_size,omitempty"`
+	// Set the buffer chunk size per active filetailer
+	BufferChunkSize string `json:"buffer_chunk_size,omitempty"`
 	// Skip long line when exceeding Buffer_Max_Size
 	SkipLongLines string `json:"skip_long_lines,omitempty"`
 	// Override container fields for the given tailer

diff --git a/pkg/sdk/extensions/extensionsconfig/config.go b/pkg/sdk/extensions/extensionsconfig/config.go
@@ -72,7 +72,7 @@ var Global = GlobalConfig{
 
 // HostTailer configuration
 var HostTailer = HostTailerConfig{
-	FluentBitImage: "fluent/fluent-bit:1.6.1",
+	FluentBitImage: "fluent/fluent-bit:1.8.15",
 	TailerAffix:    "host-tailer",
 }
 
@@ -85,7 +85,7 @@ var EventTailer = EventTailerConfig{
 
 // TailerWebhook configuration
 var TailerWebhook = TailerWebhookConfig{
-	FluentBitImage:    "fluent/fluent-bit:1.6.1",
+	FluentBitImage:    "fluent/fluent-bit:1.8.15",
 	AnnotationKey:     "sidecar.logging-extensions.banzaicloud.io/tail",
 	ServerPath:        "/tailer-webhook",
 	ServerPort:        9443,