This is an automated email from the ASF dual-hosted git repository. liudongkai pushed a commit to branch 3.0.0-beta-2-prepare in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
commit 248a85daab8c619a3b8a2fd827facfab635a80bc Author: liubo1990 <[email protected]> AuthorDate: Fri Jun 17 21:16:38 2022 +0800 [Doc] Add how to set the alarm mailbox in faq (#10401) (cherry picked from commit b8d5e78994f43d8febf6ff6ae565dab45f2c8c2f) --- docs/docs/en/faq.md | 3 ++- docs/docs/en/guide/alert/email.md | 6 ++++++ docs/docs/zh/faq.md | 3 ++- docs/docs/zh/guide/alert/email.md | 6 ++++++ docs/img/alert/email-alter-setup1-en.png | Bin 0 -> 27742 bytes docs/img/alert/email-alter-setup2-en.png | Bin 0 -> 47734 bytes docs/img/alert/email-alter-setup3-en.png | Bin 0 -> 43983 bytes 7 files changed, 16 insertions(+), 2 deletions(-) diff --git a/docs/docs/en/faq.md b/docs/docs/en/faq.md index 31b7ef47a9..fd19a8d142 100644 --- a/docs/docs/en/faq.md +++ b/docs/docs/en/faq.md @@ -23,7 +23,8 @@ Note：**Due to the large number of services, it is recommended that the single- ## Q: Which mailboxes does the system support? -A: Support most mailboxes, qq, 163, 126, 139, outlook, aliyun, etc. are supported. Support TLS and SSL protocols, optionally configured in alert.properties +A: Support most mailboxes, qq, 163, 126, 139, outlook, aliyun, etc. are supported. Support TLS and SSL protocols, these can be configured in the ui of dolphinscheduler: +[How to setup email alarm](../en/guide/alert/email.md). --- diff --git a/docs/docs/en/guide/alert/email.md b/docs/docs/en/guide/alert/email.md new file mode 100644 index 0000000000..aa3cf2ba73 --- /dev/null +++ b/docs/docs/en/guide/alert/email.md @@ -0,0 +1,6 @@ +# Email +If you need to use `Email` for alerting, create an alert instance in the alert instance management and select the Email plugin. +The following shows the `Email` configuration example: + + + \ No newline at end of file diff --git a/docs/docs/zh/faq.md b/docs/docs/zh/faq.md index f16701fae8..9bdb55e8e4 100644 --- a/docs/docs/zh/faq.md +++ b/docs/docs/zh/faq.md @@ -24,7 +24,8 @@ A：DolphinScheduler 由 5 个服务组成，MasterServer、WorkerServer、ApiSe ## Q：系统支持哪些邮箱？ -A：支持绝大多数邮箱，qq、163、126、139、outlook、aliyun 等皆支持。支持 **TLS 和 SSL** 协议，可以在 alert.properties 中选择性配置 +A：支持绝大多数邮箱，qq、163、126、139、outlook、aliyun 等皆支持。支持 **TLS 和 SSL** 协议，可以在dolphinscheduler的ui中进行配置： +[如何配置邮箱告警](../zh/guide/alert/email.md)。 --- diff --git a/docs/docs/zh/guide/alert/email.md b/docs/docs/zh/guide/alert/email.md new file mode 100644 index 0000000000..b636b03af8 --- /dev/null +++ b/docs/docs/zh/guide/alert/email.md @@ -0,0 +1,6 @@ +# Email +如果需要使用`Email`进行告警，请在告警实例管理中创建告警实例，并选择Email插件。 +下面显示了 `Email` 配置示例：: + + + \ No newline at end of file diff --git a/docs/img/alert/email-alter-setup1-en.png b/docs/img/alert/email-alter-setup1-en.png new file mode 100644 index 0000000000..d09253de12 Binary files /dev/null and b/docs/img/alert/email-alter-setup1-en.png differ diff --git a/docs/img/alert/email-alter-setup2-en.png b/docs/img/alert/email-alter-setup2-en.png new file mode 100644 index 0000000000..ac44c012be Binary files /dev/null and b/docs/img/alert/email-alter-setup2-en.png differ diff --git a/docs/img/alert/email-alter-setup3-en.png b/docs/img/alert/email-alter-setup3-en.png new file mode 100644 index 0000000000..1673d5d96c Binary files /dev/null and b/docs/img/alert/email-alter-setup3-en.png differ
