This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new cbde58b0f Automated deployment:
4d97cc3dab28602c236aadcffb847cfa90bd99ad
cbde58b0f is described below
commit cbde58b0f082ca2708a16688b2fc2c32ca97221e
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
AuthorDate: Sat Jun 18 05:05:49 2022 +0000
Automated deployment: 4d97cc3dab28602c236aadcffb847cfa90bd99ad
---
.../dev/user_doc/architecture/configuration.html | 78 ++++++------
.../dev/user_doc/architecture/configuration.json | 2 +-
.../configuration.html => alert/email.html} | 131 ++-------------------
en-us/docs/dev/user_doc/guide/alert/email.json | 6 +
.../dev/user_doc/guide/resource/configuration.html | 33 ++++--
.../dev/user_doc/guide/resource/configuration.json | 2 +-
en-us/docs/release/faq.html | 5 +-
en-us/docs/release/faq.json | 2 +-
img/alert/email-alter-setup1-en.png | Bin 0 -> 27742 bytes
img/alert/email-alter-setup2-en.png | Bin 0 -> 47734 bytes
img/alert/email-alter-setup3-en.png | Bin 0 -> 43983 bytes
.../dev/user_doc/architecture/configuration.html | 78 ++++++------
.../dev/user_doc/architecture/configuration.json | 2 +-
.../configuration.html => alert/email.html} | 131 ++-------------------
zh-cn/docs/dev/user_doc/guide/alert/email.json | 6 +
.../dev/user_doc/guide/resource/configuration.html | 33 ++++--
.../dev/user_doc/guide/resource/configuration.json | 2 +-
zh-cn/docs/release/faq.html | 5 +-
zh-cn/docs/release/faq.json | 2 +-
19 files changed, 172 insertions(+), 346 deletions(-)
diff --git a/en-us/docs/dev/user_doc/architecture/configuration.html
b/en-us/docs/dev/user_doc/architecture/configuration.html
index 23bfb8588..9c951c35c 100644
--- a/en-us/docs/dev/user_doc/architecture/configuration.html
+++ b/en-us/docs/dev/user_doc/architecture/configuration.html
@@ -375,11 +375,46 @@ Currently, DS just makes a basic config, remember to
config further JVM options
<td>type of resource files: HDFS, S3, NONE</td>
</tr>
<tr>
-<td>resource.upload.path</td>
+<td>resource.storage.upload.base.path</td>
<td>/dolphinscheduler</td>
<td>storage path of resource files</td>
</tr>
<tr>
+<td><a
href="http://resource.aws.access.key.id";>resource.aws.access.key.id</a></td>
+<td>minioadmin</td>
+<td>access key id of S3</td>
+</tr>
+<tr>
+<td>resource.aws.secret.access.key</td>
+<td>minioadmin</td>
+<td>secret access key of S3</td>
+</tr>
+<tr>
+<td>resource.aws.region</td>
+<td>us-east-1</td>
+<td>region of S3</td>
+</tr>
+<tr>
+<td><a
href="http://resource.aws.s3.bucket.name";>resource.aws.s3.bucket.name</a></td>
+<td>dolphinscheduler</td>
+<td>bucket name of S3</td>
+</tr>
+<tr>
+<td>resource.aws.s3.endpoint</td>
+<td><a href="http://minio:9000";>http://minio:9000</a></td>
+<td>endpoint of S3</td>
+</tr>
+<tr>
+<td>resource.hdfs.root.user</td>
+<td>hdfs</td>
+<td>configure users with corresponding permissions if storage type is HDFS</td>
+</tr>
+<tr>
+<td>resource.hdfs.fs.defaultFS</td>
+<td>hdfs://mycluster:8020</td>
+<td>If resource.storage.type=S3, then the request url would be similar to
's3a://dolphinscheduler'. Otherwise if resource.storage.type=HDFS and hadoop
supports HA, copy core-site.xml and hdfs-site.xml into 'conf' directory</td>
+</tr>
+<tr>
<td>hadoop.security.authentication.startup.state</td>
<td>false</td>
<td>whether hadoop grant kerberos permission</td>
@@ -405,36 +440,6 @@ Currently, DS just makes a basic config, remember to
config further JVM options
<td>kerberos expire time,integer,the unit is hour</td>
</tr>
<tr>
-<td>resource.view.suffixs</td>
-<td>txt,log,sh,conf,cfg,py,java,sql,hql,xml,properties</td>
-<td>file types supported by resource center</td>
-</tr>
-<tr>
-<td>hdfs.root.user</td>
-<td>hdfs</td>
-<td>configure users with corresponding permissions if storage type is HDFS</td>
-</tr>
-<tr>
-<td>fs.defaultFS</td>
-<td>hdfs://mycluster:8020</td>
-<td>If resource.storage.type=S3, then the request url would be similar to
's3a://dolphinscheduler'. Otherwise if resource.storage.type=HDFS and hadoop
supports HA, copy core-site.xml and hdfs-site.xml into 'conf' directory</td>
-</tr>
-<tr>
-<td>fs.s3a.endpoint</td>
-<td></td>
-<td>s3 endpoint url</td>
-</tr>
-<tr>
-<td>fs.s3a.access.key</td>
-<td></td>
-<td>s3 access key</td>
-</tr>
-<tr>
-<td>fs.s3a.secret.key</td>
-<td></td>
-<td>s3 secret key</td>
-</tr>
-<tr>
<td>yarn.resourcemanager.ha.rm.ids</td>
<td></td>
<td>specify the yarn resourcemanager url. if resourcemanager supports HA,
input HA IP addresses (separated by comma), or input null for standalone</td>
@@ -532,7 +537,7 @@ Currently, DS just makes a basic config, remember to config
further JVM options
<td>LDAP urls</td>
</tr>
<tr>
-<td>security.authentication.ldap.base.dn</td>
+<td>security.authentication.ldap.base-dn</td>
<td>dc=example,dc=com</td>
<td>LDAP base dn</td>
</tr>
@@ -547,15 +552,20 @@ Currently, DS just makes a basic config, remember to
config further JVM options
<td>LDAP password</td>
</tr>
<tr>
-<td>security.authentication.ldap.user.identity.attribute</td>
+<td>security.authentication.ldap.user.identity-attribute</td>
<td>uid</td>
<td>LDAP user identity attribute</td>
</tr>
<tr>
-<td>security.authentication.ldap.user.email.attribute</td>
+<td>security.authentication.ldap.user.email-attribute</td>
<td>mail</td>
<td>LDAP user email attribute</td>
</tr>
+<tr>
+<td>security.authentication.ldap.user.not-exist-action</td>
+<td>CREATE</td>
+<td>action when LDAP user is not exist. Default CREATE: automatically create
user when user not exist, DENY: deny log-in when user not exist</td>
+</tr>
</tbody>
</table>
<h3>master.properties [master-service log config]</h3>
diff --git a/en-us/docs/dev/user_doc/architecture/configuration.json
b/en-us/docs/dev/user_doc/architecture/configuration.json
index c71493d89..5a15ab196 100644
--- a/en-us/docs/dev/user_doc/architecture/configuration.json
+++ b/en-us/docs/dev/user_doc/architecture/configuration.json
@@ -1,6 +1,6 @@
{
"filename": "configuration.md",
- "__html": "<!-- markdown-link-check-disable
-->\n<h1>Configuration</h1>\n<h2>Preface</h2>\n<p>This document explains the
DolphinScheduler application configurations according to DolphinScheduler-1.3.x
versions.</p>\n<h2>Directory Structure</h2>\n<p>Currently, all the
configuration files are under [conf ] directory.\nCheck the following
simplified DolphinScheduler installation directories to have a direct view
about the position of [conf] directory and configuration files it has.\nThis
[...]
+ "__html": "<!-- markdown-link-check-disable
-->\n<h1>Configuration</h1>\n<h2>Preface</h2>\n<p>This document explains the
DolphinScheduler application configurations according to DolphinScheduler-1.3.x
versions.</p>\n<h2>Directory Structure</h2>\n<p>Currently, all the
configuration files are under [conf ] directory.\nCheck the following
simplified DolphinScheduler installation directories to have a direct view
about the position of [conf] directory and configuration files it has.\nThis
[...]
"link": "/dist/en-us/docs/dev/user_doc/architecture/configuration.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/dev/user_doc/guide/resource/configuration.html
b/en-us/docs/dev/user_doc/guide/alert/email.html
similarity index 69%
copy from en-us/docs/dev/user_doc/guide/resource/configuration.html
copy to en-us/docs/dev/user_doc/guide/alert/email.html
index 001bc011d..2756379c2 100644
--- a/en-us/docs/dev/user_doc/guide/resource/configuration.html
+++ b/en-us/docs/dev/user_doc/guide/alert/email.html
@@ -3,132 +3,19 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0,
maximum-scale=1.0, user-scalable=no">
- <meta name="keywords" content="configuration">
- <meta name="description" content="configuration">
- <title>configuration</title>
+ <meta name="keywords" content="email">
+ <meta name="description" content="email">
+ <title>email</title>
<link rel="shortcut icon" href="/img/favicon.ico">
<link rel="stylesheet" href="/build/vendor.eeae4ed.css">
</head>
<body>
- <div id="root"><div class="md2html docs-page" data-reactroot=""><header
class="header-container header-container-dark"><div class="banner-tips"><div>🤔
Have queries regarding Apache DolphinScheduler, Join Slack channel to disscuss
them <a class="link-tips"
href="https://s.apache.org/dolphinscheduler-slack";>join #dolphinscheduler
channel</a>! 🌟</div></div><div class="header-body"><span class="mobile-menu-btn
mobile-menu-btn-dark"></span><a href="/en-us/index.html"><img class="logo"
src=" [...]
-<p>The Resource Center is usually used for operations such as uploading files,
UDF functions, and task group management. You can appoint the local file
directory as the upload directory for a single machine (this operation does not
need to deploy Hadoop). Or you can also upload to a Hadoop or MinIO cluster, at
this time, you need to have Hadoop (2.6+) or MinIO or other related
environments.</p>
-<h2>Local File Resource Configuration</h2>
-<p>For a single machine, you can choose to use local file directory as the
upload directory (no need to deploy Hadoop) by making the following
configuration.</p>
-<h3>Configuring the <code>common.properties</code></h3>
-<p>Configure the file in the following paths:
<code>api-server/conf/common.properties</code> and
<code>worker-server/conf/common.properties</code>.</p>
-<ul>
-<li>Change <code>data.basedir.path</code> to the local directory path. Please
make sure the user who deploy dolphinscheduler have read and write permissions,
such as: <code>data.basedir.path=/tmp/dolphinscheduler</code>. And the
directory you configured will be auto-created if it does not exists.</li>
-<li>Modify the following two parameters,
<code>resource.storage.type=HDFS</code> and
<code>fs.defaultFS=file:///</code>.</li>
-</ul>
-<h2>HDFS Resource Configuration</h2>
-<p>When it is necessary to use the Resource Center to create or upload
relevant files, all files and resources will be stored on HDFS. Therefore the
following configuration is required.</p>
-<h3>Configuring the common.properties</h3>
-<p>After version 3.0.0-alpha, if you want to upload resources using HDFS or S3
from the Resource Center, the following paths need to be configured:
<code>api-server/conf/common.properties</code> and
<code>worker-server/conf/common.properties</code>. This can be found as
follows.</p>
-<pre><code class="language-properties"><span class="hljs-comment">#</span>
-<span class="hljs-comment"># Licensed to the Apache Software Foundation (ASF)
under one or more</span>
-<span class="hljs-comment"># contributor license agreements. See the NOTICE
file distributed with</span>
-<span class="hljs-comment"># this work for additional information regarding
copyright ownership.</span>
-<span class="hljs-comment"># The ASF licenses this file to You under the
Apache License, Version 2.0</span>
-<span class="hljs-comment"># (the "License"); you may not use this
file except in compliance with</span>
-<span class="hljs-comment"># the License. You may obtain a copy of the
License at</span>
-<span class="hljs-comment">#</span>
-<span class="hljs-comment">#
http://www.apache.org/licenses/LICENSE-2.0</span>
-<span class="hljs-comment">#</span>
-<span class="hljs-comment"># Unless required by applicable law or agreed to in
writing, software</span>
-<span class="hljs-comment"># distributed under the License is distributed on
an "AS IS" BASIS,</span>
-<span class="hljs-comment"># WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
either express or implied.</span>
-<span class="hljs-comment"># See the License for the specific language
governing permissions and</span>
-<span class="hljs-comment"># limitations under the License.</span>
-<span class="hljs-comment">#</span>
-<span class="hljs-comment">
-# user data local directory path, please make sure the directory exists and
have read write permissions</span>
-<span class="hljs-meta">data.basedir.path</span>=<span
class="hljs-string">/tmp/dolphinscheduler</span>
-<span class="hljs-comment">
-# resource storage type: HDFS, S3, NONE</span>
-<span class="hljs-meta">resource.storage.type</span>=<span
class="hljs-string">HDFS</span>
-<span class="hljs-comment">
-# resource store on HDFS/S3 path, resource file will store to this hadoop hdfs
path, self configuration,</span>
-<span class="hljs-comment"># please make sure the directory exists on hdfs and
have read write permissions. "/dolphinscheduler" is recommended</span>
-<span class="hljs-meta">resource.upload.path</span>=<span
class="hljs-string">/tmp/dolphinscheduler</span>
-<span class="hljs-comment">
-# whether to startup kerberos</span>
-<span
class="hljs-meta">hadoop.security.authentication.startup.state</span>=<span
class="hljs-string">false</span>
-<span class="hljs-comment">
-# java.security.krb5.conf path</span>
-<span class="hljs-meta">java.security.krb5.conf.path</span>=<span
class="hljs-string">/opt/krb5.conf</span>
-<span class="hljs-comment">
-# login user from keytab username</span>
-<span class="hljs-meta">login.user.keytab.username</span>=<span
class="hljs-string">[email protected]</span>
-<span class="hljs-comment">
-# login user from keytab path</span>
-<span class="hljs-meta">login.user.keytab.path</span>=<span
class="hljs-string">/opt/hdfs.headless.keytab</span>
-<span class="hljs-comment">
-# kerberos expire time, the unit is hour</span>
-<span class="hljs-meta">kerberos.expire.time</span>=<span
class="hljs-string">2</span>
-<span class="hljs-comment"># resource view suffixs</span>
-<span
class="hljs-comment">#resource.view.suffixs=txt,log,sh,bat,conf,cfg,py,java,sql,xml,hql,properties,json,yml,yaml,ini,js</span>
-<span class="hljs-comment"># if resource.storage.type=HDFS, the user must have
the permission to create directories under the HDFS root path</span>
-<span class="hljs-meta">hdfs.root.user</span>=<span
class="hljs-string">root</span>
-<span class="hljs-comment"># if resource.storage.type=S3, the value like:
s3a://dolphinscheduler;</span>
-<span class="hljs-comment"># if resource.storage.type=HDFS and namenode HA is
enabled, you need to copy core-site.xml and hdfs-site.xml to conf dir</span>
-<span class="hljs-meta">fs.defaultFS</span>=<span
class="hljs-string">hdfs://localhost:8020</span>
-<span class="hljs-meta">aws.access.key.id</span>=<span
class="hljs-string">minioadmin</span>
-<span class="hljs-meta">aws.secret.access.key</span>=<span
class="hljs-string">minioadmin</span>
-<span class="hljs-meta">aws.region</span>=<span
class="hljs-string">us-east-1</span>
-<span class="hljs-meta">aws.endpoint</span>=<span
class="hljs-string">http://localhost:9000</span>
-<span class="hljs-comment"># resourcemanager port, the default value is 8088
if not specified</span>
-<span class="hljs-meta">resource.manager.httpaddress.port</span>=<span
class="hljs-string">8088</span>
-<span class="hljs-comment"># if resourcemanager HA is enabled, please set the
HA IPs; if resourcemanager is single, keep this value empty</span>
-<span class="hljs-meta">yarn.resourcemanager.ha.rm.ids</span>=<span
class="hljs-string">192.168.xx.xx,192.168.xx.xx</span>
-<span class="hljs-comment"># if resourcemanager HA is enabled or not use
resourcemanager, please keep the default value;</span>
-<span class="hljs-comment"># If resourcemanager is single, you only need to
replace ds1 to actual resourcemanager hostname</span>
-<span class="hljs-meta">yarn.application.status.address</span>=<span
class="hljs-string">http://localhost:%s/ds/v1/cluster/apps/%s</span>
-<span class="hljs-comment"># job history status url when application number
threshold is reached(default 10000, maybe it was set to 1000)</span>
-<span class="hljs-meta">yarn.job.history.status.address</span>=<span
class="hljs-string">http://localhost:19888/ds/v1/history/mapreduce/jobs/%s</span>
-<span class="hljs-comment">
-# datasource encryption enable</span>
-<span class="hljs-meta">datasource.encryption.enable</span>=<span
class="hljs-string">false</span>
-<span class="hljs-comment">
-# datasource encryption salt</span>
-<span class="hljs-meta">datasource.encryption.salt</span>=<span
class="hljs-string">!@#$%^&*</span>
-<span class="hljs-comment">
-# data quality option</span>
-<span class="hljs-meta">data-quality.jar.name</span>=<span
class="hljs-string">dolphinscheduler-data-quality-dev-SNAPSHOT.jar</span>
-<span class="hljs-comment">
-#data-quality.error.output.path=/tmp/data-quality-error-data</span>
-<span class="hljs-comment">
-# Network IP gets priority, default inner outer</span>
-<span class="hljs-comment">
-# Whether hive SQL is executed in the same session</span>
-<span class="hljs-meta">support.hive.oneSession</span>=<span
class="hljs-string">false</span>
-<span class="hljs-comment">
-# use sudo or not, if set true, executing user is tenant user and deploy user
needs sudo permissions;</span>
-<span class="hljs-comment"># if set false, executing user is the deploy user
and doesn't need sudo permissions</span>
-<span class="hljs-meta">sudo.enable</span>=<span
class="hljs-string">true</span>
-<span class="hljs-comment">
-# network interface preferred like eth0, default: empty</span>
-<span
class="hljs-comment">#dolphin.scheduler.network.interface.preferred=</span>
-<span class="hljs-comment">
-# network IP gets priority, default: inner outer</span>
-<span
class="hljs-comment">#dolphin.scheduler.network.priority.strategy=default</span>
-<span class="hljs-comment">
-# system env path</span>
-<span
class="hljs-comment">#dolphinscheduler.env.path=env/dolphinscheduler_env.sh</span>
-<span class="hljs-comment">
-# development state</span>
-<span class="hljs-meta">development.state</span>=<span
class="hljs-string">false</span>
-<span class="hljs-comment">
-# rpc port</span>
-<span class="hljs-meta">alert.rpc.port</span>=<span
class="hljs-string">50052</span>
-</code></pre>
-<blockquote>
-<p><strong><em>Note:</em></strong></p>
-<ul>
-<li>If only the <code>api-server/conf/common.properties</code> file is
configured, then resource uploading is enabled, but you can not use resources
in task. If you want to use or execute the files in the workflow you need to
configure <code>worker-server/conf/common.properties</code> too.</li>
-<li>If you want to use the resource upload function, the deployment user in <a
href="../installation/standalone.md">installation and deployment</a> must have
relevant operation authority.</li>
-<li>If you using a Hadoop cluster with HA, you need to enable HDFS resource
upload, and you need to copy the <code>core-site.xml</code> and
<code>hdfs-site.xml</code> under the Hadoop cluster to
<code>worker-server/conf</code> and <code>api-server/conf</code>, otherwise
skip this copy step.</li>
-</ul>
-</blockquote>
+ <div id="root"><div class="md2html docs-page" data-reactroot=""><header
class="header-container header-container-dark"><div class="banner-tips"><div>🤔
Have queries regarding Apache DolphinScheduler, Join Slack channel to disscuss
them <a class="link-tips"
href="https://s.apache.org/dolphinscheduler-slack";>join #dolphinscheduler
channel</a>! 🌟</div></div><div class="header-body"><span class="mobile-menu-btn
mobile-menu-btn-dark"></span><a href="/en-us/index.html"><img class="logo"
src=" [...]
+<p>If you need to use <code>Email</code> for alerting, create an alert
instance in the alert instance management and select the Email plugin.
+The following shows the <code>Email</code> configuration example:
+<img src="/img/alert/email-alter-setup1-en.png" alt="alert-email">
+<img src="/img/alert/email-alter-setup2-en.png" alt="alert-email">
+<img src="/img/alert/email-alter-setup3-en.png" alt="alert-email"></p>
</div></section><footer class="footer-container"><div
class="footer-body"><div><h3>About us</h3><h4>Do you need feedback? Please
contact us through the following ways.</h4></div><div
class="contact-container"><ul><li><a
href="/en-us/community/development/subscribe.html"><img class="img-base"
src="/img/emailgray.png"/><img class="img-change"
src="/img/emailblue.png"/><p>Email List</p></a></li><li><a
href="https://twitter.com/dolphinschedule";><img class="img-base"
src="/img/twittergray.png [...]
<script src="/asset/js/react/react-with-addons.min.js"></script>
<script src="/asset/js/react/react-dom.min.js"></script>
diff --git a/en-us/docs/dev/user_doc/guide/alert/email.json
b/en-us/docs/dev/user_doc/guide/alert/email.json
new file mode 100644
index 000000000..df00a75c5
--- /dev/null
+++ b/en-us/docs/dev/user_doc/guide/alert/email.json
@@ -0,0 +1,6 @@
+{
+ "filename": "email.md",
+ "__html": "<h1>Email</h1>\n<p>If you need to use <code>Email</code> for
alerting, create an alert instance in the alert instance management and select
the Email plugin.\nThe following shows the <code>Email</code> configuration
example:\n<img src=\"/img/alert/email-alter-setup1-en.png\"
alt=\"alert-email\">\n<img src=\"/img/alert/email-alter-setup2-en.png\"
alt=\"alert-email\">\n<img src=\"/img/alert/email-alter-setup3-en.png\"
alt=\"alert-email\"></p>\n",
+ "link": "/dist/en-us/docs/dev/user_doc/guide/alert/email.html",
+ "meta": {}
+}
\ No newline at end of file
diff --git a/en-us/docs/dev/user_doc/guide/resource/configuration.html
b/en-us/docs/dev/user_doc/guide/resource/configuration.html
index 001bc011d..c9929e881 100644
--- a/en-us/docs/dev/user_doc/guide/resource/configuration.html
+++ b/en-us/docs/dev/user_doc/guide/resource/configuration.html
@@ -18,7 +18,7 @@
<p>Configure the file in the following paths:
<code>api-server/conf/common.properties</code> and
<code>worker-server/conf/common.properties</code>.</p>
<ul>
<li>Change <code>data.basedir.path</code> to the local directory path. Please
make sure the user who deploy dolphinscheduler have read and write permissions,
such as: <code>data.basedir.path=/tmp/dolphinscheduler</code>. And the
directory you configured will be auto-created if it does not exists.</li>
-<li>Modify the following two parameters,
<code>resource.storage.type=HDFS</code> and
<code>fs.defaultFS=file:///</code>.</li>
+<li>Modify the following two parameters,
<code>resource.storage.type=HDFS</code> and
<code>resource.hdfs.fs.defaultFS=file:///</code>.</li>
</ul>
<h2>HDFS Resource Configuration</h2>
<p>When it is necessary to use the Resource Center to create or upload
relevant files, all files and resources will be stored on HDFS. Therefore the
following configuration is required.</p>
@@ -49,7 +49,24 @@
<span class="hljs-comment">
# resource store on HDFS/S3 path, resource file will store to this hadoop hdfs
path, self configuration,</span>
<span class="hljs-comment"># please make sure the directory exists on hdfs and
have read write permissions. "/dolphinscheduler" is recommended</span>
-<span class="hljs-meta">resource.upload.path</span>=<span
class="hljs-string">/tmp/dolphinscheduler</span>
+<span class="hljs-meta">resource.storage.upload.base.path</span>=<span
class="hljs-string">/tmp/dolphinscheduler</span>
+<span class="hljs-comment">
+# The AWS access key. if resource.storage.type=S3 or use EMR-Task, This
configuration is required</span>
+<span class="hljs-meta">resource.aws.access.key.id</span>=<span
class="hljs-string">minioadmin</span>
+<span class="hljs-comment"># The AWS secret access key. if
resource.storage.type=S3 or use EMR-Task, This configuration is required</span>
+<span class="hljs-meta">resource.aws.secret.access.key</span>=<span
class="hljs-string">minioadmin</span>
+<span class="hljs-comment"># The AWS Region to use. if
resource.storage.type=S3 or use EMR-Task, This configuration is required</span>
+<span class="hljs-meta">resource.aws.region</span>=<span
class="hljs-string">cn-north-1</span>
+<span class="hljs-comment"># The name of the bucket. You need to create them
by yourself. Otherwise, the system cannot start. All buckets in Amazon S3 share
a single namespace; ensure the bucket is given a unique name.</span>
+<span class="hljs-meta">resource.aws.s3.bucket.name</span>=<span
class="hljs-string">dolphinscheduler</span>
+<span class="hljs-comment"># You need to set this parameter when private cloud
s3. If S3 uses public cloud, you only need to set resource.aws.region or set to
the endpoint of a public cloud such as S3.cn-north-1.amazonaws.com.cn</span>
+<span class="hljs-meta">resource.aws.s3.endpoint</span>=<span
class="hljs-string">http://localhost:9000</span>
+<span class="hljs-comment">
+# if resource.storage.type=HDFS, the user must have the permission to create
directories under the HDFS root path</span>
+<span class="hljs-meta">resource.hdfs.root.user</span>=<span
class="hljs-string">root</span>
+<span class="hljs-comment"># if resource.storage.type=S3, the value like:
s3a://dolphinscheduler;</span>
+<span class="hljs-comment"># if resource.storage.type=HDFS and namenode HA is
enabled, you need to copy core-site.xml and hdfs-site.xml to conf dir</span>
+<span class="hljs-meta">resource.hdfs.fs.defaultFS</span>=<span
class="hljs-string">hdfs://localhost:8020</span>
<span class="hljs-comment">
# whether to startup kerberos</span>
<span
class="hljs-meta">hadoop.security.authentication.startup.state</span>=<span
class="hljs-string">false</span>
@@ -67,16 +84,8 @@
<span class="hljs-meta">kerberos.expire.time</span>=<span
class="hljs-string">2</span>
<span class="hljs-comment"># resource view suffixs</span>
<span
class="hljs-comment">#resource.view.suffixs=txt,log,sh,bat,conf,cfg,py,java,sql,xml,hql,properties,json,yml,yaml,ini,js</span>
-<span class="hljs-comment"># if resource.storage.type=HDFS, the user must have
the permission to create directories under the HDFS root path</span>
-<span class="hljs-meta">hdfs.root.user</span>=<span
class="hljs-string">root</span>
-<span class="hljs-comment"># if resource.storage.type=S3, the value like:
s3a://dolphinscheduler;</span>
-<span class="hljs-comment"># if resource.storage.type=HDFS and namenode HA is
enabled, you need to copy core-site.xml and hdfs-site.xml to conf dir</span>
-<span class="hljs-meta">fs.defaultFS</span>=<span
class="hljs-string">hdfs://localhost:8020</span>
-<span class="hljs-meta">aws.access.key.id</span>=<span
class="hljs-string">minioadmin</span>
-<span class="hljs-meta">aws.secret.access.key</span>=<span
class="hljs-string">minioadmin</span>
-<span class="hljs-meta">aws.region</span>=<span
class="hljs-string">us-east-1</span>
-<span class="hljs-meta">aws.endpoint</span>=<span
class="hljs-string">http://localhost:9000</span>
-<span class="hljs-comment"># resourcemanager port, the default value is 8088
if not specified</span>
+<span class="hljs-comment">
+# resourcemanager port, the default value is 8088 if not specified</span>
<span class="hljs-meta">resource.manager.httpaddress.port</span>=<span
class="hljs-string">8088</span>
<span class="hljs-comment"># if resourcemanager HA is enabled, please set the
HA IPs; if resourcemanager is single, keep this value empty</span>
<span class="hljs-meta">yarn.resourcemanager.ha.rm.ids</span>=<span
class="hljs-string">192.168.xx.xx,192.168.xx.xx</span>
diff --git a/en-us/docs/dev/user_doc/guide/resource/configuration.json
b/en-us/docs/dev/user_doc/guide/resource/configuration.json
index 2b07eba0c..22fb56c31 100644
--- a/en-us/docs/dev/user_doc/guide/resource/configuration.json
+++ b/en-us/docs/dev/user_doc/guide/resource/configuration.json
@@ -1,6 +1,6 @@
{
"filename": "configuration.md",
- "__html": "<h1>Configuration</h1>\n<p>The Resource Center is usually used
for operations such as uploading files, UDF functions, and task group
management. You can appoint the local file directory as the upload directory
for a single machine (this operation does not need to deploy Hadoop). Or you
can also upload to a Hadoop or MinIO cluster, at this time, you need to have
Hadoop (2.6+) or MinIO or other related environments.</p>\n<h2>Local File
Resource Configuration</h2>\n<p>For a sin [...]
+ "__html": "<h1>Configuration</h1>\n<p>The Resource Center is usually used
for operations such as uploading files, UDF functions, and task group
management. You can appoint the local file directory as the upload directory
for a single machine (this operation does not need to deploy Hadoop). Or you
can also upload to a Hadoop or MinIO cluster, at this time, you need to have
Hadoop (2.6+) or MinIO or other related environments.</p>\n<h2>Local File
Resource Configuration</h2>\n<p>For a sin [...]
"link": "/dist/en-us/docs/dev/user_doc/guide/resource/configuration.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/release/faq.html b/en-us/docs/release/faq.html
index e9fd0ea0f..ed820d07d 100644
--- a/en-us/docs/release/faq.html
+++ b/en-us/docs/release/faq.html
@@ -49,7 +49,8 @@
<p>Note：<strong>Due to the large number of services, it is recommended that
the single-machine deployment is preferably 4 cores and 16G or
more.</strong></p>
<hr>
<h2>Q: Which mailboxes does the system support?</h2>
-<p>A: Support most mailboxes, qq, 163, 126, 139, outlook, aliyun, etc. are
supported. Support TLS and SSL protocols, optionally configured in
alert.properties</p>
+<p>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:
+<a href="../en/guide/alert/email.md">How to setup email alarm</a>.</p>
<hr>
<h2>Q: What are the common system variable time parameters and how do I use
them?</h2>
<p>A: Please refer to 'System parameter' in the system-manual</p>
@@ -101,7 +102,7 @@ version 1.3 not use grpc, we use netty directly</p>
<p> 2, installPath="/data1_1T/dolphinscheduler", <strong>this
directory can not be the same as the <a href="http://install.sh";>install.sh</a>
directory currently installed with one click.</strong></p>
<p> 3, deployUser = "dolphinscheduler", <strong>the
deployment user must have sudo privileges</strong>, because the worker is
executed by sudo -u tenant sh xxx.command</p>
<p> 4, monitorServerState = "false", whether the service
monitoring script is started, the default is not to start the service
monitoring script. <strong>If the service monitoring script is started, the
master and worker services are monitored every 5 minutes, and if the machine is
down, it will automatically restart.</strong></p>
-<p> 5, hdfsStartupSate="false", whether to enable HDFS
resource upload function. The default is not enabled. <strong>If it is not
enabled, the resource center cannot be used.</strong> If enabled, you need to
configure the configuration of fs.defaultFS and yarn in
conf/common/hadoop/hadoop.properties. If you use namenode HA, you need to copy
core-site.xml and hdfs-site.xml to the conf root directory.</p>
+<p> 5, hdfsStartupSate="false", whether to enable HDFS
resource upload function. The default is not enabled. <strong>If it is not
enabled, the resource center cannot be used.</strong> If enabled, you need to
configure the configuration of resource.hdfs.fs.defaultFS and yarn in
conf/common/hadoop/hadoop.properties. If you use namenode HA, you need to copy
core-site.xml and hdfs-site.xml to the conf root directory.</p>
<p> Note: <strong>The 1.0.x version does not automatically create the hdfs
root directory, you need to create it yourself, and you need to deploy the user
with hdfs operation permission.</strong></p>
<hr>
<h2>Q : Process definition and process instance offline exception</h2>
diff --git a/en-us/docs/release/faq.json b/en-us/docs/release/faq.json
index b257b2dab..2cdbab9e5 100644
--- a/en-us/docs/release/faq.json
+++ b/en-us/docs/release/faq.json
@@ -1,6 +1,6 @@
{
"filename": "faq.md",
- "__html": "<!-- markdown-link-check-disable -->\n<h2>Q: What's the name of
this project?</h2>\n<p>A: DolphinScheduler</p>\n<hr>\n<h2>Q: DolphinScheduler
service introduction and recommended running memory</h2>\n<p>A:
DolphinScheduler consists of 5 services, MasterServer, WorkerServer, ApiServer,
AlertServer, LoggerServer and
UI.</p>\n<table>\n<thead>\n<tr>\n<th>Service</th>\n<th>Description</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>MasterServer</td>\n<td>Mainly
responsible for DAG segm [...]
+ "__html": "<!-- markdown-link-check-disable -->\n<h2>Q: What's the name of
this project?</h2>\n<p>A: DolphinScheduler</p>\n<hr>\n<h2>Q: DolphinScheduler
service introduction and recommended running memory</h2>\n<p>A:
DolphinScheduler consists of 5 services, MasterServer, WorkerServer, ApiServer,
AlertServer, LoggerServer and
UI.</p>\n<table>\n<thead>\n<tr>\n<th>Service</th>\n<th>Description</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>MasterServer</td>\n<td>Mainly
responsible for DAG segm [...]
"link": "/dist/en-us/docs/release/faq.html",
"meta": {}
}
\ No newline at end of file
diff --git a/img/alert/email-alter-setup1-en.png
b/img/alert/email-alter-setup1-en.png
new file mode 100644
index 000000000..d09253de1
Binary files /dev/null and b/img/alert/email-alter-setup1-en.png differ
diff --git a/img/alert/email-alter-setup2-en.png
b/img/alert/email-alter-setup2-en.png
new file mode 100644
index 000000000..ac44c012b
Binary files /dev/null and b/img/alert/email-alter-setup2-en.png differ
diff --git a/img/alert/email-alter-setup3-en.png
b/img/alert/email-alter-setup3-en.png
new file mode 100644
index 000000000..1673d5d96
Binary files /dev/null and b/img/alert/email-alter-setup3-en.png differ
diff --git a/zh-cn/docs/dev/user_doc/architecture/configuration.html
b/zh-cn/docs/dev/user_doc/architecture/configuration.html
index 5ba1e106a..9b1812c91 100644
--- a/zh-cn/docs/dev/user_doc/architecture/configuration.html
+++ b/zh-cn/docs/dev/user_doc/architecture/configuration.html
@@ -374,11 +374,46 @@
<td>资源文件存储类型: HDFS,S3,NONE</td>
</tr>
<tr>
-<td>resource.upload.path</td>
+<td>resource.storage.upload.base.path</td>
<td>/dolphinscheduler</td>
<td>资源文件存储路径</td>
</tr>
<tr>
+<td><a
href="http://resource.aws.access.key.id";>resource.aws.access.key.id</a></td>
+<td>minioadmin</td>
+<td>S3 access key</td>
+</tr>
+<tr>
+<td>resource.aws.secret.access.key</td>
+<td>minioadmin</td>
+<td>S3 secret access key</td>
+</tr>
+<tr>
+<td>resource.aws.region</td>
+<td>us-east-1</td>
+<td>S3 区域</td>
+</tr>
+<tr>
+<td><a
href="http://resource.aws.s3.bucket.name";>resource.aws.s3.bucket.name</a></td>
+<td>dolphinscheduler</td>
+<td>S3 存储桶名称</td>
+</tr>
+<tr>
+<td>resource.aws.s3.endpoint</td>
+<td><a href="http://minio:9000";>http://minio:9000</a></td>
+<td>s3 endpoint地址</td>
+</tr>
+<tr>
+<td>resource.hdfs.root.user</td>
+<td>hdfs</td>
+<td>如果存储类型为HDFS,需要配置拥有对应操作权限的用户</td>
+</tr>
+<tr>
+<td>resource.hdfs.fs.defaultFS</td>
+<td>hdfs://mycluster:8020</td>
+<td>请求地址如果resource.storage.type=S3,该值类似为: s3a://dolphinscheduler.
如果resource.storage.type=HDFS, 如果 hadoop 配置了 HA,需要复制core-site.xml 和
hdfs-site.xml 文件到conf目录</td>
+</tr>
+<tr>
<td>hadoop.security.authentication.startup.state</td>
<td>false</td>
<td>hadoop是否开启kerberos权限</td>
@@ -404,36 +439,6 @@
<td>kerberos过期时间,整数,单位为小时</td>
</tr>
<tr>
-<td>resource.view.suffixs</td>
-<td>txt,log,sh,conf,cfg,py,java,sql,hql,xml,properties</td>
-<td>资源中心支持的文件格式</td>
-</tr>
-<tr>
-<td>hdfs.root.user</td>
-<td>hdfs</td>
-<td>如果存储类型为HDFS,需要配置拥有对应操作权限的用户</td>
-</tr>
-<tr>
-<td>fs.defaultFS</td>
-<td>hdfs://mycluster:8020</td>
-<td>请求地址如果resource.storage.type=S3,该值类似为: s3a://dolphinscheduler.
如果resource.storage.type=HDFS, 如果 hadoop 配置了 HA,需要复制core-site.xml 和
hdfs-site.xml 文件到conf目录</td>
-</tr>
-<tr>
-<td>fs.s3a.endpoint</td>
-<td></td>
-<td>s3 endpoint地址</td>
-</tr>
-<tr>
-<td>fs.s3a.access.key</td>
-<td></td>
-<td>s3 access key</td>
-</tr>
-<tr>
-<td>fs.s3a.secret.key</td>
-<td></td>
-<td>s3 secret key</td>
-</tr>
-<tr>
<td>yarn.resourcemanager.ha.rm.ids</td>
<td></td>
<td>yarn resourcemanager 地址, 如果resourcemanager开启了HA,
输入HA的IP地址(以逗号分隔),如果resourcemanager为单节点, 该值为空即可</td>
@@ -531,7 +536,7 @@
<td>LDAP urls</td>
</tr>
<tr>
-<td>security.authentication.ldap.base.dn</td>
+<td>security.authentication.ldap.base-dn</td>
<td>dc=example,dc=com</td>
<td>LDAP base dn</td>
</tr>
@@ -546,15 +551,20 @@
<td>LDAP密码</td>
</tr>
<tr>
-<td>security.authentication.ldap.user.identity.attribute</td>
+<td>security.authentication.ldap.user.identity-attribute</td>
<td>uid</td>
<td>LDAP用户身份标识字段名</td>
</tr>
<tr>
-<td>security.authentication.ldap.user.email.attribute</td>
+<td>security.authentication.ldap.user.email-attribute</td>
<td>mail</td>
<td>LDAP邮箱字段名</td>
</tr>
+<tr>
+<td>security.authentication.ldap.user.not-exist-action</td>
+<td>CREATE</td>
+<td>当LDAP用户不存在时执行的操作。CREATE：当用户不存在时自动新建用户, DENY：当用户不存在时拒绝登陆</td>
+</tr>
</tbody>
</table>
<h2>6.master.properties [Master服务配置]</h2>
diff --git a/zh-cn/docs/dev/user_doc/architecture/configuration.json
b/zh-cn/docs/dev/user_doc/architecture/configuration.json
index 63cee1bac..dd6889ec2 100644
--- a/zh-cn/docs/dev/user_doc/architecture/configuration.json
+++ b/zh-cn/docs/dev/user_doc/architecture/configuration.json
@@ -1,6 +1,6 @@
{
"filename": "configuration.md",
- "__html": "<!-- markdown-link-check-disable
-->\n<h1>前言</h1>\n<p>本文档为dolphinscheduler配置文件说明文档,针对版本为 dolphinscheduler-1.3.x
版本.</p>\n<h1>目录结构</h1>\n<p>目前dolphinscheduler 所有的配置文件都在 [conf ]
目录中.\n为了更直观的了解[conf]目录所在的位置以及包含的配置文件,请查看下面dolphinscheduler安装目录的简化说明.\n本文主要讲述dolphinscheduler的配置文件.其他部分先不做赘述.</p>\n<p>[注:以下
dolphinscheduler 简称为DS.]</p>\n<pre><code>├── LICENSE\n│\n├── NOTICE\n│\n├──
licenses licenses存放目录\n│\n├── bin
[...]
+ "__html": "<!-- markdown-link-check-disable
-->\n<h1>前言</h1>\n<p>本文档为dolphinscheduler配置文件说明文档,针对版本为 dolphinscheduler-1.3.x
版本.</p>\n<h1>目录结构</h1>\n<p>目前dolphinscheduler 所有的配置文件都在 [conf ]
目录中.\n为了更直观的了解[conf]目录所在的位置以及包含的配置文件,请查看下面dolphinscheduler安装目录的简化说明.\n本文主要讲述dolphinscheduler的配置文件.其他部分先不做赘述.</p>\n<p>[注:以下
dolphinscheduler 简称为DS.]</p>\n<pre><code>├── LICENSE\n│\n├── NOTICE\n│\n├──
licenses licenses存放目录\n│\n├── bin
[...]
"link": "/dist/zh-cn/docs/dev/user_doc/architecture/configuration.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/dev/user_doc/guide/resource/configuration.html
b/zh-cn/docs/dev/user_doc/guide/alert/email.html
similarity index 69%
copy from zh-cn/docs/dev/user_doc/guide/resource/configuration.html
copy to zh-cn/docs/dev/user_doc/guide/alert/email.html
index 04de36eea..9dd1b491c 100644
--- a/zh-cn/docs/dev/user_doc/guide/resource/configuration.html
+++ b/zh-cn/docs/dev/user_doc/guide/alert/email.html
@@ -3,132 +3,19 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0,
maximum-scale=1.0, user-scalable=no">
- <meta name="keywords" content="configuration">
- <meta name="description" content="configuration">
- <title>configuration</title>
+ <meta name="keywords" content="email">
+ <meta name="description" content="email">
+ <title>email</title>
<link rel="shortcut icon" href="/img/favicon.ico">
<link rel="stylesheet" href="/build/vendor.eeae4ed.css">
</head>
<body>
- <div id="root"><div class="md2html docs-page" data-reactroot=""><header
class="header-container header-container-dark"><div class="banner-tips"><div>🤔
有关于 Apache DolphinScheduler 的疑问，加入 Slack 频道来讨论他们 <a class="link-tips"
href="https://s.apache.org/dolphinscheduler-slack";>join #dolphinscheduler
channel</a>! 🌟</div></div><div class="header-body"><span class="mobile-menu-btn
mobile-menu-btn-dark"></span><a href="/zh-cn/index.html"><img class="logo"
src="/img/hlogo_white.svg"/></a><div cla [...]
-<p>资源中心通常用于上传文件、 UDF 函数，以及任务组管理等操作。针对单机环境可以选择本地文件目录作为上传文件夹（此操作不需要部署
Hadoop）。当然也可以选择上传到 Hadoop or MinIO 集群上，此时则需要有 Hadoop（2.6+）或者 MinIOn 等相关环境。</p>
-<h2>本地资源配置</h2>
-<p>在单机环境下，可以选择使用本地文件目录作为上传文件夹（无需部署Hadoop），此时需要进行如下配置：</p>
-<h3>配置 <code>common.properties</code> 文件</h3>
-<p>对以下路径的文件进行配置：<code>api-server/conf/common.properties</code> 和
<code>worker-server/conf/common.properties</code></p>
-<ul>
-<li>将 <code>data.basedir.path</code> 改为本地存储路径，请确保部署 DolphinScheduler
的用户拥有读写权限，例如：<code>data.basedir.path=/tmp/dolphinscheduler</code>。当路径不存在时会自动创建文件夹</li>
-<li>修改下列两个参数，分别是 <code>resource.storage.type=HDFS</code> 和
<code>fs.defaultFS=file:///</code>。</li>
-</ul>
-<h2>HDFS 资源配置</h2>
-<p>当需要使用资源中心进行相关文件的创建或者上传操作时，所有的文件和资源都会被存储在 HDFS 上。所以需要进行以下配置：</p>
-<h3>配置 common.properties 文件</h3>
-<p>在 3.0.0-alpha 版本之后，如果需要使用到资源中心的 HDFS 或 S3
上传资源，我们需要对以下路径的进行配置：<code>api-server/conf/common.properties</code> 和
<code>worker-server/conf/common.properties</code>。可参考如下：</p>
-<pre><code class="language-properties"><span class="hljs-comment">#</span>
-<span class="hljs-comment"># Licensed to the Apache Software Foundation (ASF)
under one or more</span>
-<span class="hljs-comment"># contributor license agreements. See the NOTICE
file distributed with</span>
-<span class="hljs-comment"># this work for additional information regarding
copyright ownership.</span>
-<span class="hljs-comment"># The ASF licenses this file to You under the
Apache License, Version 2.0</span>
-<span class="hljs-comment"># (the "License"); you may not use this
file except in compliance with</span>
-<span class="hljs-comment"># the License. You may obtain a copy of the
License at</span>
-<span class="hljs-comment">#</span>
-<span class="hljs-comment">#
http://www.apache.org/licenses/LICENSE-2.0</span>
-<span class="hljs-comment">#</span>
-<span class="hljs-comment"># Unless required by applicable law or agreed to in
writing, software</span>
-<span class="hljs-comment"># distributed under the License is distributed on
an "AS IS" BASIS,</span>
-<span class="hljs-comment"># WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
either express or implied.</span>
-<span class="hljs-comment"># See the License for the specific language
governing permissions and</span>
-<span class="hljs-comment"># limitations under the License.</span>
-<span class="hljs-comment">#</span>
-<span class="hljs-comment">
-# user data local directory path, please make sure the directory exists and
have read write permissions</span>
-<span class="hljs-meta">data.basedir.path</span>=<span
class="hljs-string">/tmp/dolphinscheduler</span>
-<span class="hljs-comment">
-# resource storage type: HDFS, S3, NONE</span>
-<span class="hljs-meta">resource.storage.type</span>=<span
class="hljs-string">HDFS</span>
-<span class="hljs-comment">
-# resource store on HDFS/S3 path, resource file will store to this hadoop hdfs
path, self configuration,</span>
-<span class="hljs-comment"># please make sure the directory exists on hdfs and
have read write permissions. "/dolphinscheduler" is recommended</span>
-<span class="hljs-meta">resource.upload.path</span>=<span
class="hljs-string">/tmp/dolphinscheduler</span>
-<span class="hljs-comment">
-# whether to startup kerberos</span>
-<span
class="hljs-meta">hadoop.security.authentication.startup.state</span>=<span
class="hljs-string">false</span>
-<span class="hljs-comment">
-# java.security.krb5.conf path</span>
-<span class="hljs-meta">java.security.krb5.conf.path</span>=<span
class="hljs-string">/opt/krb5.conf</span>
-<span class="hljs-comment">
-# login user from keytab username</span>
-<span class="hljs-meta">login.user.keytab.username</span>=<span
class="hljs-string">[email protected]</span>
-<span class="hljs-comment">
-# login user from keytab path</span>
-<span class="hljs-meta">login.user.keytab.path</span>=<span
class="hljs-string">/opt/hdfs.headless.keytab</span>
-<span class="hljs-comment">
-# kerberos expire time, the unit is hour</span>
-<span class="hljs-meta">kerberos.expire.time</span>=<span
class="hljs-string">2</span>
-<span class="hljs-comment"># resource view suffixs</span>
-<span
class="hljs-comment">#resource.view.suffixs=txt,log,sh,bat,conf,cfg,py,java,sql,xml,hql,properties,json,yml,yaml,ini,js</span>
-<span class="hljs-comment"># if resource.storage.type=HDFS, the user must have
the permission to create directories under the HDFS root path</span>
-<span class="hljs-meta">hdfs.root.user</span>=<span
class="hljs-string">root</span>
-<span class="hljs-comment"># if resource.storage.type=S3, the value like:
s3a://dolphinscheduler;</span>
-<span class="hljs-comment"># if resource.storage.type=HDFS and namenode HA is
enabled, you need to copy core-site.xml and hdfs-site.xml to conf dir</span>
-<span class="hljs-meta">fs.defaultFS</span>=<span
class="hljs-string">hdfs://localhost:8020</span>
-<span class="hljs-meta">aws.access.key.id</span>=<span
class="hljs-string">minioadmin</span>
-<span class="hljs-meta">aws.secret.access.key</span>=<span
class="hljs-string">minioadmin</span>
-<span class="hljs-meta">aws.region</span>=<span
class="hljs-string">us-east-1</span>
-<span class="hljs-meta">aws.endpoint</span>=<span
class="hljs-string">http://localhost:9000</span>
-<span class="hljs-comment"># resourcemanager port, the default value is 8088
if not specified</span>
-<span class="hljs-meta">resource.manager.httpaddress.port</span>=<span
class="hljs-string">8088</span>
-<span class="hljs-comment"># if resourcemanager HA is enabled, please set the
HA IPs; if resourcemanager is single, keep this value empty</span>
-<span class="hljs-meta">yarn.resourcemanager.ha.rm.ids</span>=<span
class="hljs-string">192.168.xx.xx,192.168.xx.xx</span>
-<span class="hljs-comment"># if resourcemanager HA is enabled or not use
resourcemanager, please keep the default value;</span>
-<span class="hljs-comment"># If resourcemanager is single, you only need to
replace ds1 to actual resourcemanager hostname</span>
-<span class="hljs-meta">yarn.application.status.address</span>=<span
class="hljs-string">http://localhost:%s/ds/v1/cluster/apps/%s</span>
-<span class="hljs-comment"># job history status url when application number
threshold is reached(default 10000, maybe it was set to 1000)</span>
-<span class="hljs-meta">yarn.job.history.status.address</span>=<span
class="hljs-string">http://localhost:19888/ds/v1/history/mapreduce/jobs/%s</span>
-<span class="hljs-comment">
-# datasource encryption enable</span>
-<span class="hljs-meta">datasource.encryption.enable</span>=<span
class="hljs-string">false</span>
-<span class="hljs-comment">
-# datasource encryption salt</span>
-<span class="hljs-meta">datasource.encryption.salt</span>=<span
class="hljs-string">!@#$%^&*</span>
-<span class="hljs-comment">
-# data quality option</span>
-<span class="hljs-meta">data-quality.jar.name</span>=<span
class="hljs-string">dolphinscheduler-data-quality-dev-SNAPSHOT.jar</span>
-<span class="hljs-comment">
-#data-quality.error.output.path=/tmp/data-quality-error-data</span>
-<span class="hljs-comment">
-# Network IP gets priority, default inner outer</span>
-<span class="hljs-comment">
-# Whether hive SQL is executed in the same session</span>
-<span class="hljs-meta">support.hive.oneSession</span>=<span
class="hljs-string">false</span>
-<span class="hljs-comment">
-# use sudo or not, if set true, executing user is tenant user and deploy user
needs sudo permissions;</span>
-<span class="hljs-comment"># if set false, executing user is the deploy user
and doesn't need sudo permissions</span>
-<span class="hljs-meta">sudo.enable</span>=<span
class="hljs-string">true</span>
-<span class="hljs-comment">
-# network interface preferred like eth0, default: empty</span>
-<span
class="hljs-comment">#dolphin.scheduler.network.interface.preferred=</span>
-<span class="hljs-comment">
-# network IP gets priority, default: inner outer</span>
-<span
class="hljs-comment">#dolphin.scheduler.network.priority.strategy=default</span>
-<span class="hljs-comment">
-# system env path</span>
-<span
class="hljs-comment">#dolphinscheduler.env.path=env/dolphinscheduler_env.sh</span>
-<span class="hljs-comment">
-# development state</span>
-<span class="hljs-meta">development.state</span>=<span
class="hljs-string">false</span>
-<span class="hljs-comment">
-# rpc port</span>
-<span class="hljs-meta">alert.rpc.port</span>=<span
class="hljs-string">50052</span>
-</code></pre>
-<blockquote>
-<p><strong>注意</strong>：</p>
-<ul>
-<li>如果只配置了 <code>api-server/conf/common.properties</code>
的文件，则只是开启了资源上传的操作，并不能满足正常使用。如果想要在工作流中执行相关文件则需要额外配置
<code>worker-server/conf/common.properties</code>。</li>
-<li>如果用到资源上传的功能，那么<a
href="../installation/standalone.md">安装部署</a>中，部署用户需要有这部分的操作权限。</li>
-<li>如果 Hadoop 集群的 NameNode 配置了 HA 的话，需要开启 HDFS 类型的资源上传，同时需要将 Hadoop 集群下的
<code>core-site.xml</code> 和 <code>hdfs-site.xml</code> 复制到
<code>worker-server/conf</code> 以及 <code>api-server/conf</code>，非 NameNode HA
跳过次步骤。</li>
-</ul>
-</blockquote>
+ <div id="root"><div class="md2html docs-page" data-reactroot=""><header
class="header-container header-container-dark"><div class="banner-tips"><div>🤔
有关于 Apache DolphinScheduler 的疑问，加入 Slack 频道来讨论他们 <a class="link-tips"
href="https://s.apache.org/dolphinscheduler-slack";>join #dolphinscheduler
channel</a>! 🌟</div></div><div class="header-body"><span class="mobile-menu-btn
mobile-menu-btn-dark"></span><a href="/zh-cn/index.html"><img class="logo"
src="/img/hlogo_white.svg"/></a><div cla [...]
+<p>如果需要使用<code>Email</code>进行告警，请在告警实例管理中创建告警实例，并选择Email插件。
+下面显示了 <code>Email</code> 配置示例：:
+<img src="/img/alert/email-alter-setup1-en.png" alt="alert-email">
+<img src="/img/alert/email-alter-setup2-en.png" alt="alert-email">
+<img src="/img/alert/email-alter-setup3-en.png" alt="alert-email"></p>
</div></section><footer class="footer-container"><div
class="footer-body"><div><h3>联系我们</h3><h4>有问题需要反馈？请通过以下方式联系我们。</h4></div><div
class="contact-container"><ul><li><a
href="/zh-cn/community/development/subscribe.html"><img class="img-base"
src="/img/emailgray.png"/><img class="img-change"
src="/img/emailblue.png"/><p>邮件列表</p></a></li><li><a
href="https://twitter.com/dolphinschedule";><img class="img-base"
src="/img/twittergray.png"/><img class="img-change"
src="/img/twitterblue.png"/><p [...]
<script src="/asset/js/react/react-with-addons.min.js"></script>
<script src="/asset/js/react/react-dom.min.js"></script>
diff --git a/zh-cn/docs/dev/user_doc/guide/alert/email.json
b/zh-cn/docs/dev/user_doc/guide/alert/email.json
new file mode 100644
index 000000000..6787b58c5
--- /dev/null
+++ b/zh-cn/docs/dev/user_doc/guide/alert/email.json
@@ -0,0 +1,6 @@
+{
+ "filename": "email.md",
+ "__html":
"<h1>Email</h1>\n<p>如果需要使用<code>Email</code>进行告警，请在告警实例管理中创建告警实例，并选择Email插件。\n下面显示了
<code>Email</code> 配置示例：:\n<img src=\"/img/alert/email-alter-setup1-en.png\"
alt=\"alert-email\">\n<img src=\"/img/alert/email-alter-setup2-en.png\"
alt=\"alert-email\">\n<img src=\"/img/alert/email-alter-setup3-en.png\"
alt=\"alert-email\"></p>\n",
+ "link": "/dist/zh-cn/docs/dev/user_doc/guide/alert/email.html",
+ "meta": {}
+}
\ No newline at end of file
diff --git a/zh-cn/docs/dev/user_doc/guide/resource/configuration.html
b/zh-cn/docs/dev/user_doc/guide/resource/configuration.html
index 04de36eea..494cb45e8 100644
--- a/zh-cn/docs/dev/user_doc/guide/resource/configuration.html
+++ b/zh-cn/docs/dev/user_doc/guide/resource/configuration.html
@@ -18,7 +18,7 @@
<p>对以下路径的文件进行配置：<code>api-server/conf/common.properties</code> 和
<code>worker-server/conf/common.properties</code></p>
<ul>
<li>将 <code>data.basedir.path</code> 改为本地存储路径，请确保部署 DolphinScheduler
的用户拥有读写权限，例如：<code>data.basedir.path=/tmp/dolphinscheduler</code>。当路径不存在时会自动创建文件夹</li>
-<li>修改下列两个参数，分别是 <code>resource.storage.type=HDFS</code> 和
<code>fs.defaultFS=file:///</code>。</li>
+<li>修改下列两个参数，分别是 <code>resource.storage.type=HDFS</code> 和
<code>resource.hdfs.fs.defaultFS=file:///</code>。</li>
</ul>
<h2>HDFS 资源配置</h2>
<p>当需要使用资源中心进行相关文件的创建或者上传操作时，所有的文件和资源都会被存储在 HDFS 上。所以需要进行以下配置：</p>
@@ -49,7 +49,24 @@
<span class="hljs-comment">
# resource store on HDFS/S3 path, resource file will store to this hadoop hdfs
path, self configuration,</span>
<span class="hljs-comment"># please make sure the directory exists on hdfs and
have read write permissions. "/dolphinscheduler" is recommended</span>
-<span class="hljs-meta">resource.upload.path</span>=<span
class="hljs-string">/tmp/dolphinscheduler</span>
+<span class="hljs-meta">resource.storage.upload.base.path</span>=<span
class="hljs-string">/tmp/dolphinscheduler</span>
+<span class="hljs-comment">
+# The AWS access key. if resource.storage.type=S3 or use EMR-Task, This
configuration is required</span>
+<span class="hljs-meta">resource.aws.access.key.id</span>=<span
class="hljs-string">minioadmin</span>
+<span class="hljs-comment"># The AWS secret access key. if
resource.storage.type=S3 or use EMR-Task, This configuration is required</span>
+<span class="hljs-meta">resource.aws.secret.access.key</span>=<span
class="hljs-string">minioadmin</span>
+<span class="hljs-comment"># The AWS Region to use. if
resource.storage.type=S3 or use EMR-Task, This configuration is required</span>
+<span class="hljs-meta">resource.aws.region</span>=<span
class="hljs-string">cn-north-1</span>
+<span class="hljs-comment"># The name of the bucket. You need to create them
by yourself. Otherwise, the system cannot start. All buckets in Amazon S3 share
a single namespace; ensure the bucket is given a unique name.</span>
+<span class="hljs-meta">resource.aws.s3.bucket.name</span>=<span
class="hljs-string">dolphinscheduler</span>
+<span class="hljs-comment"># You need to set this parameter when private cloud
s3. If S3 uses public cloud, you only need to set resource.aws.region or set to
the endpoint of a public cloud such as S3.cn-north-1.amazonaws.com.cn</span>
+<span class="hljs-meta">resource.aws.s3.endpoint</span>=<span
class="hljs-string">http://localhost:9000</span>
+<span class="hljs-comment">
+# if resource.storage.type=HDFS, the user must have the permission to create
directories under the HDFS root path</span>
+<span class="hljs-meta">resource.hdfs.root.user</span>=<span
class="hljs-string">root</span>
+<span class="hljs-comment"># if resource.storage.type=S3, the value like:
s3a://dolphinscheduler;</span>
+<span class="hljs-comment"># if resource.storage.type=HDFS and namenode HA is
enabled, you need to copy core-site.xml and hdfs-site.xml to conf dir</span>
+<span class="hljs-meta">resource.hdfs.fs.defaultFS</span>=<span
class="hljs-string">hdfs://localhost:8020</span>
<span class="hljs-comment">
# whether to startup kerberos</span>
<span
class="hljs-meta">hadoop.security.authentication.startup.state</span>=<span
class="hljs-string">false</span>
@@ -67,16 +84,8 @@
<span class="hljs-meta">kerberos.expire.time</span>=<span
class="hljs-string">2</span>
<span class="hljs-comment"># resource view suffixs</span>
<span
class="hljs-comment">#resource.view.suffixs=txt,log,sh,bat,conf,cfg,py,java,sql,xml,hql,properties,json,yml,yaml,ini,js</span>
-<span class="hljs-comment"># if resource.storage.type=HDFS, the user must have
the permission to create directories under the HDFS root path</span>
-<span class="hljs-meta">hdfs.root.user</span>=<span
class="hljs-string">root</span>
-<span class="hljs-comment"># if resource.storage.type=S3, the value like:
s3a://dolphinscheduler;</span>
-<span class="hljs-comment"># if resource.storage.type=HDFS and namenode HA is
enabled, you need to copy core-site.xml and hdfs-site.xml to conf dir</span>
-<span class="hljs-meta">fs.defaultFS</span>=<span
class="hljs-string">hdfs://localhost:8020</span>
-<span class="hljs-meta">aws.access.key.id</span>=<span
class="hljs-string">minioadmin</span>
-<span class="hljs-meta">aws.secret.access.key</span>=<span
class="hljs-string">minioadmin</span>
-<span class="hljs-meta">aws.region</span>=<span
class="hljs-string">us-east-1</span>
-<span class="hljs-meta">aws.endpoint</span>=<span
class="hljs-string">http://localhost:9000</span>
-<span class="hljs-comment"># resourcemanager port, the default value is 8088
if not specified</span>
+<span class="hljs-comment">
+# resourcemanager port, the default value is 8088 if not specified</span>
<span class="hljs-meta">resource.manager.httpaddress.port</span>=<span
class="hljs-string">8088</span>
<span class="hljs-comment"># if resourcemanager HA is enabled, please set the
HA IPs; if resourcemanager is single, keep this value empty</span>
<span class="hljs-meta">yarn.resourcemanager.ha.rm.ids</span>=<span
class="hljs-string">192.168.xx.xx,192.168.xx.xx</span>
diff --git a/zh-cn/docs/dev/user_doc/guide/resource/configuration.json
b/zh-cn/docs/dev/user_doc/guide/resource/configuration.json
index 781e6e5df..06bfe6919 100644
--- a/zh-cn/docs/dev/user_doc/guide/resource/configuration.json
+++ b/zh-cn/docs/dev/user_doc/guide/resource/configuration.json
@@ -1,6 +1,6 @@
{
"filename": "configuration.md",
- "__html": "<h1>资源中心配置详情</h1>\n<p>资源中心通常用于上传文件、 UDF
函数，以及任务组管理等操作。针对单机环境可以选择本地文件目录作为上传文件夹（此操作不需要部署 Hadoop）。当然也可以选择上传到 Hadoop or
MinIO 集群上，此时则需要有 Hadoop（2.6+）或者 MinIOn
等相关环境。</p>\n<h2>本地资源配置</h2>\n<p>在单机环境下，可以选择使用本地文件目录作为上传文件夹（无需部署Hadoop），此时需要进行如下配置：</p>\n<h3>配置
<code>common.properties</code>
文件</h3>\n<p>对以下路径的文件进行配置：<code>api-server/conf/common.properties</code> 和
<code>worker-server/conf/common.properties</code></p>\n<ul>\n<li>将
<code>data.basedir.path</code> 改为本地存储路径，请确保部署 DolphinSche [...]
+ "__html": "<h1>资源中心配置详情</h1>\n<p>资源中心通常用于上传文件、 UDF
函数，以及任务组管理等操作。针对单机环境可以选择本地文件目录作为上传文件夹（此操作不需要部署 Hadoop）。当然也可以选择上传到 Hadoop or
MinIO 集群上，此时则需要有 Hadoop（2.6+）或者 MinIOn
等相关环境。</p>\n<h2>本地资源配置</h2>\n<p>在单机环境下，可以选择使用本地文件目录作为上传文件夹（无需部署Hadoop），此时需要进行如下配置：</p>\n<h3>配置
<code>common.properties</code>
文件</h3>\n<p>对以下路径的文件进行配置：<code>api-server/conf/common.properties</code> 和
<code>worker-server/conf/common.properties</code></p>\n<ul>\n<li>将
<code>data.basedir.path</code> 改为本地存储路径，请确保部署 DolphinSche [...]
"link": "/dist/zh-cn/docs/dev/user_doc/guide/resource/configuration.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/release/faq.html b/zh-cn/docs/release/faq.html
index 679ca98ec..24667055c 100644
--- a/zh-cn/docs/release/faq.html
+++ b/zh-cn/docs/release/faq.html
@@ -49,7 +49,8 @@
<p>注意：<strong>由于服务比较多，建议单机部署最好是 4 核 16G 以上</strong></p>
<hr>
<h2>Q：系统支持哪些邮箱？</h2>
-<p>A：支持绝大多数邮箱，qq、163、126、139、outlook、aliyun 等皆支持。支持 <strong>TLS 和 SSL</strong>
协议，可以在 alert.properties 中选择性配置</p>
+<p>A：支持绝大多数邮箱，qq、163、126、139、outlook、aliyun 等皆支持。支持 <strong>TLS 和 SSL</strong>
协议，可以在dolphinscheduler的ui中进行配置：
+<a href="../zh/guide/alert/email.md">如何配置邮箱告警</a>。</p>
<hr>
<h2>Q：常用的系统变量时间参数有哪些，如何使用？</h2>
<p>A：请参考<a
href="https://dolphinscheduler.apache.org/zh-cn/docs/latest/user_doc/guide/parameter/built-in.html";>使用手册</a>
第8小节</p>
@@ -96,7 +97,7 @@
<p>
2，installPath="/data1_1T/dolphinscheduler"，<strong>这个目录不能和当前要一键安装的 <a
href="http://install.sh";>install.sh</a> 目录是一样的</strong></p>
<p> 3，deployUser="dolphinscheduler"，<strong>部署用户必须具有 sudo
权限</strong>，因为 worker 是通过 sudo -u 租户 sh xxx.command 进行执行的</p>
<p>
4，monitorServerState="false"，服务监控脚本是否启动，默认是不启动服务监控脚本的。<strong>如果启动服务监控脚本，则每
5 分钟定时来监控 master 和 worker 的服务是否 down 机，如果 down 机则会自动重启</strong></p>
-<p> 5，hdfsStartupSate="false"，是否开启 HDFS
资源上传功能。默认是不开启的，<strong>如果不开启则资源中心是不能使用的</strong>。如果开启，需要
conf/common/hadoop/hadoop.properties 中配置 fs.defaultFS 和 yarn 的相关配置，如果使用
namenode HA，需要将 core-site.xml 和 hdfs-site.xml 复制到conf根目录下</p>
+<p> 5，hdfsStartupSate="false"，是否开启 HDFS
资源上传功能。默认是不开启的，<strong>如果不开启则资源中心是不能使用的</strong>。如果开启，需要
conf/common/hadoop/hadoop.properties 中配置 resource.hdfs.fs.defaultFS 和 yarn
的相关配置，如果使用 namenode HA，需要将 core-site.xml 和 hdfs-site.xml 复制到conf根目录下</p>
<p> 注意：<strong>1.0.x 版本是不会自动创建 hdfs
根目录的，需要自行创建，并且需要部署用户有hdfs的操作权限</strong></p>
<hr>
<h2>Q：流程定义和流程实例下线异常</h2>
diff --git a/zh-cn/docs/release/faq.json b/zh-cn/docs/release/faq.json
index 083ec9ca3..dc4dcaec3 100644
--- a/zh-cn/docs/release/faq.json
+++ b/zh-cn/docs/release/faq.json
@@ -1,6 +1,6 @@
{
"filename": "faq.md",
- "__html": "<!-- markdown-link-check-disable
-->\n<h2>Q：项目的名称是？</h2>\n<p>A：DolphinScheduler</p>\n<hr>\n<h2>Q：DolphinScheduler
服务介绍及建议运行内存</h2>\n<p>A：DolphinScheduler 由 5
个服务组成，MasterServer、WorkerServer、ApiServer、AlertServer、LoggerServer 和
UI。</p>\n<table>\n<thead>\n<tr>\n<th>服务</th>\n<th>说明</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>MasterServer</td>\n<td>主要负责
<strong>DAG</strong>
的切分和任务状态的监控</td>\n</tr>\n<tr>\n<td>WorkerServer/LoggerServer</td>\n<td>主要负责任务的提交、执行和任务状态的更新。LoggerServer
用于 [...]
+ "__html": "<!-- markdown-link-check-disable
-->\n<h2>Q：项目的名称是？</h2>\n<p>A：DolphinScheduler</p>\n<hr>\n<h2>Q：DolphinScheduler
服务介绍及建议运行内存</h2>\n<p>A：DolphinScheduler 由 5
个服务组成，MasterServer、WorkerServer、ApiServer、AlertServer、LoggerServer 和
UI。</p>\n<table>\n<thead>\n<tr>\n<th>服务</th>\n<th>说明</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>MasterServer</td>\n<td>主要负责
<strong>DAG</strong>
的切分和任务状态的监控</td>\n</tr>\n<tr>\n<td>WorkerServer/LoggerServer</td>\n<td>主要负责任务的提交、执行和任务状态的更新。LoggerServer
用于 [...]
"link": "/dist/zh-cn/docs/release/faq.html",
"meta": {}
}
\ No newline at end of file
