From 3470b17fc868152cf5deb3d9c029bbf4696707b5 Mon Sep 17 00:00:00 2001 From: Pete Birley <pete@port.direct> Date: Mon, 11 Jun 2018 22:10:40 -0500 Subject: [PATCH] Fluent-Logging: update functions to live in correct locations This PS simply moves functions within the chart to their correct location. Change-Id: Ia5ac02a25a76ff759160cc352404b71b4208b216 Signed-off-by: Pete Birley <pete@port.direct> --- fluent-logging/templates/configmap-etc.yaml | 6 +-- .../templates/utils/_to_fluentbit_conf.tpl | 38 +++++++++++++++++++ .../_to_fluentd_conf.tpl} | 26 +------------ 3 files changed, 42 insertions(+), 28 deletions(-) create mode 100644 fluent-logging/templates/utils/_to_fluentbit_conf.tpl rename fluent-logging/templates/{_helpers.tpl => utils/_to_fluentd_conf.tpl} (77%) diff --git a/fluent-logging/templates/configmap-etc.yaml b/fluent-logging/templates/configmap-etc.yaml index 430de5f31..db109b884 100644 --- a/fluent-logging/templates/configmap-etc.yaml +++ b/fluent-logging/templates/configmap-etc.yaml @@ -23,11 +23,11 @@ metadata: name: fluent-logging-etc data: fluent-bit.conf: | -{{ include "fluent_logging.to_fluentbit_conf" .Values.conf.fluentbit | indent 4 }} +{{ include "fluent_logging.utils.to_fluentbit_conf" .Values.conf.fluentbit | indent 4 }} parsers.conf: | -{{ include "fluent_logging.to_fluentbit_conf" .Values.conf.parsers | indent 4 }} +{{ include "fluent_logging.utils.to_fluentbit_conf" .Values.conf.parsers | indent 4 }} td-agent.conf: | -{{ include "fluent_logging.to_fluentd_conf" .Values.conf.td_agent | indent 4 }} +{{ include "fluent_logging.utils.to_fluentd_conf" .Values.conf.td_agent | indent 4 }} {{ range $template, $fields := .Values.conf.templates }} {{ $template }}.json: | {{ toJson $fields | indent 4 }} diff --git a/fluent-logging/templates/utils/_to_fluentbit_conf.tpl b/fluent-logging/templates/utils/_to_fluentbit_conf.tpl new file mode 100644 index 000000000..6b0594242 --- /dev/null +++ b/fluent-logging/templates/utils/_to_fluentbit_conf.tpl @@ -0,0 +1,38 @@ +{{/* +Copyright 2017 The Openstack-Helm Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/}} + +# This function generates fluentbit configuration files with entries in the +# fluent-logging values.yaml. It results in a configuration section with the +# following format (for as many key/value pairs defined in values for a section): +# [HEADER] +# key value +# key value +# key value +# The configuration schema can be found here: +# http://fluentbit.io/documentation/0.12/configuration/schema.html + +{{- define "fluent_logging.utils.to_fluentbit_conf" -}} +{{- range $values := . -}} +{{- range $section := . -}} +{{- $header := pick . "header" -}} +{{- $config := omit . "header" }} +[{{$header.header | upper }}] +{{range $key, $value := $config -}} +{{ $key | indent 4 }} {{ $value }} +{{end -}} +{{- end -}} +{{- end -}} +{{- end -}} diff --git a/fluent-logging/templates/_helpers.tpl b/fluent-logging/templates/utils/_to_fluentd_conf.tpl similarity index 77% rename from fluent-logging/templates/_helpers.tpl rename to fluent-logging/templates/utils/_to_fluentd_conf.tpl index 6cbf26ca9..3944cb8fb 100644 --- a/fluent-logging/templates/_helpers.tpl +++ b/fluent-logging/templates/utils/_to_fluentd_conf.tpl @@ -33,7 +33,7 @@ section): # The configuration schema can be found here: # https://docs.fluentd.org/v0.12/articles/config-file -{{- define "fluent_logging.to_fluentd_conf" -}} +{{- define "fluent_logging.utils.to_fluentd_conf" -}} {{- range $values := . -}} {{- range $section := . -}} {{- $header := pick . "header" -}} @@ -84,27 +84,3 @@ section): {{- end }} {{ end -}} {{- end -}} - - -# This function generates fluentbit configuration files with entries in the -# fluent-logging values.yaml. It results in a configuration section with the -# following format (for as many key/value pairs defined in values for a section): -# [HEADER] -# key value -# key value -# key value -# The configuration schema can be found here: -# http://fluentbit.io/documentation/0.12/configuration/schema.html - -{{- define "fluent_logging.to_fluentbit_conf" -}} -{{- range $values := . -}} -{{- range $section := . -}} -{{- $header := pick . "header" -}} -{{- $config := omit . "header" }} -[{{$header.header | upper }}] -{{range $key, $value := $config -}} -{{ $key | indent 4 }} {{ $value }} -{{end -}} -{{- end -}} -{{- end -}} -{{- end -}}