Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature: support logstashPrefix to ClusterOutput #268

Merged
merged 6 commits into from
Apr 25, 2022
Merged

feature: support logstashPrefix to ClusterOutput #268

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4c9b5e6
feature: support `logstashPrefix` to ClusterOutput
mangoGoForward Apr 24, 2022
57bda90
feature: support `logstashPrefix` to ClusterOutput
mangoGoForward Apr 24, 2022
b23ca07
add a judgment for the field of path.
mangoGoForward Apr 24, 2022
9ec3c26
Comment those new added fields.
mangoGoForward Apr 25, 2022
a639b3a
set Kubernetes to false by default.
mangoGoForward Apr 25, 2022
02432b1
Remove comment of `logstashPrefix`
mangoGoForward Apr 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions charts/fluent-operator/templates/fluentbit-output-elasticsearch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,25 @@ spec:
es:
host: {{ .Values.fluentbit.output.es.host }}
port: {{ .Values.fluentbit.output.es.port }}
path: {{ .Values.fluentbit.output.es.path }}
mangoGoForward marked this conversation as resolved.
Show resolved Hide resolved
bufferSize: {{ .Values.fluentbit.output.es.bufferSize }}
index: {{ .Values.fluentbit.output.es.index }}
{{- if .Values.fluentbit.output.es.httpUser }}
httpUser:
{{ toYaml .Values.fluentbit.output.es.httpUser | indent 6 }}
{{- end }}
{{- if .Values.fluentbit.output.es.httpPassword }}
httpPassword:
{{ toYaml .Values.fluentbit.output.es.httpPassword | indent 6 }}
{{- end }}
logstashFormat: {{ .Values.fluentbit.output.es.logstashFormat }}
logstashPrefix: {{ .Values.fluentbit.output.es.logstashPrefix }}
replaceDots: {{ .Values.fluentbit.output.es.replaceDots }}
generateID: true
logstashPrefix: ks-logstash-log
logstashFormat: true
timeKey: "@timestamp"
{{- if .Values.fluentbit.output.es.enableTLS }}
tls:
{{ toYaml .Values.fluentbit.output.es.tls | indent 6 }}
{{- end }}
{{- end }}
{{- end }}
17 changes: 17 additions & 0 deletions charts/fluent-operator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,24 @@ fluentbit:
enable: false
host: "<Elasticsearch url like elasticsearch-logging-data.kubesphere-logging-system.svc>"
port: 9200
path: ""
Copy link
Member

@benjaminhuo benjaminhuo Apr 25, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

We'd better comment the new added content because they're not required by default. User can remove the comments when they need this

  output:
    es:
      enable: false
      host: "<Elasticsearch url like elasticsearch-logging-data.kubesphere-logging-system.svc>"
      port: 9200
      logstashPrefix: ks-logstash-log
#      path: ""
#      bufferSize: "4KB"
#      index: "fluent-bit"
#      httpUser:
#      httpPassword:
#      logstashFormat: true
#      replaceDots: false
#      enableTLS: false
#      tls:
#        verify: On
#        debug: 1
#        caFile: "<Absolute path to CA certificate file>"
#        caPath: "<Absolute path to scan for certificate files>"
#        crtFile: "<Absolute path to private Key file>"
#        keyFile: "<Absolute path to private Key file>"
#        keyPassword:
#        vhost: "<Hostname to be used for TLS SNI extension>"

Copy link
Member Author

Choose a reason for hiding this comment

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

Done.

bufferSize: "4KB"
index: "fluent-bit"
httpUser:
httpPassword:
logstashFormat: true
logstashPrefix: ks-logstash-log
Copy link
Member

Choose a reason for hiding this comment

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

logstashPrefix: ks-logstash-log shouldn't be commented

Copy link
Member Author

Choose a reason for hiding this comment

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

logstashPrefix set to ks-logstash-log by default in template file, so I think logstashPrefix also should be commented.

replaceDots: false
enableTLS: false
tls:
verify: On
debug: 1
caFile: "<Absolute path to CA certificate file>"
caPath: "<Absolute path to scan for certificate files>"
crtFile: "<Absolute path to private Key file>"
keyFile: "<Absolute path to private Key file>"
keyPassword:
vhost: "<Hostname to be used for TLS SNI extension>"
kafka:
enable: false
brokers: "<kafka broker list like xxx.xxx.xxx.xxx:9092,yyy.yyy.yyy.yyy:9092>"
Expand Down