From a8e94c2f4a7c1c8fd19f2fbe9b952320012ff3be Mon Sep 17 00:00:00 2001 From: Eliran Bivas Date: Tue, 27 Mar 2018 20:07:02 +0200 Subject: [PATCH] Support additional k8s filter params (#4406) * Support additional k8s filter params * trailing spaces * values typo * lower case values --- stable/fluent-bit/Chart.yaml | 2 +- stable/fluent-bit/templates/config.yaml | 7 +++++-- stable/fluent-bit/values.yaml | 5 ++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/stable/fluent-bit/Chart.yaml b/stable/fluent-bit/Chart.yaml index f243703727..ffa6418b68 100755 --- a/stable/fluent-bit/Chart.yaml +++ b/stable/fluent-bit/Chart.yaml @@ -1,5 +1,5 @@ name: fluent-bit -version: 0.2.12 +version: 0.2.13 appVersion: 0.12.15 description: Fast and Lightweight Log/Data Forwarder for Linux, BSD and OSX keywords: diff --git a/stable/fluent-bit/templates/config.yaml b/stable/fluent-bit/templates/config.yaml index a53baa748c..30befd0b87 100644 --- a/stable/fluent-bit/templates/config.yaml +++ b/stable/fluent-bit/templates/config.yaml @@ -23,8 +23,11 @@ data: Skip_Long_Lines On [FILTER] - Name kubernetes - Match kube.* + Name kubernetes + Match kube.* + Kube_URL {{ .Values.filter.kubeURL }} + Kube_CA_File {{ .Values.filter.kubeCAFile }} + Kube_Token_File {{ .Values.filter.kubeTokenFile }} {{- if .Values.filter.mergeJSONLog }} Merge_JSON_Log On {{- end }} diff --git a/stable/fluent-bit/values.yaml b/stable/fluent-bit/values.yaml index 0cc263a906..55db072f2c 100644 --- a/stable/fluent-bit/values.yaml +++ b/stable/fluent-bit/values.yaml @@ -67,7 +67,10 @@ tolerations: [] ## nodeSelector: {} -filter: {} +filter: + kubeURL: https://kubernetes.default.svc:443 + kubeCAFile: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt + kubeTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token # If true, check to see if the log field content is a JSON string map, if so, # it append the map fields as part of the log structure. # mergeJSONLog: true