Merge pull request #1119 from onecer/output-es-support-logstashPrefixKey

helm template fluentbit output es support logstashPrefixKey
fluent · Apr 16, 2024 · cc35e2a · cc35e2a
2 parents c35993f + 8e7b3d9
commit cc35e2a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/charts/fluent-operator/templates/fluentbit-output-elasticsearch.yaml b/charts/fluent-operator/templates/fluentbit-output-elasticsearch.yaml
@@ -34,7 +34,12 @@ spec:
 {{ toYaml .Values.fluentbit.output.es.httpPassword | indent 6 }}
 {{- end }}
     logstashFormat: {{ .Values.fluentbit.output.es.logstashFormat | default true }}
-    logstashPrefix: {{ .Values.fluentbit.output.es.logstashPrefix | default "ks-logstash-log" | quote }}
+{{- if .Values.fluentbit.output.es.logstashPrefix }}
+    logstashPrefix: {{ .Values.fluentbit.output.es.logstashPrefix | quote }}
+{{- end }}
+{{- if .Values.fluentbit.output.es.logstashPrefixKey }}
+    logstashPrefixKey: {{ .Values.fluentbit.output.es.logstashPrefixKey | quote }}
+{{- end }}
     replaceDots: {{ .Values.fluentbit.output.es.replaceDots | default false }}
     writeOperation: {{ .Values.fluentbit.output.es.writeOperation | default "create" | quote }}
     traceError: {{ .Values.fluentbit.output.es.traceError | default false }}

diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml
@@ -220,6 +220,7 @@ fluentbit:
       logstashPrefix: ks-logstash-log
       bufferSize: 20MB
       traceError: true
+    #      logstashPrefixKey: ks-logstash-log
     #      suppressTypeName: "On"
     #      path: ""
     #      bufferSize: "4KB"