Add elasticsearch template parameters (#31)

To fix ILM policy creation logic. Signed-off-by: Moritz Reinhardt <[email protected]>
kokuwaio · Nov 25, 2020 · 8cbbe9b · 8cbbe9b
1 parent f7d848b
commit 8cbbe9b
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 1 deletion.
diff --git a/charts/fluentd-elasticsearch/Chart.yaml b/charts/fluentd-elasticsearch/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: fluentd-elasticsearch
-version: 11.0.2
+version: 11.1.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
@@ -84,6 +84,10 @@ 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.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
@@ -521,6 +521,10 @@ data:
  ilm_policy "#{ENV['ILM_POLICY']}"
  ilm_policies "#{ENV['ILM_POLICIES']}"
  ilm_policy_overwrite "#{ENV['ILM_POLICY_OVERWRITE']}"
+{{- end }}
+{{- if or .Values.elasticsearch.template.enabled .Values.elasticsearch.ilm.enabled }}
+ template_name "#{ENV['TEMPLATE_NAME']}"
+ template_file "#{ENV['TEMPLATE_FILE']}"
 {{- end }}
  log_es_400_reason "#{ENV['OUTPUT_LOG_400_REASON']}"
  reconnect_on_error "#{ENV['OUTPUT_RECONNECT_ON_ERROR']}"
@@ -549,6 +553,11 @@ data:
  </label>
 {{- end }}
 
+{{- if or .Values.elasticsearch.template.enabled .Values.elasticsearch.ilm.enabled }}
+ {{ .Values.elasticsearch.template.file }}: |-
+{{ .Values.elasticsearch.template.content | indent 4 }}
+{{- end }}
+
 {{- range $key, $value := .Values.extraConfigMaps }}
  {{ $key }}: |-
 {{ $value | indent 4 }}

diff --git a/charts/fluentd-elasticsearch/templates/daemonset.yaml b/charts/fluentd-elasticsearch/templates/daemonset.yaml
@@ -81,6 +81,12 @@ spec:
  value: {{ toJson .Values.elasticsearch.ilm.policies | quote }}
  - name: ILM_POLICY_OVERWRITE
  value: {{ .Values.elasticsearch.ilm.policy_overwrite | quote }}
+{{- end }}
+{{- if or .Values.elasticsearch.template.enabled .Values.elasticsearch.ilm.enabled }}
+ - name: TEMPLATE_NAME
+ value: {{ .Values.elasticsearch.template.name | quote }}
+ - name: TEMPLATE_FILE
+ value: "/etc/fluent/config.d/{{ .Values.elasticsearch.template.file }}"
 {{- end }}
  - name: OUTPUT_SCHEME
  {{- if .Values.awsSigningSidecar.enabled }}

diff --git a/charts/fluentd-elasticsearch/values.yaml b/charts/fluentd-elasticsearch/values.yaml
@@ -93,6 +93,22 @@ elasticsearch:
  # ilm_policy_id1: {}
  # ilm_policy_id2: {}
  policy_overwrite: false
+ template:
+ enabled: false
+ name: fluentd-template
+ file: fluentd-template.json
+ content: |-
+ {
+ "index_patterns": [
+ "logstash-*"
+ ],
+ "settings": {
+ "index": {
+ "number_of_replicas": "1"
+ }
+ }
+ }
+
  path: ""
  scheme: "http"
  sslVerify: true