openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Fluentbit: Update version, config util template"

Browse Source
This commit is contained in:
Zuul 2018-09-19 15:33:47 +00:00 committed by Gerrit Code Review
commit 5500c75e13
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fluent-logging/templates/utils/_to_fluentbit_conf.tpl
View File

@ -31,8 +31,14 @@ limitations under the License.
{{- $config := omit . "header" }} {{- $config := omit . "header" }}
[{{$header.header | upper }}] [{{$header.header | upper }}]
{{range $key, $value := $config -}} {{range $key, $value := $config -}}
{{ if eq $key "Rename" }}
{{- range $original, $new := $value -}}
{{ printf "Rename %s %s" $original $new | indent 4 }}
{{end}}
{{- else -}}
{{ $key | indent 4 }} {{ $value }} {{ $key | indent 4 }} {{ $value }}
{{end -}} {{end -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
{{- end -}}

2
fluent-logging/values.yaml
View File

@ -36,7 +36,7 @@ labels:
images: images:
tags: tags:
fluentbit: docker.io/fluent/fluent-bit:0.12.14 fluentbit: docker.io/fluent/fluent-bit:0.14.2
fluentd: docker.io/fluent/fluentd-kubernetes-daemonset:v1.2-debian-elasticsearch fluentd: docker.io/fluent/fluentd-kubernetes-daemonset:v1.2-debian-elasticsearch
prometheus_fluentd_exporter: docker.io/srwilkers/fluentd_exporter:v0.1 prometheus_fluentd_exporter: docker.io/srwilkers/fluentd_exporter:v0.1
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1