bokysan/docker-postfix
1
1
Fork 0
mirror of https://github.com/bokysan/docker-postfix.git synced 2025-09-06 06:25:40 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix: helm template fixes for prometheus monitoring

Browse source
This commit is contained in:
Bojan Čekrlić 2023-10-27 16:02:32 +02:00
parent bcf7dcbfcb
commit 3370a9d1bc
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
helm/mail/templates/configmap-metrics.yaml
View file

@ -12,8 +12,10 @@ metadata:
data: data:
logrotate.conf: | {{- index .Values.metrics.logrotate "logrotate.conf" | nindent 4 }} logrotate.conf: | {{- index .Values.metrics.logrotate "logrotate.conf" | nindent 4 }}
maillog.conf: | maillog.conf: |
template(name="metricslog" type="string" string={{ .Values.metrics.path | quote }}) template(name="metricslog" type="string" string={{ .Values.metrics.maillog | quote }})
action(type="omfile" DynaFile="metricslog" template="plain" DirCreateMode="0755" FileCreateMode="0644") if ($syslogfacility == '2') or ($programname == 'postfix') then {
action(type="omfile" DynaFile="metricslog" template="plain" DirCreateMode="0755" FileCreateMode="0644")
}
--- ---
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap

3
helm/mail/templates/configmap.yaml
View file

@ -13,9 +13,6 @@ data:
{{- range $key, $value := .Values.config.postfix }} {{- range $key, $value := .Values.config.postfix }}
POSTFIX_{{ $key }}: {{ $value | quote }} POSTFIX_{{ $key }}: {{ $value | quote }}
{{- end }} {{- end }}
{{- if .Values.metrics.enabled }}
POSTFIX_maillog_file: {{ .Values.metrics.maillog }}
{{- end }}
{{- range $key, $value := .Values.config.opendkim }} {{- range $key, $value := .Values.config.opendkim }}
OPENDKIM_{{ $key }}: {{ $value | quote }} OPENDKIM_{{ $key }}: {{ $value | quote }}
{{- end }} {{- end }}

7
helm/mail/templates/statefulset.yaml
View file

@ -159,6 +159,13 @@ spec:
- name: {{ $fullName | quote }} - name: {{ $fullName | quote }}
mountPath: {{ regexFind "^/?.*/" .Values.metrics.maillog | quote }} mountPath: {{ regexFind "^/?.*/" .Values.metrics.maillog | quote }}
subPath: logs subPath: logs
startupProbe:
httpGet:
path: {{ .Values.metrics.path | quote }}
port: {{ .Values.metrics.port }}
initialDelaySeconds: 5
failureThreshold: 15
periodSeconds: 2
readinessProbe: readinessProbe:
httpGet: httpGet:
path: {{ .Values.metrics.path | quote }} path: {{ .Values.metrics.path | quote }}