Merge pull request #1957 from kube-logging/aslafy-z-patch-2

Author: csatib02

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

@@ -368,6 +368,8 @@ spec:
                       type: boolean
                     skip_long_lines:
                       type: string
+                    verbose:
+                      type: boolean
                   required:
                   - name
                   type: object
@@ -723,6 +725,8 @@ spec:
                       type: string
                     systemdFilter:
                       type: string
+                    verbose:
+                      type: boolean
                   required:
                   - name
                   type: object

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

@@ -365,6 +365,8 @@ spec:
                       type: boolean
                     skip_long_lines:
                       type: string
+                    verbose:
+                      type: boolean
                   required:
                   - name
                   type: object
@@ -720,6 +722,8 @@ spec:
                       type: string
                     systemdFilter:
                       type: string
+                    verbose:
+                      type: boolean
                   required:
                   - name
                   type: object

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

@@ -365,6 +365,8 @@ spec:
                       type: boolean
                     skip_long_lines:
                       type: string
+                    verbose:
+                      type: boolean
                   required:
                   - name
                   type: object
@@ -720,6 +722,8 @@ spec:
                       type: string
                     systemdFilter:
                       type: string
+                    verbose:
+                      type: boolean
                   required:
                   - name
                   type: object

docs/configuration/crds/extensions/v1alpha1/hosttailer_types.md

@@ -122,6 +122,11 @@ Start reading from the head of new log files
 Skip long line when exceeding Buffer_Max_Size 
 
 
+### verbose (bool, optional) {#filetailer-verbose}
+
+Verbose mode 
+
+
 
 ## SystemdTailer
 
@@ -162,4 +167,9 @@ Override systemd log path
 Filter to select systemd unit example: kubelet.service 
 
 
+### verbose (bool, optional) {#systemdtailer-verbose}
+
+Verbose mode 
+
+
 

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

@@ -53,6 +53,9 @@ func (f FileTailer) Command(Name string) []string {
 		"-p", "format=template",
 		"-p", "template={log}",
 	}
+	if !f.Verbose {
+		command = append(command, "-qq")
+	}
 	command = append(command, config.HostTailer.VersionedFluentBitPathArgs("/dev/stdout")...)
 	return command
 }

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

@@ -93,6 +93,8 @@ type FileTailer struct {
 	ContainerBase *types.ContainerBase `json:"containerOverrides,omitempty"`
 	// Override image field for the given trailer
 	Image *tailer.ImageSpec `json:"image,omitempty"`
+	// Verbose mode
+	Verbose bool `json:"verbose,omitempty"`
 }
 
 // SystemdTailer configuration options
@@ -111,6 +113,8 @@ type SystemdTailer struct {
 	ContainerBase *types.ContainerBase `json:"containerOverrides,omitempty"`
 	// Override image field for the given trailer
 	Image *tailer.ImageSpec `json:"image,omitempty"`
+	// Verbose mode
+	Verbose bool `json:"verbose,omitempty"`
 }
 
 func init() {

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

@@ -54,6 +54,9 @@ func (s SystemdTailer) Command(Name string) []string {
 		"-o", "file",
 		"-p", "format=plain",
 	)
+	if !s.Verbose {
+		command = append(command, "-qq")
+	}
 	command = append(command, config.HostTailer.VersionedFluentBitPathArgs("/dev/stdout")...)
 	return command
 }