Merge pull request #770 from ksdpmx/loglevel

feat: add global log_level support for fluentd
fluent · Jun 2, 2023 · 6080b20 · 6080b20
2 parents 16c04ae + 6058ba3
commit 6080b20
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 2 deletions.
diff --git a/apis/fluentd/v1alpha1/fluentd_types.go b/apis/fluentd/v1alpha1/fluentd_types.go
@@ -42,6 +42,11 @@ type FluentdSpec struct {
 	Replicas *int32 `json:"replicas,omitempty"`
 	// Numbers of the workers in Fluentd instance
 	Workers *int32 `json:"workers,omitempty"`
+	// Global logging verbosity
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:validation:Enum:=fatal;error;warn;info;debug;trace
+	// +kubebuilder:default:=info
+	LogLevel string `json:"logLevel,omitempty"`
 	// Fluentd image.
 	Image string `json:"image,omitempty"`
 	// Fluentd Watcher command line arguments.

diff --git a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
@@ -2140,6 +2140,17 @@ spec:
                   type: object
                   x-kubernetes-map-type: atomic
                 type: array
+              logLevel:
+                default: info
+                description: Global logging verbosity
+                enum:
+                - fatal
+                - error
+                - warn
+                - info
+                - debug
+                - trace
+                type: string
               nodeSelector:
                 additionalProperties:
                   type: string

diff --git a/charts/fluent-operator/templates/fluentd-fluentd.yaml b/charts/fluent-operator/templates/fluentd-fluentd.yaml
@@ -18,5 +18,8 @@ spec:
   fluentdCfgSelector:
     matchLabels:
       config.fluentd.fluent.io/enabled: "true"
+  {{- if .Values.fluentd.logLevel }}
+  logLevel: {{ .Values.fluentd.logLevel }}
+  {{- end }}
 {{- end }}
 {{- end }}
diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml
@@ -240,6 +240,7 @@ fluentd:
     requests:
       cpu: 100m
       memory: 128Mi
+  logLevel: ""
   # Configure the output plugin parameter in Fluentd.
   # Fluentd is disabled by default, if you enable it make sure to also set up an output to use.
   output:

diff --git a/config/crd/bases/fluentd.fluent.io_fluentds.yaml b/config/crd/bases/fluentd.fluent.io_fluentds.yaml
@@ -2140,6 +2140,17 @@ spec:
                   type: object
                   x-kubernetes-map-type: atomic
                 type: array
+              logLevel:
+                default: info
+                description: Global logging verbosity
+                enum:
+                - fatal
+                - error
+                - warn
+                - info
+                - debug
+                - trace
+                type: string
               nodeSelector:
                 additionalProperties:
                   type: string

diff --git a/controllers/fluentdconfig_controller.go b/controllers/fluentdconfig_controller.go
@@ -55,7 +55,7 @@ const (
 	SYSTEM = `# Enable RPC endpoint
 <system>
 	rpc_endpoint 127.0.0.1:24444
-	log_level info
+	log_level %s
 	workers %d
 </system>
 `
@@ -186,7 +186,7 @@ func (r *FluentdConfigReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 				return ctrl.Result{}, err
 			}
 
-			systemCfg = fmt.Sprintf(SYSTEM, workers)
+			systemCfg = fmt.Sprintf(SYSTEM, fd.Spec.LogLevel, workers)
 		}
 
 		secName := fmt.Sprintf("%s-config", fd.Name)

diff --git a/docs/fluentd.md b/docs/fluentd.md
@@ -289,6 +289,7 @@ FluentdSpec defines the desired state of Fluentd
 | disableService | By default will build the related service according to the globalinputs definition. | bool |
 | replicas | Numbers of the Fluentd instance | *int32 |
 | workers | Numbers of the workers in Fluentd instance | *int32 |
+| logLevel | Global logging verbosity | string |
 | image | Fluentd image. | string |
 | args | Fluentd Watcher command line arguments. | []string |
 | envVars | EnvVars represent environment variables that can be passed to fluentd pods. | []corev1.EnvVar |

diff --git a/manifests/setup/fluent-operator-crd.yaml b/manifests/setup/fluent-operator-crd.yaml
@@ -19801,6 +19801,17 @@ spec:
                   type: object
                   x-kubernetes-map-type: atomic
                 type: array
+              logLevel:
+                default: info
+                description: Global logging verbosity
+                enum:
+                - fatal
+                - error
+                - warn
+                - info
+                - debug
+                - trace
+                type: string
               nodeSelector:
                 additionalProperties:
                   type: string

diff --git a/manifests/setup/setup.yaml b/manifests/setup/setup.yaml
@@ -19801,6 +19801,17 @@ spec:
                   type: object
                   x-kubernetes-map-type: atomic
                 type: array
+              logLevel:
+                default: info
+                description: Global logging verbosity
+                enum:
+                - fatal
+                - error
+                - warn
+                - info
+                - debug
+                - trace
+                type: string
               nodeSelector:
                 additionalProperties:
                   type: string