From 5b5b8ca4bd4ebe3a8725830681e1c9d30f40c5ad Mon Sep 17 00:00:00 2001 From: Matt Renfrow Date: Mon, 19 Nov 2018 11:16:32 -0600 Subject: [PATCH] [stable/fluentd-elasticsearch] Adding support for the logstash_prefix option (#8759) Signed-off-by: Matt Renfrow --- stable/fluentd-elasticsearch/Chart.yaml | 2 +- stable/fluentd-elasticsearch/README.md | 1 + stable/fluentd-elasticsearch/templates/daemonset.yaml | 2 ++ stable/fluentd-elasticsearch/values.yaml | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/stable/fluentd-elasticsearch/Chart.yaml b/stable/fluentd-elasticsearch/Chart.yaml index 7c9fc20081..02b7ceff6b 100644 --- a/stable/fluentd-elasticsearch/Chart.yaml +++ b/stable/fluentd-elasticsearch/Chart.yaml @@ -1,5 +1,5 @@ name: fluentd-elasticsearch -version: 1.2.0 +version: 1.3.0 appVersion: 2.3.1 home: https://www.fluentd.org/ description: A Fluentd Helm chart for Kubernetes with Elasticsearch output diff --git a/stable/fluentd-elasticsearch/README.md b/stable/fluentd-elasticsearch/README.md index e1b6b55ede..304f6da64e 100644 --- a/stable/fluentd-elasticsearch/README.md +++ b/stable/fluentd-elasticsearch/README.md @@ -49,6 +49,7 @@ The following table lists the configurable parameters of the Fluentd elasticsear | `configMaps` | Fluentd configmaps | `default conf files` | | `elasticsearch.host` | Elstaicsearch Host | `elasticsearch-client` | | `elasticsearch.port` | Elasticsearch Port | `9200` | +| `elasticsearch.logstash_prefix` | Elasticsearch Logstash prefix | `logstash` | | `elasticsearch.buffer_chunk_limit` | Elasticsearch buffer chunk limit | `2M` | | `elasticsearch.buffer_queue_limit` | Elasticsearch buffer queue limit | `8` | | `extraVolumeMounts` | Mount an extra volume, required to mount ssl certificates when elasticsearch has tls enabled | | diff --git a/stable/fluentd-elasticsearch/templates/daemonset.yaml b/stable/fluentd-elasticsearch/templates/daemonset.yaml index 605bd7a86b..32b52c6758 100644 --- a/stable/fluentd-elasticsearch/templates/daemonset.yaml +++ b/stable/fluentd-elasticsearch/templates/daemonset.yaml @@ -47,6 +47,8 @@ spec: value: {{ .Values.elasticsearch.host | quote }} - name: OUTPUT_PORT value: {{ .Values.elasticsearch.port | quote }} + - name: LOGSTASH_PREFIX + value: {{ .Values.elasticsearch.logstash_prefix | quote }} - name: OUTPUT_BUFFER_CHUNK_LIMIT value: {{ .Values.elasticsearch.buffer_chunk_limit | quote }} - name: OUTPUT_BUFFER_QUEUE_LIMIT diff --git a/stable/fluentd-elasticsearch/values.yaml b/stable/fluentd-elasticsearch/values.yaml index 733d788583..2742c12fa4 100644 --- a/stable/fluentd-elasticsearch/values.yaml +++ b/stable/fluentd-elasticsearch/values.yaml @@ -22,6 +22,7 @@ elasticsearch: port: 9200 buffer_chunk_limit: 2M buffer_queue_limit: 8 + logstash_prefix: 'logstash' rbac: create: true @@ -439,6 +440,7 @@ configMaps: host "#{ENV['OUTPUT_HOST']}" port "#{ENV['OUTPUT_PORT']}" logstash_format true + logstash_prefix "#{ENV['LOGSTASH_PREFIX']}" @type file path /var/log/fluentd-buffers/kubernetes.system.buffer