Browse Source

Use system_mail_from when using SMTP system configuration

William Petit 11 months ago
parent
commit
a306f5ce19
1 changed files with 6 additions and 5 deletions
  1. 6
    5
      tmpl/alertmanager.yml

+ 6
- 5
tmpl/alertmanager.yml View File

@@ -10,6 +10,7 @@ global:
10 10
   smtp_smarthost: '%%exim_relay_smtp:465'
11 11
   smtp_require_tls: true
12 12
   %end if
13
+  smtp_from: '%%system_mail_from'
13 14
 %else
14 15
   smtp_smarthost: '%%alSMTPHost:%%alSMTPPort'
15 16
   smtp_from: '%%alFrom'
@@ -31,8 +32,8 @@ global:
31 32
   #hipchat_api_url: 'https://hipchat.foobar.org/'
32 33
 
33 34
 # The directory from which notification templates are read.
34
-templates: 
35
-- '/etc/alertmanager/template/*.tmpl'
35
+templates:
36
+  - '/etc/alertmanager/template/*.tmpl'
36 37
 
37 38
 # The root route on which each incoming alert enters.
38 39
 route:
@@ -54,12 +55,12 @@ route:
54 55
 
55 56
   # If an alert has successfully been sent, wait 'repeat_interval' to
56 57
   # resend them.
57
-  repeat_interval: 3h 
58
+  repeat_interval: 3h
58 59
 
59 60
   # A default receiver
60 61
   receiver: %%alDefaultReceiver
61 62
 
62
-  # All the above attributes are inherited by all child routes and can 
63
+  # All the above attributes are inherited by all child routes and can
63 64
   # overwritten on each.
64 65
 
65 66
   # The child route trees.
@@ -119,7 +120,7 @@ route:
119 120
 
120 121
 # Inhibition rules allow to mute a set of alerts given that another alert is
121 122
 # firing.
122
-# We use this to mute any warning-level notifications if the same alert is 
123
+# We use this to mute any warning-level notifications if the same alert is
123 124
 # already critical.
124 125
 inhibit_rules:
125 126
 - source_match: