From 9ab168bdc24a1d005b5b0fcb23361dbf5707da75 Mon Sep 17 00:00:00 2001 From: baczus Date: Mon, 14 Dec 2020 11:53:11 +0100 Subject: [PATCH] Add parameter to overwrite index template (#45) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add parameter to overwrite index template Signed-off-by: baczus * Bump fluentd-elasticsearch chart version to 11.4.0 Signed-off-by: baczus Co-authored-by: André Bauer --- charts/fluentd-elasticsearch/Chart.yaml | 2 +- charts/fluentd-elasticsearch/README.md | 9 +++++---- charts/fluentd-elasticsearch/templates/configmaps.yaml | 1 + charts/fluentd-elasticsearch/templates/daemonset.yaml | 2 ++ charts/fluentd-elasticsearch/values.yaml | 1 + 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/charts/fluentd-elasticsearch/Chart.yaml b/charts/fluentd-elasticsearch/Chart.yaml index c606df2b..9dfe26d5 100755 --- a/charts/fluentd-elasticsearch/Chart.yaml +++ b/charts/fluentd-elasticsearch/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: fluentd-elasticsearch -version: 11.3.0 +version: 11.4.0 appVersion: 3.1.0 type: application home: https://www.fluentd.org/ diff --git a/charts/fluentd-elasticsearch/README.md b/charts/fluentd-elasticsearch/README.md index 02467a58..0cf0d1f4 100755 --- a/charts/fluentd-elasticsearch/README.md +++ b/charts/fluentd-elasticsearch/README.md @@ -85,10 +85,11 @@ The following table lists the configurable parameters of the Fluentd elasticsear | `elasticsearch.ilm.policy` | Elasticsearch ILM policy to create | `{}` | | `elasticsearch.ilm.policies` | Elasticsearch ILM policies to create, map of policy IDs and policies | `{}` | | `elasticsearch.ilm.policy_overwrite` | Elastichsarch ILM policy overwrite | `false` | -| `elasticsearch.template.enabled` | Elastichsarch Index Template enabled | `false` | -| `elasticsearch.template.name` | Elastichsarch Index Template Name | `fluentd-template` | -| `elasticsearch.template.file` | Elasticsearch Index Template File Name (inside the daemonset) | `fluentd-template.json` | -| `elasticsearch.template.content` | Elasticsearch Index Template Content | _see `values.yaml`_ | +| `elasticsearch.template.enabled` | Elastichsarch Template enabled | `false` | +| `elasticsearch.template.name` | Elastichsarch Template Name | `fluentd-template` | +| `elasticsearch.template.file` | Elasticsearch Template File Name (inside the daemonset) | `fluentd-template.json` | +| `elasticsearch.template.content` | Elasticsearch Template Content | _see `values.yaml`_ | +| `elasticsearch.template.overwrite` | Elasticsearch Template Overwrite (update even if it already exists) | `false` | | `elasticsearch.indexName` | Elasticsearch Index Name | `fluentd` | | `elasticsearch.path` | Elasticsearch Path | `""` | | `elasticsearch.scheme` | Elasticsearch scheme setting | `http` | diff --git a/charts/fluentd-elasticsearch/templates/configmaps.yaml b/charts/fluentd-elasticsearch/templates/configmaps.yaml index 4a6e6609..9806d831 100644 --- a/charts/fluentd-elasticsearch/templates/configmaps.yaml +++ b/charts/fluentd-elasticsearch/templates/configmaps.yaml @@ -531,6 +531,7 @@ data: {{- if or .Values.elasticsearch.template.enabled .Values.elasticsearch.ilm.enabled }} template_name "#{ENV['TEMPLATE_NAME']}" template_file "#{ENV['TEMPLATE_FILE']}" + template_overwrite "#{ENV['TEMPLATE_OVERWRITE']}" {{- end }} log_es_400_reason "#{ENV['OUTPUT_LOG_400_REASON']}" reconnect_on_error "#{ENV['OUTPUT_RECONNECT_ON_ERROR']}" diff --git a/charts/fluentd-elasticsearch/templates/daemonset.yaml b/charts/fluentd-elasticsearch/templates/daemonset.yaml index 4abad28e..a263bcbd 100755 --- a/charts/fluentd-elasticsearch/templates/daemonset.yaml +++ b/charts/fluentd-elasticsearch/templates/daemonset.yaml @@ -87,6 +87,8 @@ spec: value: {{ .Values.elasticsearch.template.name | quote }} - name: TEMPLATE_FILE value: "/etc/fluent/config.d/{{ .Values.elasticsearch.template.file }}" + - name: TEMPLATE_OVERWRITE + value: {{ .Values.elasticsearch.template.overwrite | quote }} {{- end }} - name: OUTPUT_SCHEME {{- if .Values.awsSigningSidecar.enabled }} diff --git a/charts/fluentd-elasticsearch/values.yaml b/charts/fluentd-elasticsearch/values.yaml index 007ff234..61d79f95 100755 --- a/charts/fluentd-elasticsearch/values.yaml +++ b/charts/fluentd-elasticsearch/values.yaml @@ -97,6 +97,7 @@ elasticsearch: policy_overwrite: false template: enabled: false + overwrite: false name: fluentd-template file: fluentd-template.json content: |-