From 8a0bb4e865d035483e04ef0e0dc606f4783a2ace Mon Sep 17 00:00:00 2001 From: Chris Minton Date: Mon, 17 Feb 2020 18:25:28 +0000 Subject: [PATCH] [stable/fluent-bit] Add Logstash_Prefix_Key as an optional parameter (#20719) Signed-off-by: Chris Minton --- stable/fluent-bit/Chart.yaml | 2 +- stable/fluent-bit/README.md | 3 ++- stable/fluent-bit/templates/config.yaml | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/stable/fluent-bit/Chart.yaml b/stable/fluent-bit/Chart.yaml index 7b3416c516..9d2a69e35a 100755 --- a/stable/fluent-bit/Chart.yaml +++ b/stable/fluent-bit/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: fluent-bit -version: 2.8.9 +version: 2.8.10 appVersion: 1.3.7 description: Fast and Lightweight Log/Data Forwarder for Linux, BSD and OSX keywords: diff --git a/stable/fluent-bit/README.md b/stable/fluent-bit/README.md index d67ef3bf81..cb8b16d9b3 100644 --- a/stable/fluent-bit/README.md +++ b/stable/fluent-bit/README.md @@ -46,7 +46,8 @@ The following table lists the configurable parameters of the Fluent-Bit chart an | `backend.es.retry_limit` | Max number of retries to attempt (False == no limit) | `False` | | `backend.es.time_key` | Elastic Time Key | `@timestamp` | | `backend.es.logstash_format` | Enable Logstash format compatibility. | `On` | -| `backend.es.logstash_prefix` | Index Prefix. If Logstash_Prefix is equals to 'mydata' your index will become 'mydata-YYYY.MM.DD'. | `kubernetes_cluster` | +| `backend.es.logstash_prefix` | Index Prefix. If Logstash_Prefix is equal to 'mydata' your index will become 'mydata-YYYY.MM.DD'. | `kubernetes_cluster` | +| `backend.es.logstash_prefix_key` | Index Prefix key. When included, the value in the record that belongs to the key will be looked up and overwrite `Logstash_Prefix` for index generation. If `Logstash_Prefix_Key` = 'mydata' the index becomes 'mydata-YYYY.MM.DD'. | `` | | `backend.es.replace_dots` | Enable/Disable Replace_Dots option. | `On` | | `backend.es.http_user` | Optional username credential for Elastic X-Pack access. | `` | | `backend.es.http_passwd` | Password for user defined in HTTP_User. | `` | diff --git a/stable/fluent-bit/templates/config.yaml b/stable/fluent-bit/templates/config.yaml index 3c429fbb99..37bba568fd 100644 --- a/stable/fluent-bit/templates/config.yaml +++ b/stable/fluent-bit/templates/config.yaml @@ -138,6 +138,9 @@ data: {{- end }} {{- if .Values.backend.es.logstash_prefix }} Logstash_Prefix {{ .Values.backend.es.logstash_prefix }} +{{- if .Values.backend.es.logstash_prefix_key }} + Logstash_Prefix_Key {{ .Values.backend.es.logstash_prefix_key }} +{{- end }} {{ else if .Values.backend.es.index }} Index {{ .Values.backend.es.index }} {{- end }}