Use system_mail_from when using SMTP system configuration
This commit is contained in:
parent
a420d20d39
commit
a306f5ce19
|
@ -10,6 +10,7 @@ global:
|
||||||
smtp_smarthost: '%%exim_relay_smtp:465'
|
smtp_smarthost: '%%exim_relay_smtp:465'
|
||||||
smtp_require_tls: true
|
smtp_require_tls: true
|
||||||
%end if
|
%end if
|
||||||
|
smtp_from: '%%system_mail_from'
|
||||||
%else
|
%else
|
||||||
smtp_smarthost: '%%alSMTPHost:%%alSMTPPort'
|
smtp_smarthost: '%%alSMTPHost:%%alSMTPPort'
|
||||||
smtp_from: '%%alFrom'
|
smtp_from: '%%alFrom'
|
||||||
|
@ -31,8 +32,8 @@ global:
|
||||||
#hipchat_api_url: 'https://hipchat.foobar.org/'
|
#hipchat_api_url: 'https://hipchat.foobar.org/'
|
||||||
|
|
||||||
# The directory from which notification templates are read.
|
# The directory from which notification templates are read.
|
||||||
templates:
|
templates:
|
||||||
- '/etc/alertmanager/template/*.tmpl'
|
- '/etc/alertmanager/template/*.tmpl'
|
||||||
|
|
||||||
# The root route on which each incoming alert enters.
|
# The root route on which each incoming alert enters.
|
||||||
route:
|
route:
|
||||||
|
@ -54,12 +55,12 @@ route:
|
||||||
|
|
||||||
# If an alert has successfully been sent, wait 'repeat_interval' to
|
# If an alert has successfully been sent, wait 'repeat_interval' to
|
||||||
# resend them.
|
# resend them.
|
||||||
repeat_interval: 3h
|
repeat_interval: 3h
|
||||||
|
|
||||||
# A default receiver
|
# A default receiver
|
||||||
receiver: %%alDefaultReceiver
|
receiver: %%alDefaultReceiver
|
||||||
|
|
||||||
# All the above attributes are inherited by all child routes and can
|
# All the above attributes are inherited by all child routes and can
|
||||||
# overwritten on each.
|
# overwritten on each.
|
||||||
|
|
||||||
# The child route trees.
|
# The child route trees.
|
||||||
|
@ -119,7 +120,7 @@ route:
|
||||||
|
|
||||||
# Inhibition rules allow to mute a set of alerts given that another alert is
|
# Inhibition rules allow to mute a set of alerts given that another alert is
|
||||||
# firing.
|
# firing.
|
||||||
# We use this to mute any warning-level notifications if the same alert is
|
# We use this to mute any warning-level notifications if the same alert is
|
||||||
# already critical.
|
# already critical.
|
||||||
inhibit_rules:
|
inhibit_rules:
|
||||||
- source_match:
|
- source_match:
|
||||||
|
|
Loading…
Reference in New Issue