mailu: harden relay + fix postmark exporter
This commit is contained in:
parent
6a4b7f4431
commit
c693e695b4
@ -960,7 +960,7 @@ def build_overview():
|
|||||||
"type": "stat",
|
"type": "stat",
|
||||||
"title": "Mail Bounces (1d)",
|
"title": "Mail Bounces (1d)",
|
||||||
"datasource": PROM_DS,
|
"datasource": PROM_DS,
|
||||||
"gridPos": {"h": 2, "w": 6, "x": 6, "y": 8},
|
"gridPos": {"h": 2, "w": 6, "x": 12, "y": 8},
|
||||||
"targets": [
|
"targets": [
|
||||||
{
|
{
|
||||||
"expr": 'max(postmark_outbound_bounce_rate{window="1d"})',
|
"expr": 'max(postmark_outbound_bounce_rate{window="1d"})',
|
||||||
@ -1006,7 +1006,7 @@ def build_overview():
|
|||||||
32,
|
32,
|
||||||
"Mail Success Rate (1d)",
|
"Mail Success Rate (1d)",
|
||||||
'clamp_min(100 - max(postmark_outbound_bounce_rate{window="1d"}), 0)',
|
'clamp_min(100 - max(postmark_outbound_bounce_rate{window="1d"}), 0)',
|
||||||
{"h": 2, "w": 6, "x": 12, "y": 8},
|
{"h": 2, "w": 6, "x": 6, "y": 8},
|
||||||
unit="percent",
|
unit="percent",
|
||||||
thresholds=mail_success_thresholds,
|
thresholds=mail_success_thresholds,
|
||||||
decimals=1,
|
decimals=1,
|
||||||
|
|||||||
@ -218,6 +218,10 @@ spec:
|
|||||||
hardware: rpi4
|
hardware: rpi4
|
||||||
overrides:
|
overrides:
|
||||||
postfix.cf: |
|
postfix.cf: |
|
||||||
|
smtpd_helo_required = yes
|
||||||
|
smtpd_helo_restrictions = reject_invalid_helo_hostname, reject_non_fqdn_helo_hostname
|
||||||
|
smtpd_client_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_pipelining
|
||||||
|
smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination, reject_non_fqdn_recipient, reject_unknown_recipient_domain
|
||||||
smtpd_relay_restrictions = permit_sasl_authenticated, reject_unauth_destination
|
smtpd_relay_restrictions = permit_sasl_authenticated, reject_unauth_destination
|
||||||
smtpd_sender_restrictions = reject_non_fqdn_sender, reject_unknown_sender_domain, reject_sender_login_mismatch, reject_authenticated_sender_login_mismatch
|
smtpd_sender_restrictions = reject_non_fqdn_sender, reject_unknown_sender_domain, reject_sender_login_mismatch, reject_authenticated_sender_login_mismatch
|
||||||
smtpd_tls_auth_only = yes
|
smtpd_tls_auth_only = yes
|
||||||
|
|||||||
@ -864,7 +864,7 @@
|
|||||||
"gridPos": {
|
"gridPos": {
|
||||||
"h": 2,
|
"h": 2,
|
||||||
"w": 6,
|
"w": 6,
|
||||||
"x": 6,
|
"x": 12,
|
||||||
"y": 8
|
"y": 8
|
||||||
},
|
},
|
||||||
"targets": [
|
"targets": [
|
||||||
@ -969,7 +969,7 @@
|
|||||||
"gridPos": {
|
"gridPos": {
|
||||||
"h": 2,
|
"h": 2,
|
||||||
"w": 6,
|
"w": 6,
|
||||||
"x": 12,
|
"x": 6,
|
||||||
"y": 8
|
"y": 8
|
||||||
},
|
},
|
||||||
"targets": [
|
"targets": [
|
||||||
|
|||||||
@ -873,7 +873,7 @@ data:
|
|||||||
"gridPos": {
|
"gridPos": {
|
||||||
"h": 2,
|
"h": 2,
|
||||||
"w": 6,
|
"w": 6,
|
||||||
"x": 6,
|
"x": 12,
|
||||||
"y": 8
|
"y": 8
|
||||||
},
|
},
|
||||||
"targets": [
|
"targets": [
|
||||||
@ -978,7 +978,7 @@ data:
|
|||||||
"gridPos": {
|
"gridPos": {
|
||||||
"h": 2,
|
"h": 2,
|
||||||
"w": 6,
|
"w": 6,
|
||||||
"x": 12,
|
"x": 6,
|
||||||
"y": 8
|
"y": 8
|
||||||
},
|
},
|
||||||
"targets": [
|
"targets": [
|
||||||
|
|||||||
@ -33,12 +33,12 @@ spec:
|
|||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: postmark-exporter
|
name: postmark-exporter
|
||||||
key: relay-username
|
key: server-token
|
||||||
- name: POSTMARK_SERVER_TOKEN_FALLBACK
|
- name: POSTMARK_SERVER_TOKEN_FALLBACK
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: postmark-exporter
|
name: postmark-exporter
|
||||||
key: relay-password
|
key: server-token-fallback
|
||||||
- name: POSTMARK_SENDING_LIMIT
|
- name: POSTMARK_SENDING_LIMIT
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user