morazow commented on code in PR #2711: URL: https://github.com/apache/fluss/pull/2711#discussion_r2924156324
########## helm/templates/_metrics.tpl: ########## @@ -0,0 +1,91 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. +# + +{{/* +Returns list of provided reporter names. +*/}} +{{- define "fluss.metrics.reporterNames" -}} +{{- $metrics := .Values.metrics | default dict -}} +{{- $reportersValue := default "none" $metrics.reporters | toString | trim -}} +{{- if or (eq $reportersValue "") (eq $reportersValue "none") -}} +[] +{{- else -}} +{{- $selected := list -}} +{{- range $raw := regexSplit "\\s*,\\s*" $reportersValue -1 -}} +{{- $name := trim $raw -}} +{{- if ne $name "" -}} +{{- if eq $name "none" -}} +{{- fail "metrics.reporters cannot combine 'none' with other reporters" -}} +{{- end -}} +{{- $selected = append $selected $name -}} +{{- end -}} +{{- end -}} +{{- $selected | toYaml -}} +{{- end -}} +{{- end -}} + +{{/* +Checks if prometheus reporter is enabled. +*/}} +{{- define "fluss.metrics.prometheusEnabled" -}} +{{- $reporterNames := include "fluss.metrics.reporterNames" . | fromYamlArray -}} +{{- if has "prometheus" $reporterNames -}} +true +{{- end -}} +{{- end -}} + +{{/* +Renders metrics reporter configuration entries. +Expects the root context as argument. + +From values: + metrics: + reporters: prometheus + prometheus: + port: 9249 + +Renders: + metrics.reporters: prometheus + metrics.reporter.prometheus.port: 9249 + +Keys already present in configurationOverrides are not rendered. +*/}} +{{- define "fluss.metrics.config" -}} +{{- $config := .Values.configurationOverrides | default dict -}} +{{- $metrics := .Values.metrics | default dict -}} +{{- $reporterNames := include "fluss.metrics.reporterNames" . | fromYamlArray -}} +{{- if gt (len $reporterNames) 0 -}} +{{- if not (hasKey $config "metrics.reporters") }} +metrics.reporters: {{ join "," $reporterNames }} +{{- end -}} +{{- range $name := $reporterNames -}} +{{- if not (hasKey $metrics $name) -}} +{{- fail (printf "metrics.%s must be configured when metrics.reporters includes %s" $name $name) -}} +{{- end -}} +{{- $reporterConfig := index $metrics $name -}} +{{- range $option, $value := $reporterConfig -}} +{{- if ne $option "service" -}} +{{- $fullKey := printf "metrics.reporter.%s.%s" $name $option -}} +{{- if not (hasKey $config $fullKey) }} +{{ $fullKey }}: {{ tpl (printf "%v" $value) $ }} Review Comment: Yes, this maybe good tradeoff. We can fail if users still set the port on the `configurationOverrides` instead of using values.yaml file. This later can go to the validations section in the SASL PR. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
