From 671acefc18bd04191433599dd293952e7cebe822 Mon Sep 17 00:00:00 2001 From: Chengwei Guo Date: Thu, 13 Nov 2025 23:05:00 -0800 Subject: [PATCH 1/4] fix the es httpUser & httpPassword Signed-off-by: Chengwei Guo --- .../templates/fluentbit-output-elasticsearch.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/fluent-operator/templates/fluentbit-output-elasticsearch.yaml b/charts/fluent-operator/templates/fluentbit-output-elasticsearch.yaml index 809d2e56b..e30bef3ec 100644 --- a/charts/fluent-operator/templates/fluentbit-output-elasticsearch.yaml +++ b/charts/fluent-operator/templates/fluentbit-output-elasticsearch.yaml @@ -24,10 +24,10 @@ spec: index: {{ . | quote }} {{- end }} {{- with .Values.fluentbit.output.es.httpUser }} - httpUser: {{ . | quote }} + httpUser: {{ toYaml . | nindent 6 }} {{- end }} {{- with .Values.fluentbit.output.es.httpPassword }} - httpPassword: {{ . | quote }} + httpPassword: {{ toYaml . | nindent 6 }} {{- end }} logstashFormat: {{ .Values.fluentbit.output.es.logstashFormat | default true }} {{- with .Values.fluentbit.output.es.logstashPrefix }} From 8e3699c3f41242d79601981fe18fb2209042b05d Mon Sep 17 00:00:00 2001 From: Chengwei Guo Date: Fri, 14 Nov 2025 09:32:45 -0800 Subject: [PATCH 2/4] add example httpUser and httpPassword Signed-off-by: Chengwei Guo --- charts/fluent-operator/values.yaml | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml index 595349b5b..99734ea49 100644 --- a/charts/fluent-operator/values.yaml +++ b/charts/fluent-operator/values.yaml @@ -305,13 +305,21 @@ fluentbit: logstashPrefix: ks-logstash-log bufferSize: 20MB traceError: true - # logstashPrefixKey: ks-logstash-log - # suppressTypeName: "On" - # path: "" - # bufferSize: "4KB" - # index: "fluent-bit" - # httpUser: - # httpPassword: + # logstashPrefixKey: ks-logstash-log + # suppressTypeName: "On" + # path: "" + # bufferSize: "4KB" + # index: "fluent-bit" + # httpUser: + # valueFrom: + # secretKeyRef: + # key: value + # name: husersecret + # httpPassword: + # valueFrom: + # secretKeyRef: + # key: value + # name: hpasssecret # logstashFormat: true # replaceDots: false # writeOperation: upsert @@ -351,11 +359,11 @@ fluentbit: # See https://docs.fluentbit.io/manual/pipeline/outputs/loki loki: # Switch for generation of fluentbit loki ClusterOutput (and loki basic auth http user and pass secrets if required) - enable: false # Bool + enable: false # Bool retryLimit: "no_limits" logLevel: "info" - host: 127.0.0.1 # String - port: 3100 # Int + host: 127.0.0.1 # String + port: 3100 # Int # Either, give http{User,Password},tenantID string values specifying them directly httpUser: myuser httpPassword: mypass From 259eb4a88acdd6e9723017224e55c5c3b8eaf5a8 Mon Sep 17 00:00:00 2001 From: Chengwei Guo Date: Fri, 14 Nov 2025 19:10:27 -0800 Subject: [PATCH 3/4] adjust format Signed-off-by: Chengwei Guo --- .../templates/fluentbit-output-elasticsearch.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/charts/fluent-operator/templates/fluentbit-output-elasticsearch.yaml b/charts/fluent-operator/templates/fluentbit-output-elasticsearch.yaml index e30bef3ec..571d0f3e2 100644 --- a/charts/fluent-operator/templates/fluentbit-output-elasticsearch.yaml +++ b/charts/fluent-operator/templates/fluentbit-output-elasticsearch.yaml @@ -24,10 +24,12 @@ spec: index: {{ . | quote }} {{- end }} {{- with .Values.fluentbit.output.es.httpUser }} - httpUser: {{ toYaml . | nindent 6 }} + httpUser: + {{- toYaml . | nindent 6 }} {{- end }} {{- with .Values.fluentbit.output.es.httpPassword }} - httpPassword: {{ toYaml . | nindent 6 }} + httpPassword: + {{- toYaml . | nindent 6 }} {{- end }} logstashFormat: {{ .Values.fluentbit.output.es.logstashFormat | default true }} {{- with .Values.fluentbit.output.es.logstashPrefix }} From a4b632372b9a70a1591911b2600a0ee1ac2954df Mon Sep 17 00:00:00 2001 From: Chengwei Guo Date: Mon, 17 Nov 2025 18:57:21 -0800 Subject: [PATCH 4/4] fix indentation Signed-off-by: Chengwei Guo --- charts/fluent-operator/values.yaml | 35 +++++++++++++++--------------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml index 99734ea49..891b15ad8 100644 --- a/charts/fluent-operator/values.yaml +++ b/charts/fluent-operator/values.yaml @@ -305,11 +305,10 @@ fluentbit: logstashPrefix: ks-logstash-log bufferSize: 20MB traceError: true - # logstashPrefixKey: ks-logstash-log - # suppressTypeName: "On" - # path: "" - # bufferSize: "4KB" - # index: "fluent-bit" + # logstashPrefixKey: ks-logstash-log + # suppressTypeName: "On" + # path: "" + # index: "fluent-bit" # httpUser: # valueFrom: # secretKeyRef: @@ -320,19 +319,19 @@ fluentbit: # secretKeyRef: # key: value # name: hpasssecret - # logstashFormat: true - # replaceDots: false - # writeOperation: upsert - # tls: - # enable: false - # verify: On - # debug: 1 - # caFile: "" - # caPath: "" - # crtFile: "" - # keyFile: "" - # keyPassword: - # vhost: "" + # logstashFormat: true + # replaceDots: false + # writeOperation: upsert + # tls: + # enable: false + # verify: On + # debug: 1 + # caFile: "" + # caPath: "" + # crtFile: "" + # keyFile: "" + # keyPassword: + # vhost: "" kafka: enable: false logLevel: info