Merge argoless branch into master #30

Merged
stefan merged 47 commits from argoless into master 2021-01-12 15:03:36 +00:00
1 changed files with 1 additions and 2 deletions
Showing only changes of commit 99ceceda56 - Show all commits

View File

@ -76,7 +76,6 @@ fluentd:
enabled: true
additionalLabels:
release: metrics
# namespace: monitoring
output:
# Default should be "logging-kubezero-logging-es-http" if fullnameOverride is NOT used
@ -144,7 +143,7 @@ fluentd:
remove_keys id
# KubeZero pipeline incl. GeoIP etc.
# pipeline fluentd
pipeline fluentd
host "#{ENV['OUTPUT_HOST']}"
port "#{ENV['OUTPUT_PORT']}"