Skip to content

Bug 1873611: Fixed pretty print of fluentd.conf in cm/fluentd #662

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

Merged
merged 1 commit into from
Aug 28, 2020
Merged

Bug 1873611: Fixed pretty print of fluentd.conf in cm/fluentd #662

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 24 additions & 24 deletions pkg/generators/forwarding/fluentd/templates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,16 +575,16 @@ tls_cert_path {{ .SecretPath "ca-bundle.crt"}}
@type file
path '{{.BufferPath}}'
queued_chunks_limit_size "#{ENV['BUFFER_QUEUE_LIMIT'] || '1024' }"
{{ if .TotalLimitSize }}
{{- if .TotalLimitSize }}
total_limit_size {{.TotalLimitSize}}
{{ else }}
{{- else }}
total_limit_size "#{ENV['TOTAL_LIMIT_SIZE'] || 8589934592 }" #8G
{{end}}
{{ if .ChunkLimitSize }}
{{- end }}
{{- if .ChunkLimitSize }}
chunk_limit_size {{.ChunkLimitSize}}
{{else}}
{{- else }}
chunk_limit_size "#{ENV['BUFFER_SIZE_LIMIT'] || '1m'}"
{{end}}
{{- end }}
flush_mode {{.FlushMode}}
flush_interval {{.FlushInterval}}
flush_at_shutdown true
Expand Down Expand Up @@ -653,16 +653,16 @@ const storeElasticsearchTemplate = `{{ define "storeElasticsearch" -}}
retry_max_interval {{.RetryMaxInterval}}
retry_forever true
queued_chunks_limit_size "#{ENV['BUFFER_QUEUE_LIMIT'] || '32' }"
{{ if .TotalLimitSize }}
{{- if .TotalLimitSize }}
total_limit_size {{.TotalLimitSize}}
{{ else }}
{{- else }}
total_limit_size "#{ENV['TOTAL_LIMIT_SIZE'] || 8589934592 }" #8G
{{end}}
{{ if .ChunkLimitSize }}
{{- end}}
{{- if .ChunkLimitSize }}
chunk_limit_size {{.ChunkLimitSize}}
{{else}}
{{- else }}
chunk_limit_size "#{ENV['BUFFER_SIZE_LIMIT'] || '8m'}"
{{end}}
{{- end }}
overflow_action {{.OverflowAction}}
</buffer>
</store>
Expand Down Expand Up @@ -736,16 +736,16 @@ const storeSyslogTemplate = `{{- define "storeSyslog" -}}
retry_max_interval {{.RetryMaxInterval}}
retry_forever true
queued_chunks_limit_size "#{ENV['BUFFER_QUEUE_LIMIT'] || '32' }"
{{ if .TotalLimitSize }}
{{- if .TotalLimitSize }}
total_limit_size {{.TotalLimitSize}}
{{ else }}
{{- else }}
total_limit_size "#{ENV['TOTAL_LIMIT_SIZE'] || 8589934592 }" #8G
{{end}}
{{ if .ChunkLimitSize }}
{{- end }}
{{- if .ChunkLimitSize }}
chunk_limit_size {{.ChunkLimitSize}}
{{else}}
{{- else }}
chunk_limit_size "#{ENV['BUFFER_SIZE_LIMIT'] || '8m'}"
{{end}}
{{- end }}
overflow_action {{.OverflowAction}}
</buffer>
</store>
Expand Down Expand Up @@ -778,16 +778,16 @@ ssl_client_cert_key "#{File.exist?('{{ $tlsKey }}') ? '{{ $tlsKey }}' : use_nil}
retry_max_interval {{.RetryMaxInterval}}
retry_forever true
queued_chunks_limit_size "#{ENV['BUFFER_QUEUE_LIMIT'] || '32' }"
{{ if .TotalLimitSize }}
{{- if .TotalLimitSize }}
total_limit_size {{.TotalLimitSize}}
{{ else }}
{{- else }}
total_limit_size "#{ENV['TOTAL_LIMIT_SIZE'] || 8589934592 }" #8G
{{end}}
{{ if .ChunkLimitSize }}
{{- end }}
{{- if .ChunkLimitSize }}
chunk_limit_size {{.ChunkLimitSize}}
{{else}}
{{- else }}
chunk_limit_size "#{ENV['BUFFER_SIZE_LIMIT'] || '8m'}"
{{end}}
{{- end }}
overflow_action {{.OverflowAction}}
</buffer>
{{- end}}
Expand Down