diff --git a/production/helm/fluent-bit/Chart.yaml b/production/helm/fluent-bit/Chart.yaml index 4c513c51f17ae..0a3fcd8e57007 100644 --- a/production/helm/fluent-bit/Chart.yaml +++ b/production/helm/fluent-bit/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: "v1" name: fluent-bit -version: 0.3.1 +version: 0.3.2 appVersion: v1.6.0 kubeVersion: "^1.10.0-0" description: "Uses fluent-bit Loki go plugin for gathering logs and sending them to Loki" diff --git a/production/helm/fluent-bit/README.md b/production/helm/fluent-bit/README.md index 858205d948cc4..8af1a8fe2f409 100644 --- a/production/helm/fluent-bit/README.md +++ b/production/helm/fluent-bit/README.md @@ -83,6 +83,8 @@ For more details, read the [Fluent Bit documentation](../../../cmd/fluent-bit/RE | `config.loglevel` | the Fluent Bit log level (debug,info,warn,error). | `warn` | | `config.lineFormat` | The line format to use to send a record (json/key_value) | `json` | | `config.k8sLoggingParser`| Allow Kubernetes Pods to suggest a pre-defined Parser. See [Official Fluent Bit documentation](https://docs.fluentbit.io/manual/filter/kubernetes#kubernetes-annotations). | `Off` | +| `config.k8sLoggingExclude`| Allow Kubernetes Pods to exclude their logs from the log processor. See [Official Fluent Bit documentation](https://docs.fluentbit.io/manual/pipeline/filters/kubernetes) | `Off` +| `config.memBufLimit` | Override the default Mem_Buf_Limit [Official Fluent Bit documentation](https://docs.fluentbit.io/manual/administration/backpressure#mem_buf_limit) | `5MB` | `config.removeKeys` | The list of key to remove from each record | `[removeKeys,stream]` | | `config.labels` | A set of labels to send for every log | `'{job="fluent-bit"}'` | | `config.autoKubernetesLabels` | If set to true, it will add all Kubernetes labels to Loki labels | `false` | diff --git a/production/helm/fluent-bit/templates/configmap.yaml b/production/helm/fluent-bit/templates/configmap.yaml index 3022647906571..7a541fd9a1532 100644 --- a/production/helm/fluent-bit/templates/configmap.yaml +++ b/production/helm/fluent-bit/templates/configmap.yaml @@ -24,12 +24,13 @@ data: Path /var/log/containers/*.log Parser docker DB /run/fluent-bit/flb_kube.db - Mem_Buf_Limit 5MB + Mem_Buf_Limit {{ .Values.config.memBufLimit }} [FILTER] Name kubernetes Match kube.* Kube_URL https://kubernetes.default.svc:443 Merge_Log On + K8S-Logging.Exclude {{ .Values.config.k8sLoggingExclude }} K8S-Logging.Parser {{ .Values.config.k8sLoggingParser }} [Output] Name loki diff --git a/production/helm/fluent-bit/values.yaml b/production/helm/fluent-bit/values.yaml index dd099f8d863fd..4c7e8bc9fb3be 100644 --- a/production/helm/fluent-bit/values.yaml +++ b/production/helm/fluent-bit/values.yaml @@ -13,7 +13,9 @@ config: batchSize: 1048576 loglevel: warn lineFormat: json + k8sLoggingExclude: "Off" k8sLoggingParser: "Off" + memBufLimit: "5MB" removeKeys: - kubernetes - stream