From aedd8c0fe676ce3d17d70930c46b162c5ca97d1a Mon Sep 17 00:00:00 2001 From: Fredrik Liv Date: Wed, 27 Oct 2021 10:59:36 +0200 Subject: [PATCH] Updated depricated fluentd buffer parameter (#94) Signed-off-by: Fredrik Liv --- charts/fluentd-elasticsearch/Chart.yaml | 2 +- charts/fluentd-elasticsearch/README.md | 8 +++++++- charts/fluentd-elasticsearch/templates/configmaps.yaml | 2 +- charts/fluentd-elasticsearch/templates/daemonset.yaml | 4 ++-- charts/fluentd-elasticsearch/values.yaml | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/charts/fluentd-elasticsearch/Chart.yaml b/charts/fluentd-elasticsearch/Chart.yaml index f6cb784..8969ca6 100755 --- a/charts/fluentd-elasticsearch/Chart.yaml +++ b/charts/fluentd-elasticsearch/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: fluentd-elasticsearch -version: 12.0.0 +version: 13.0.0 appVersion: 3.3.0 type: application home: https://www.fluentd.org/ diff --git a/charts/fluentd-elasticsearch/README.md b/charts/fluentd-elasticsearch/README.md index 6175cdd..d2ffaf2 100755 --- a/charts/fluentd-elasticsearch/README.md +++ b/charts/fluentd-elasticsearch/README.md @@ -112,7 +112,7 @@ The following table lists the configurable parameters of the Fluentd elasticsear | `elasticsearch.buffer.retryForever` | Elasticsearch Buffer retry forever | `true` | | `elasticsearch.buffer.retryMaxInterval` | Elasticsearch Buffer retry max interval | `30` | | `elasticsearch.buffer.chunkLimitSize` | Elasticsearch Buffer chunk limit size | `2M` | -| `elasticsearch.buffer.queueLimitLength` | Elasticsearch Buffer queue limit size | `8` | +| `elasticsearch.buffer.totalLimitSize` | Elasticsearch Buffer queue limit size | `512M` | | `elasticsearch.buffer.overflowAction` | Elasticsearch Buffer over flow action | `block` | | `env` | List of env vars that are added to the fluentd pods | `{}` | | `fluentdArgs` | Fluentd args | `--no-supervisor -q` | @@ -352,3 +352,9 @@ The chart requires now Helm >= 3.0.0 and Kubernetes >= 1.16.0 ### From a version < 11.0.0 to version => 12.0.0 If you were using `awsSigningSidecar` to set up an AWS signing sidecar proxy, this has now moved to the `extraContainers` property. The example in the `values.yaml` shows the equivalent AWS signing sidecar configuration expressed now as `extraContainers`. + +### From a version < 12.0.0 to version => 13.0.0 + +#### The following fields were changed in the elasticsearch block + +- `buffer.queueLimitLength` in favor of `buffer.totalLimitSize` since `queueLimitLength` [is deprecated](https://docs.fluentd.org/configuration/buffer-section#buffering-parameters). diff --git a/charts/fluentd-elasticsearch/templates/configmaps.yaml b/charts/fluentd-elasticsearch/templates/configmaps.yaml index bf0d66a..6b81be4 100644 --- a/charts/fluentd-elasticsearch/templates/configmaps.yaml +++ b/charts/fluentd-elasticsearch/templates/configmaps.yaml @@ -561,7 +561,7 @@ data: retry_forever "#{ENV['OUTPUT_BUFFER_RETRY_FOREVER']}" retry_max_interval "#{ENV['OUTPUT_BUFFER_RETRY_MAX_INTERVAL']}" chunk_limit_size "#{ENV['OUTPUT_BUFFER_CHUNK_LIMIT']}" - queue_limit_length "#{ENV['OUTPUT_BUFFER_QUEUE_LIMIT']}" + total_limit_size "#{ENV['OUTPUT_BUFFER_TOTAL_LIMIT_SIZE']}" overflow_action "#{ENV['OUTPUT_BUFFER_OVERFLOW_ACTION']}" {{- end }} diff --git a/charts/fluentd-elasticsearch/templates/daemonset.yaml b/charts/fluentd-elasticsearch/templates/daemonset.yaml index acf95c3..c41db60 100755 --- a/charts/fluentd-elasticsearch/templates/daemonset.yaml +++ b/charts/fluentd-elasticsearch/templates/daemonset.yaml @@ -108,8 +108,8 @@ spec: value: {{ .Values.elasticsearch.typeName | quote }} - name: OUTPUT_BUFFER_CHUNK_LIMIT value: {{ .Values.elasticsearch.buffer.chunkLimitSize | quote }} - - name: OUTPUT_BUFFER_QUEUE_LIMIT - value: {{ .Values.elasticsearch.buffer.queueLimitLength | quote }} + - name: OUTPUT_BUFFER_TOTAL_LIMIT_SIZE + value: {{ .Values.elasticsearch.buffer.totalLimitSize | quote }} {{- if .Values.elasticsearch.buffer.chunkKeys }} - name: OUTPUT_BUFFER_CHUNK_KEYS value: {{ .Values.elasticsearch.buffer.chunkKeys | quote }} diff --git a/charts/fluentd-elasticsearch/values.yaml b/charts/fluentd-elasticsearch/values.yaml index 94d064a..03b0250 100755 --- a/charts/fluentd-elasticsearch/values.yaml +++ b/charts/fluentd-elasticsearch/values.yaml @@ -126,7 +126,7 @@ elasticsearch: retryForever: true retryMaxInterval: 30 chunkLimitSize: "2M" - queueLimitLength: 8 + totalLimitSize: "512M" overflowAction: "block" # If you want to change args of fluentd process