master #9

Merged
stefan merged 96 commits from master into stable 2020-08-24 11:15:28 +00:00
1 changed files with 5 additions and 4 deletions
Showing only changes of commit 8b5d9ad785 - Show all commits

View File

@ -29,9 +29,9 @@ kibana:
fluentd:
enabled: false
#image:
# repository: quay.io/fluentd_elasticsearch/fluentd
# tag: v2.9.0
image:
repository: quay.io/fluentd_elasticsearch/fluentd
tag: v3.0.4
istio:
enabled: false
@ -141,6 +141,7 @@ fluentd:
reconnect_on_error true
reload_on_failure true
request_timeout 15s
suppress_type_name true
<buffer>
@type file
@ -196,7 +197,7 @@ fluentd:
fluent-bit:
enabled: true
enabled: false
test:
enabled: false