From 8e7b3d99bb82d0292b2fb6f8eb6cbc4537d871ae Mon Sep 17 00:00:00 2001
From: YYY <ldh@qq.com>
Date: Tue, 9 Apr 2024 17:56:37 +0800
Subject: [PATCH] helm template fluentbit output es support logstashPrefixKey

Signed-off-by: Onecer <yinyongyou@gmail.com>
---
 .../templates/fluentbit-output-elasticsearch.yaml          | 7 ++++++-
 charts/fluent-operator/values.yaml                         | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/charts/fluent-operator/templates/fluentbit-output-elasticsearch.yaml b/charts/fluent-operator/templates/fluentbit-output-elasticsearch.yaml
index a9167f368..340253d2c 100644
--- 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
index 832b16788..67e93f861 100644
--- 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"