diff options
| author | Austin S. Hemmelgarn <ahferroin7@gmail.com> | 2018-11-02 14:39:14 -0400 |
|---|---|---|
| committer | Costa Tsaousis <costa@tsaousis.gr> | 2018-11-02 20:39:14 +0200 |
| commit | b06e89d3733d1449db114128169a92d242c2605d (patch) | |
| tree | e5612c243857a56badf8aca2952874d99bb5be28 /health | |
| parent | 06b7c5026953a1808c9b8617b9b6d3fe6a75244e (diff) | |
Switch e-mail threading to be enabled by default. (#3780)
As discussed in the PR that added email threading support, this switches
it to be enabled by default.
Diffstat (limited to 'health')
| -rwxr-xr-x | health/notifications/alarm-notify.sh.in | 2 | ||||
| -rwxr-xr-x | health/notifications/health_alarm_notify.conf | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/health/notifications/alarm-notify.sh.in b/health/notifications/alarm-notify.sh.in index 4aef3a521a..cc2af33249 100755 --- a/health/notifications/alarm-notify.sh.in +++ b/health/notifications/alarm-notify.sh.in @@ -896,7 +896,7 @@ date=$(date --date=@${when} "${date_format}" 2>/dev/null) # ---------------------------------------------------------------------------- # prepare some extra headers if we've been asked to thread e-mails -if [ "${SEND_EMAIL}" == "YES" -a "${EMAIL_THREADING}" == "YES" ] ; then +if [ "${SEND_EMAIL}" == "YES" -a "${EMAIL_THREADING}" != "NO" ] ; then email_thread_headers="In-Reply-To: <${chart}-${name}@${host}>\nReferences: <${chart}-${name}@${host}>" else email_thread_headers= diff --git a/health/notifications/health_alarm_notify.conf b/health/notifications/health_alarm_notify.conf index 9e72aac4dc..a997765a6a 100755 --- a/health/notifications/health_alarm_notify.conf +++ b/health/notifications/health_alarm_notify.conf @@ -183,8 +183,9 @@ DEFAULT_RECIPIENT_EMAIL="root" # chart+alarm+host combination as a single thread. This can help # simplify tracking of alarms, as it provides an easy wway for scripts # to corelate messages and also will cause most clients to group all the -# messages together. THis is off by default. -#EMAIL_THREADING="YES" +# messages together. This is enabled by default, uncomment the line +# below if you want to disable it. +#EMAIL_THREADING="NO" #------------------------------------------------------------------------------ |