Merge "Fluent-Logging: update functions to live in correct locations"

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 }}

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 -}}

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 -}}