feature: support logstashPrefix to ClusterOutput
#268
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: mango <xu.weiKyrie@foxmail.com>
Signed-off-by: mango <xu.weiKyrie@foxmail.com>
|
/assign @wenchajun Please have a review if you have free time, thanks. |
wenchajun
reviewed
Apr 24, 2022
Signed-off-by: mango <xu.weiKyrie@foxmail.com>
wenchajun
approved these changes
Apr 24, 2022
benjaminhuo
reviewed
Apr 25, 2022
charts/fluent-operator/values.yaml
Outdated
| @@ -63,7 +63,24 @@ fluentbit: | |||
| enable: false | |||
| host: "<Elasticsearch url like elasticsearch-logging-data.kubesphere-logging-system.svc>" | |||
| port: 9200 | |||
| path: "" | |||
There was a problem hiding this comment.
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>"Signed-off-by: mango <xu.weiKyrie@foxmail.com>
Signed-off-by: mango <xu.weiKyrie@foxmail.com>
benjaminhuo
requested changes
Apr 25, 2022
| @@ -63,7 +63,24 @@ fluentbit: | |||
| enable: false | |||
| host: "<Elasticsearch url like elasticsearch-logging-data.kubesphere-logging-system.svc>" | |||
| port: 9200 | |||
| logstashPrefix: ks-logstash-log | |||
There was a problem hiding this comment.
logstashPrefix: ks-logstash-log shouldn't be commented
There was a problem hiding this comment.
logstashPrefix set to ks-logstash-log by default in template file, so I think logstashPrefix also should be commented.
charts/fluent-operator/values.yaml
Outdated
| # httpUser: | ||
| # httpPassword: | ||
| # logstashFormat: true | ||
| # logstashPrefix: ks-logstash-log |
There was a problem hiding this comment.
# logstashPrefix: ks-logstash-log can be removed here
Signed-off-by: mango <xu.weiKyrie@foxmail.com>
benjaminhuo
approved these changes
Apr 25, 2022
wenchajun
pushed a commit
to wenchajun/fluentbit-operator
that referenced
this pull request
May 7, 2022
* feature: support `logstashPrefix` to ClusterOutput Signed-off-by: mango <xu.weiKyrie@foxmail.com>
wenchajun
pushed a commit
to wenchajun/fluentbit-operator
that referenced
this pull request
May 10, 2022
* feature: support `logstashPrefix` to ClusterOutput Signed-off-by: mango <xu.weiKyrie@foxmail.com> (cherry picked from commit 9ece3a7) Signed-off-by: chengdehao <dehaocheng@kubesphere.io>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: mango xu.weiKyrie@foxmail.com
What this PR does / why we need it:
Support
logstashPrefix,httpUserand so on to ClusterOutput.Which issue(s) this PR fixes:
Fixes #265
Does this PR introduced a user-facing change?
Additional documentation, usage docs, etc.: