Skip to content

Conversation

@cw-Guo
Copy link
Collaborator

@cw-Guo cw-Guo commented Nov 14, 2025

What this PR does / why we need it:

Fix the es template introduced in #1555

Which issue(s) this PR fixes:

Fixes #1674

Does this PR introduced a user-facing change?


Additional documentation, usage docs, etc.:


Copy link
Collaborator

@marcofranssen marcofranssen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems wrong. Isn't the httpUser and httpPassword just a string?

Maybe we should also update the values.yaml file to better document that part.

@cw-Guo
Copy link
Collaborator Author

cw-Guo commented Nov 14, 2025

@marcofranssen
Copy link
Collaborator

they are not string. See

https://github.com/fluent/fluent-operator/blob/master/apis/fluentbit/v1alpha2/plugins/output/elasticsearch_types.go#L58

Can we update, values.yaml to reflect this structure?

{{- end }}
{{- with .Values.fluentbit.output.es.httpUser }}
httpUser: {{ . | quote }}
httpUser: {{ toYaml . | nindent 6 }}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
httpUser: {{ toYaml . | nindent 6 }}
httpUser:
{{- toYaml . | nindent 6 }}

{{- end }}
{{- with .Values.fluentbit.output.es.httpPassword }}
httpPassword: {{ . | quote }}
httpPassword: {{ toYaml . | nindent 6 }}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
httpPassword: {{ toYaml . | nindent 6 }}
httpPassword:
{{- toYaml . | nindent 6 }}

Copy link
Collaborator

@marcofranssen marcofranssen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small suggestion to make it more clear this is an object value by using the same style as elsewhere in the chart.

# index: "fluent-bit"
# httpUser:
# httpPassword:
# logstashPrefixKey: ks-logstash-log
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# logstashPrefixKey: ks-logstash-log

Already shows as uncommented at line 305

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

they are two different parameters.

Signed-off-by: Chengwei Guo <cwguoz@gmail.com>
Signed-off-by: Chengwei Guo <cwguoz@gmail.com>
Signed-off-by: Chengwei Guo <cwguoz@gmail.com>
Signed-off-by: Chengwei Guo <cwguoz@gmail.com>
Copy link
Collaborator

@marcofranssen marcofranssen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🚀

@marcofranssen marcofranssen merged commit e94ce95 into fluent:master Nov 18, 2025
5 of 7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

bug: ClusterOutput.fluentbit.fluent.io "es" is invalid while upgrading from 3.3.0 to 3.4.x

2 participants