airship/maas
Code Issues Proposed changes

Merge "Add log_level attribute in the Chart to allow overwrite of default"

Browse Source
This commit is contained in:
Zuul 2020-02-17 17:28:17 +00:00 committed by Gerrit Code Review
commit c689772a12
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
charts/maas/templates/etc/_rsyslog.conf.tpl
View File

@ -5,6 +5,12 @@ $UDPServerRun {{ tuple "maas_region" "podport" "region_syslog" . | include "helm
# Reduce message repetition # Reduce message repetition
$RepeatedMsgReduction on $RepeatedMsgReduction on
# Overwrite default when log_level is set
{{- if .Values.conf.syslog.log_level }}
*.{{ .Values.conf.syslog.log_level }} {{ .Values.conf.syslog.logpath }}/{{ .Values.conf.syslog.logfile }}
{{- end }}
##$RepeatedMsgContainsOriginalMsg on ##$RepeatedMsgContainsOriginalMsg on
:fromhost-ip, !isequal, "127.0.0.1" {{ .Values.conf.syslog.logpath }}/{{ .Values.conf.syslog.logfile }} :fromhost-ip, !isequal, "127.0.0.1" {{ .Values.conf.syslog.logpath }}/{{ .Values.conf.syslog.logfile }}

3
charts/maas/values.yaml
View File

@ -195,6 +195,9 @@ conf:
rotate: '30' rotate: '30'
# Size threshold when a log should rotate # Size threshold when a log should rotate
size: '100M' size: '100M'
# levels (emerg,alert,crit,error,warning,notice,info,debug)
# use 'info' as default when overwritting the default
log_level: 'info'
maas: maas:
override: override:
append: append: