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 f971f2e Automated deployment: 1a7cac94f5a521a83abfd16949c2206faee8812d
f971f2e is described below
commit f971f2e3e59ecd7cbbf95a95cd8771f24612e71c
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Mar 16 10:14:04 2022 +0000
Automated deployment: 1a7cac94f5a521a83abfd16949c2206faee8812d
---
.../dev/user_doc/guide/expansion-reduction.html | 64 ++++++-------
.../dev/user_doc/guide/expansion-reduction.json | 2 +-
en-us/docs/dev/user_doc/guide/flink-call.html | 19 ++--
en-us/docs/dev/user_doc/guide/flink-call.json | 2 +-
en-us/docs/dev/user_doc/guide/introduction.html | 2 +-
en-us/docs/dev/user_doc/guide/introduction.json | 2 +-
en-us/docs/dev/user_doc/guide/monitor.html | 12 +--
en-us/docs/dev/user_doc/guide/monitor.json | 2 +-
en-us/docs/dev/user_doc/guide/open-api.html | 20 ++--
en-us/docs/dev/user_doc/guide/open-api.json | 2 +-
en-us/docs/dev/user_doc/guide/quick-start.html | 52 ++++++-----
en-us/docs/dev/user_doc/guide/quick-start.json | 2 +-
en-us/docs/dev/user_doc/guide/resource.html | 103 +++++++++++----------
en-us/docs/dev/user_doc/guide/resource.json | 2 +-
en-us/docs/dev/user_doc/guide/security.html | 76 +++++++--------
en-us/docs/dev/user_doc/guide/security.json | 2 +-
en-us/docs/dev/user_doc/guide/upgrade.html | 30 +++---
en-us/docs/dev/user_doc/guide/upgrade.json | 2 +-
img/video_cover/quick-use.png | Bin 0 -> 546414 bytes
zh-cn/docs/dev/user_doc/guide/introduction.html | 2 +-
zh-cn/docs/dev/user_doc/guide/introduction.json | 2 +-
21 files changed, 208 insertions(+), 192 deletions(-)
diff --git a/en-us/docs/dev/user_doc/guide/expansion-reduction.html
b/en-us/docs/dev/user_doc/guide/expansion-reduction.html
index 9447613..6990677 100644
--- a/en-us/docs/dev/user_doc/guide/expansion-reduction.html
+++ b/en-us/docs/dev/user_doc/guide/expansion-reduction.html
@@ -14,21 +14,21 @@
<h2>Expansion</h2>
<p>This article describes how to add a new master service or worker service to
an existing DolphinScheduler cluster.</p>
<pre><code> Attention: There cannot be more than one master service process or
worker service process on a physical machine.
- If the physical machine where the expansion master or worker node is
located has already installed the scheduled service, skip to [1.4 Modify
configuration] Edit the configuration file `conf/config/install_config.conf` on
**all ** nodes, add masters or workers parameter, and restart the scheduling
cluster.
+ If the physical machine which locate the expansion master or worker
node has already installed the scheduled service, check the [1.4 Modify
configuration] and edit the configuration file
`conf/config/install_config.conf` on ** all ** nodes, add masters or workers
parameter, and restart the scheduling cluster.
</code></pre>
<h3>Basic software installation</h3>
<ul>
-<li>[required] <a
href="https://www.oracle.com/technetwork/java/javase/downloads/index.html";>JDK</a>
(1.8+):Must be installed, please install and configure JAVA_HOME and PATH
variables under /etc/profile</li>
+<li>[required] <a
href="https://www.oracle.com/technetwork/java/javase/downloads/index.html";>JDK</a>
(version 1.8+): must install, install and configure <code>JAVA_HOME</code> and
<code>PATH</code> variables under <code>/etc/profile</code></li>
<li>[optional] If the expansion is a worker node, you need to consider whether
to install an external client, such as Hadoop, Hive, Spark Client.</li>
</ul>
<pre><code class="language-markdown"> Attention: DolphinScheduler itself does
not depend on Hadoop, Hive, Spark, but will only call their Client for the
corresponding task submission.
</code></pre>
<h3>Get Installation Package</h3>
<ul>
-<li>Check which version of DolphinScheduler is used in your existing
environment, and get the installation package of the corresponding version, if
the versions are different, there may be compatibility problems.</li>
-<li>Confirm the unified installation directory of other nodes, this article
assumes that DolphinScheduler is installed in /opt/ directory, and the full
path is /opt/dolphinscheduler.</li>
-<li>Please download the corresponding version of the installation package to
the server installation directory, uncompress it and rename it to
dolphinscheduler and store it in the /opt directory.</li>
-<li>Add database dependency package, this article uses Mysql database, add
mysql-connector-java driver package to /opt/dolphinscheduler/lib directory.</li>
+<li>Check the version of DolphinScheduler used in your existing environment,
and get the installation package of the corresponding version, if the versions
are different, there may be compatibility problems.</li>
+<li>Confirm the unified installation directory of other nodes, this article
assumes that DolphinScheduler is installed in <code>/opt/</code> directory, and
the full path is <code>/opt/dolphinscheduler</code>.</li>
+<li>Please download the corresponding version of the installation package to
the server installation directory, uncompress it and rename it to
<code>dolphinscheduler</code> and store it in the <code>/opt</code>
directory.</li>
+<li>Add database dependency package, this document uses Mysql database, add
<code>mysql-connector-java</code> driver package to
<code>/opt/dolphinscheduler/lib</code> directory.</li>
</ul>
<pre><code class="language-shell"><span class="hljs-meta">#</span><span
class="bash"> create the installation directory, please <span
class="hljs-keyword">do</span> not create the installation directory <span
class="hljs-keyword">in</span> /root, /home and other high privilege
directories</span>
mkdir -p /opt
@@ -38,16 +38,16 @@ tar -zxvf apache-dolphinscheduler-1.3.8-bin.tar.gz -C /opt
cd /opt
mv apache-dolphinscheduler-1.3.8-bin dolphinscheduler
</code></pre>
-<pre><code class="language-markdown"> Attention: The installation package can
be copied directly from an existing environment to an expanded physical machine
for use.
+<pre><code class="language-markdown"> Attention: You can copy the installation
package directly from an existing environment to an expanded physical machine.
</code></pre>
<h3>Create Deployment Users</h3>
<ul>
-<li>Create deployment users on <strong>all</strong> expansion machines, and be
sure to configure sudo-free. If we plan to deploy scheduling on four expansion
machines, ds1, ds2, ds3, and ds4, we first need to create deployment users on
each machine</li>
+<li>Create deployment user on <strong>all</strong> expansion machines, and
make sure to configure sudo-free. If we plan to deploy scheduling on four
expansion machines, ds1, ds2, ds3, and ds4, create deployment users on each
machine is prerequisite.</li>
</ul>
-<pre><code class="language-shell"><span class="hljs-meta">#</span><span
class="bash"> to create a user, you need to <span
class="hljs-built_in">log</span> <span class="hljs-keyword">in</span> with root
and <span class="hljs-built_in">set</span> the deployment user name, please
modify it yourself, later take dolphinscheduler as an example</span>
+<pre><code class="language-shell"><span class="hljs-meta">#</span><span
class="bash"> to create a user, you need to <span
class="hljs-built_in">log</span> <span class="hljs-keyword">in</span> with root
and <span class="hljs-built_in">set</span> the deployment user name, modify it
by yourself, the following take `dolphinscheduler` as an example:</span>
useradd dolphinscheduler;
<span class="hljs-meta">
-#</span><span class="bash"> <span class="hljs-built_in">set</span> the user
password, please change it by yourself, later take dolphinscheduler123 as an
example</span>
+#</span><span class="bash"> <span class="hljs-built_in">set</span> the user
password, please change it by yourself, the following take
`dolphinscheduler123` as an example</span>
echo "dolphinscheduler123" | passwd --stdin dolphinscheduler
<span class="hljs-meta">
#</span><span class="bash"> configure sudo password-free</span>
@@ -56,14 +56,14 @@ sed -i 's/Defaults requirett/#Defaults
requirett/g' /etc/sudoers
</code></pre>
<pre><code class="language-markdown"> Attention:
-<span class="hljs-bullet"> -</span> Since it is sudo -u {linux-user} to switch
between different Linux users to run multi-tenant jobs, the deploying user
needs to have sudo privileges and be password free.
-<span class="hljs-bullet"> -</span> If you find the line "Default
requiretty" in the /etc/sudoers file, please also comment it out.
-<span class="hljs-bullet"> -</span> If resource uploads are used, you also
need to assign read and write permissions to the deployment user on <span
class="hljs-code">`HDFS or MinIO`</span>.
+<span class="hljs-bullet"> -</span> Since it is <span class="hljs-code">`sudo
-u {linux-user}`</span> to switch between different Linux users to run
multi-tenant jobs, the deploying user needs to have sudo privileges and be
password free.
+<span class="hljs-bullet"> -</span> If you find the line <span
class="hljs-code">`Default requiretty`</span> in the <span
class="hljs-code">`/etc/sudoers`</span> file, please also comment it out.
+<span class="hljs-bullet"> -</span> If have needs to use resource uploads, you
also need to assign read and write permissions to the deployment user on <span
class="hljs-code">`HDFS or MinIO`</span>.
</code></pre>
<h3>Modify Configuration</h3>
<ul>
<li>
-<p>From an existing node such as Master/Worker, copy the conf directory
directly to replace the conf directory in the new node. After copying, check if
the configuration items are correct.</p>
+<p>From an existing node such as <code>Master/Worker</code>, copy the
configuration directory directly to replace the configuration directory in the
new node. After finishing the file copy, check whether the configuration items
are correct.</p>
<pre><code class="language-markdown">Highlights:
datasource.properties: database connection information
zookeeper.properties: information for connecting zk
@@ -72,7 +72,7 @@ env/dolphinscheduler<span class="hljs-emphasis">_env.sh:
environment Variables
</span></code></pre>
</li>
<li>
-<p>Modify the <code>dolphinscheduler_env.sh</code> environment variable in the
conf/env directory according to the machine configuration (take the example
that the software used is installed in /opt/soft)</p>
+<p>Modify the <code>dolphinscheduler_env.sh</code> environment variable in the
<code>conf/env</code> directory according to the machine configuration (the
following is the example that all the used software install under
<code>/opt/soft</code>)</p>
<pre><code class="language-shell"> export HADOOP_HOME=/opt/soft/hadoop
export HADOOP_CONF_DIR=/opt/soft/hadoop/etc/hadoop
# export SPARK_HOME1=/opt/soft/spark1
@@ -85,18 +85,18 @@ env/dolphinscheduler<span class="hljs-emphasis">_env.sh:
environment Variables
export
PATH=$HADOOP_HOME/bin:$SPARK_HOME2/bin:$PYTHON_HOME:$JAVA_HOME/bin:$HIVE_HOME/bin:$PATH:$FLINK_HOME/bin:$DATAX_HOME:$PATH
</code></pre>
-<p><code>Attention: This step is very important, such as JAVA_HOME and PATH is
necessary to configure, not used can be ignored or commented out</code></p>
+<p><code>Attention: This step is very important, such
as</code>JAVA_HOME<code>and</code>PATH<code>is necessary to configure if haven
not used just ignore or comment out</code></p>
</li>
<li>
-<p>Softlink the JDK to /usr/bin/java (still using JAVA_HOME=/opt/soft/java as
an example)</p>
+<p>Soft link the <code>JDK</code> to <code>/usr/bin/java</code> (still using
<code>JAVA_HOME=/opt/soft/java</code> as an example)</p>
<pre><code class="language-shell">sudo ln -s /opt/soft/java/bin/java
/usr/bin/java
</code></pre>
</li>
<li>
<p>Modify the configuration file <code>conf/config/install_config.conf</code>
on the <strong>all</strong> nodes, synchronizing the following
configuration.</p>
<ul>
-<li>To add a new master node, you need to modify the ips and masters
parameters.</li>
-<li>To add a new worker node, modify the ips and workers parameters.</li>
+<li>To add a new master node, you need to modify the IPs and masters
parameters.</li>
+<li>To add a new worker node, modify the IPs and workers parameters.</li>
</ul>
</li>
</ul>
@@ -115,17 +115,17 @@ workers="existing worker01:default,existing
worker02:default,ds3:default,ds
</code></pre>
<ul>
<li>
-<p>If the expansion is for worker nodes, you need to set the worker group.
Please refer to the security <a href="./security.md">Worker grouping</a></p>
+<p>If the expansion is for worker nodes, you need to set the worker group,
refer to the security of the <a href="./security.md">Worker grouping</a></p>
</li>
<li>
-<p>On all new nodes, change the directory permissions so that the deployment
user has access to the dolphinscheduler directory</p>
+<p>On all new nodes, change the directory permissions so that the deployment
user has access to the DolphinScheduler directory</p>
</li>
</ul>
<pre><code class="language-shell">sudo chown -R
dolphinscheduler:dolphinscheduler dolphinscheduler
</code></pre>
<h3>Restart the Cluster and Verify</h3>
<ul>
-<li>restart the cluster</li>
+<li>Restart the cluster</li>
</ul>
<pre><code class="language-shell"><span class="hljs-meta">#</span><span
class="bash"> stop <span class="hljs-built_in">command</span>:</span>
@@ -146,24 +146,24 @@ sh bin/dolphinscheduler-daemon.sh start api-server #
start api service
sh bin/dolphinscheduler-daemon.sh start alert-server # start alert service
</code></pre>
-<pre><code> Attention: When using stop-all.sh or stop-all.sh, if the physical
machine executing the command is not configured to be ssh-free on all machines,
it will prompt for the password
+<pre><code> Attention: When using `stop-all.sh` or `stop-all.sh`, if the
physical machine execute the command is not configured to be ssh-free on all
machines, it will prompt to enter the password
</code></pre>
<ul>
-<li>After the script is completed, use the <code>jps</code> command to see if
each node service is started (<code>jps</code> comes with the <code>Java
JDK</code>)</li>
+<li>After completing the script, use the <code>jps</code> command to see if
every node service is started (<code>jps</code> comes with the <code>Java
JDK</code>)</li>
</ul>
<pre><code> MasterServer ----- master service
WorkerServer ----- worker service
ApiApplicationServer ----- api service
AlertServer ----- alert service
</code></pre>
-<p>After successful startup, you can view the logs, which are stored in the
logs folder.</p>
+<p>After successful startup, you can view the logs, which are stored in the
<code>logs</code> folder.</p>
<pre><code class="language-Log"> logs/
├── dolphinscheduler-alert-server.log
├── dolphinscheduler-master-server.log
├── dolphinscheduler-worker-server.log
├── dolphinscheduler-api-server.log
</code></pre>
-<p>If the above services are started normally and the scheduling system page
is normal, check whether there is an expanded Master or Worker service in the
[Monitor] of the web system. If it exists, the expansion is complete.</p>
+<p>If the above services start normally and the scheduling system page is
normal, check whether there is an expanded Master or Worker service in the
[Monitor] of the web system. If it exists, the expansion is complete.</p>
<hr>
<h2>Reduction</h2>
<p>The reduction is to reduce the master or worker services for the existing
DolphinScheduler cluster.
@@ -171,7 +171,7 @@ There are two steps for shrinking. After performing the
following two steps, the
<h3>Stop the Service on the Scaled-Down Node</h3>
<ul>
<li>If you are scaling down the master node, identify the physical machine
where the master service is located, and stop the master service on the
physical machine.</li>
-<li>If the worker node is scaled down, determine the physical machine where
the worker service is to be scaled down and stop the worker services on the
physical machine.</li>
+<li>If scale down the worker node, determine the physical machine where the
worker service scale down and stop the worker services on the physical
machine.</li>
</ul>
<pre><code class="language-shell"><span class="hljs-meta">#</span><span
class="bash"> stop <span class="hljs-built_in">command</span>:</span>
bin/stop-all.sh # stop all services
@@ -191,24 +191,24 @@ sh bin/dolphinscheduler-daemon.sh start api-server #
start api service
sh bin/dolphinscheduler-daemon.sh start alert-server # start alert service
</code></pre>
-<pre><code> Attention: When using stop-all.sh or stop-all.sh, if the machine
without the command is not configured to be ssh-free for all machines, it will
prompt for the password.
+<pre><code> Attention: When using `stop-all.sh` or `stop-all.sh`, if the
machine without the command is not configured to be ssh-free for all machines,
it will prompt to enter the password
</code></pre>
<ul>
-<li>After the script is completed, use the <code>jps</code> command to see if
each node service was successfully shut down (<code>jps</code> comes with the
<code>Java JDK</code>)</li>
+<li>After the script is completed, use the <code>jps</code> command to see if
every node service was successfully shut down (<code>jps</code> comes with the
<code>Java JDK</code>)</li>
</ul>
<pre><code> MasterServer ----- master service
WorkerServer ----- worker service
ApiApplicationServer ----- api service
AlertServer ----- alert service
</code></pre>
-<p>If the corresponding master service or worker service does not exist, then
the master/worker service is successfully shut down.</p>
+<p>If the corresponding master service or worker service does not exist, then
the master or worker service is successfully shut down.</p>
<h3>Modify the Configuration File</h3>
<ul>
<li>
<p>modify the configuration file <code>conf/config/install_config.conf</code>
on the <strong>all</strong> nodes, synchronizing the following
configuration.</p>
<ul>
-<li>to scale down the master node, modify the ips and masters parameters.</li>
-<li>to scale down worker nodes, modify the ips and workers parameters.</li>
+<li>to scale down the master node, modify the IPs and masters parameters.</li>
+<li>to scale down worker nodes, modify the IPs and workers parameters.</li>
</ul>
</li>
</ul>
diff --git a/en-us/docs/dev/user_doc/guide/expansion-reduction.json
b/en-us/docs/dev/user_doc/guide/expansion-reduction.json
index 2476e48..38ca125 100644
--- a/en-us/docs/dev/user_doc/guide/expansion-reduction.json
+++ b/en-us/docs/dev/user_doc/guide/expansion-reduction.json
@@ -1,6 +1,6 @@
{
"filename": "expansion-reduction.md",
- "__html": "<h1>DolphinScheduler Expansion and
Reduction</h1>\n<h2>Expansion</h2>\n<p>This article describes how to add a new
master service or worker service to an existing DolphinScheduler
cluster.</p>\n<pre><code> Attention: There cannot be more than one master
service process or worker service process on a physical machine.\n If the
physical machine where the expansion master or worker node is located has
already installed the scheduled service, skip to [1.4 Modify configurati [...]
+ "__html": "<h1>DolphinScheduler Expansion and
Reduction</h1>\n<h2>Expansion</h2>\n<p>This article describes how to add a new
master service or worker service to an existing DolphinScheduler
cluster.</p>\n<pre><code> Attention: There cannot be more than one master
service process or worker service process on a physical machine.\n If the
physical machine which locate the expansion master or worker node has already
installed the scheduled service, check the [1.4 Modify configuration [...]
"link": "/dist/en-us/docs/dev/user_doc/guide/expansion-reduction.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/dev/user_doc/guide/flink-call.html
b/en-us/docs/dev/user_doc/guide/flink-call.html
index fa32880..89fda89 100644
--- a/en-us/docs/dev/user_doc/guide/flink-call.html
+++ b/en-us/docs/dev/user_doc/guide/flink-call.html
@@ -13,15 +13,15 @@
<div id="root"><div class="md2html docs-page" data-reactroot=""><header
class="header-container header-container-dark"><div class="header-body"><span
class="mobile-menu-btn mobile-menu-btn-dark"></span><a
href="/en-us/index.html"><img class="logo" src="/img/hlogo_white.svg"/></a><div
class="search search-dark"><span class="icon-search"></span></div><span
class="language-switch language-switch-dark">中</span><div
class="header-menu"><div><ul class="ant-menu whiteClass ant-menu-light ant-
[...]
<h2>Create a Queue</h2>
<ol>
-<li>Log in to the scheduling system, click "Security", then click
"Queue manage" on the left, and click "Create queue" to
create a queue.</li>
+<li>Log in to the scheduling system, click <code>Security</code>, then click
<code>Queue manage</code> on the left, and click <code>Create queue</code> to
create a queue.</li>
<li>Fill in the name and value of the queue, and click "Submit"</li>
</ol>
<p align="center">
<img src="/img/api/create_queue.png" width="80%" />
</p>
<h2>Create a Tenant</h2>
-<pre><code>1. The tenant corresponds to a Linux user, which the user worker
uses to submit jobs. If Linux OS environment does not have this user, the
worker will create this user when executing the script.
-2. Both the tenant and the tenant code are unique and cannot be repeated, just
like a person has a name and id number.
+<pre><code>1. The tenant corresponds to a Linux user, which the user worker
uses to submit jobs. If the Linux OS environment does not have this user, the
worker will create this user when executing the script.
+2. Both the tenant and the tenant code are unique and cannot be repeated, just
like a person only has one name and one ID number.
3. After creating a tenant, there will be a folder in the HDFS relevant
directory.
</code></pre>
<p align="center">
@@ -33,18 +33,18 @@
</p>
<h2>Create a Token</h2>
<ol>
-<li>Log in to the scheduling system, click "Security", then click
"Token manage" on the left, and click "Create token" to
create a token.</li>
+<li>Log in to the scheduling system, click <code>Security</code>, then click
<code>Token manage</code> on the left, and click <code>Create token</code> to
create a token.</li>
</ol>
<p align="center">
<img src="/img/token-management-en.png" width="80%" />
</p>
<ol start="2">
-<li>Select the "Expiration time" (Token validity), select
"User" (to perform the API operation with the specified user), click
"Generate token", copy the Token string, and click
"Submit"</li>
+<li>Select the <code>Expiration time</code> (token validity time), select
<code>User</code> (choose the specified user to perform the API operation),
click "Generate token", copy the <code>Token</code> string, and click
"Submit".</li>
</ol>
<p align="center">
<img src="/img/create-token-en1.png" width="80%" />
</p>
-<h2>Use Token</h2>
+<h2>Token Usage</h2>
<ol>
<li>
<p>Open the API documentation page</p>
@@ -58,14 +58,13 @@
</p>
<ol start="2">
<li>
-<p>Select a test API, the API selected for this test: queryAllProjectList</p>
+<p>Select a test API, the API selected for this test is
<code>queryAllProjectList</code></p>
<blockquote>
-<p>projects/query-project-list
-></p>
+<p>projects/query-project-list</p>
</blockquote>
</li>
<li>
-<p>Open Postman, fill in the API address, and enter the Token in Headers, and
then send the request to view the result</p>
+<p>Open <code>Postman</code>, fill in the API address, and enter the
<code>Token</code> in <code>Headers</code>, and then send the request to view
the result:</p>
<pre><code>token: The Token just generated
</code></pre>
</li>
diff --git a/en-us/docs/dev/user_doc/guide/flink-call.json
b/en-us/docs/dev/user_doc/guide/flink-call.json
index 1fa63f7..a232c9c 100644
--- a/en-us/docs/dev/user_doc/guide/flink-call.json
+++ b/en-us/docs/dev/user_doc/guide/flink-call.json
@@ -1,6 +1,6 @@
{
"filename": "flink-call.md",
- "__html": "<h1>Flink Calls Operating Steps</h1>\n<h2>Create a
Queue</h2>\n<ol>\n<li>Log in to the scheduling system, click
"Security", then click "Queue manage" on the left, and
click "Create queue" to create a queue.</li>\n<li>Fill in the name
and value of the queue, and click "Submit"</li>\n</ol>\n<p
align=\"center\">\n <img src=\"/img/api/create_queue.png\" width=\"80%\" />\n
</p>\n<h2>Create a Tenant</h2>\n<pre><code>1. The tenant correspon [...]
+ "__html": "<h1>Flink Calls Operating Steps</h1>\n<h2>Create a
Queue</h2>\n<ol>\n<li>Log in to the scheduling system, click
<code>Security</code>, then click <code>Queue manage</code> on the left, and
click <code>Create queue</code> to create a queue.</li>\n<li>Fill in the name
and value of the queue, and click "Submit"</li>\n</ol>\n<p
align=\"center\">\n <img src=\"/img/api/create_queue.png\" width=\"80%\" />\n
</p>\n<h2>Create a Tenant</h2>\n<pre><code>1. The tenant corres [...]
"link": "/dist/en-us/docs/dev/user_doc/guide/flink-call.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/dev/user_doc/guide/introduction.html
b/en-us/docs/dev/user_doc/guide/introduction.html
index 517c288..514e290 100644
--- a/en-us/docs/dev/user_doc/guide/introduction.html
+++ b/en-us/docs/dev/user_doc/guide/introduction.html
@@ -11,7 +11,7 @@
</head>
<body>
<div id="root"><div class="md2html docs-page" data-reactroot=""><header
class="header-container header-container-dark"><div class="header-body"><span
class="mobile-menu-btn mobile-menu-btn-dark"></span><a
href="/en-us/index.html"><img class="logo" src="/img/hlogo_white.svg"/></a><div
class="search search-dark"><span class="icon-search"></span></div><span
class="language-switch language-switch-dark">中</span><div
class="header-menu"><div><ul class="ant-menu whiteClass ant-menu-light ant-
[...]
-<p>User Manual show you how to play with DolphinScheduler, if you do not
installed, please see <a href="./quick-start.md">Quick Start</a> to install
DolphinScheduler before going forward.</p>
+<p>The user manual shows common operations about DolphinScheduler. If you
still haven't installed DolphinScheduler, refer to the <a
href="./quick-start.md">Quick Start</a> to install DolphinScheduler before
going forward.</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="//cdn.jsdelivr.net/npm/[email protected]/dist/react-with-addons.min.js"></script>
<script
src="//cdn.jsdelivr.net/npm/[email protected]/dist/react-dom.min.js"></script>
diff --git a/en-us/docs/dev/user_doc/guide/introduction.json
b/en-us/docs/dev/user_doc/guide/introduction.json
index 9737d9d..8f97813 100644
--- a/en-us/docs/dev/user_doc/guide/introduction.json
+++ b/en-us/docs/dev/user_doc/guide/introduction.json
@@ -1,6 +1,6 @@
{
"filename": "introduction.md",
- "__html": "<h1>User Manual</h1>\n<p>User Manual show you how to play with
DolphinScheduler, if you do not installed, please see <a
href=\"./quick-start.md\">Quick Start</a> to install DolphinScheduler before
going forward.</p>\n",
+ "__html": "<h1>User Manual</h1>\n<p>The user manual shows common operations
about DolphinScheduler. If you still haven't installed DolphinScheduler, refer
to the <a href=\"./quick-start.md\">Quick Start</a> to install DolphinScheduler
before going forward.</p>\n",
"link": "/dist/en-us/docs/dev/user_doc/guide/introduction.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/dev/user_doc/guide/monitor.html
b/en-us/docs/dev/user_doc/guide/monitor.html
index 3378345..fed3615 100644
--- a/en-us/docs/dev/user_doc/guide/monitor.html
+++ b/en-us/docs/dev/user_doc/guide/monitor.html
@@ -13,7 +13,7 @@
<div id="root"><div class="md2html docs-page" data-reactroot=""><header
class="header-container header-container-dark"><div class="header-body"><span
class="mobile-menu-btn mobile-menu-btn-dark"></span><a
href="/en-us/index.html"><img class="logo" src="/img/hlogo_white.svg"/></a><div
class="search search-dark"><span class="icon-search"></span></div><span
class="language-switch language-switch-dark">中</span><div
class="header-menu"><div><ul class="ant-menu whiteClass ant-menu-light ant-
[...]
<h2>Service Management</h2>
<ul>
-<li>Service management is mainly to monitor and display the health status and
basic information of each service in the system</li>
+<li>Service management is mainly to monitor and display the health status and
basic information of each service in the system.</li>
</ul>
<h2>Monitor Master Server</h2>
<ul>
@@ -38,7 +38,7 @@
</p>
<h2>Monitor DB</h2>
<ul>
-<li>Mainly the health of the DB</li>
+<li>Mainly the health status of the DB.</li>
</ul>
<p align="center">
<img src="/img/mysql-jk-en.png" width="80%" />
@@ -48,10 +48,10 @@
<img src="/img/statistics-en.png" width="80%" />
</p>
<ul>
-<li>Number of commands to be executed: statistics on the t_ds_command
table</li>
-<li>The number of failed commands: statistics on the t_ds_error_command
table</li>
-<li>Number of tasks to run: Count the data of task_queue in ZooKeeper</li>
-<li>Number of tasks to be killed: Count the data of task_kill in ZooKeeper</li>
+<li>Number of commands wait to be executed: statistics of the
<code>t_ds_command</code> table data.</li>
+<li>The number of failed commands: statistics of the
<code>t_ds_error_command</code> table data.</li>
+<li>Number of tasks wait to run: count the data of <code>task_queue</code> in
the ZooKeeper.</li>
+<li>Number of tasks wait to be killed: count the data of
<code>task_kill</code> in the ZooKeeper.</li>
</ul>
</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="//cdn.jsdelivr.net/npm/[email protected]/dist/react-with-addons.min.js"></script>
diff --git a/en-us/docs/dev/user_doc/guide/monitor.json
b/en-us/docs/dev/user_doc/guide/monitor.json
index 8d2b1ef..b29d5c2 100644
--- a/en-us/docs/dev/user_doc/guide/monitor.json
+++ b/en-us/docs/dev/user_doc/guide/monitor.json
@@ -1,6 +1,6 @@
{
"filename": "monitor.md",
- "__html": "<h1>Monitor</h1>\n<h2>Service Management</h2>\n<ul>\n<li>Service
management is mainly to monitor and display the health status and basic
information of each service in the system</li>\n</ul>\n<h2>Monitor Master
Server</h2>\n<ul>\n<li>Mainly related to master information.</li>\n</ul>\n<p
align=\"center\">\n <img src=\"/img/master-jk-en.png\" width=\"80%\" />\n
</p>\n<h2>Monitor Worker Server</h2>\n<ul>\n<li>Mainly related to worker
information.</li>\n</ul>\n<p align=\"cente [...]
+ "__html": "<h1>Monitor</h1>\n<h2>Service Management</h2>\n<ul>\n<li>Service
management is mainly to monitor and display the health status and basic
information of each service in the system.</li>\n</ul>\n<h2>Monitor Master
Server</h2>\n<ul>\n<li>Mainly related to master information.</li>\n</ul>\n<p
align=\"center\">\n <img src=\"/img/master-jk-en.png\" width=\"80%\" />\n
</p>\n<h2>Monitor Worker Server</h2>\n<ul>\n<li>Mainly related to worker
information.</li>\n</ul>\n<p align=\"cent [...]
"link": "/dist/en-us/docs/dev/user_doc/guide/monitor.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/dev/user_doc/guide/open-api.html
b/en-us/docs/dev/user_doc/guide/open-api.html
index 7e4926b..1e96760 100644
--- a/en-us/docs/dev/user_doc/guide/open-api.html
+++ b/en-us/docs/dev/user_doc/guide/open-api.html
@@ -12,8 +12,8 @@
<body>
<div id="root"><div class="md2html docs-page" data-reactroot=""><header
class="header-container header-container-dark"><div class="header-body"><span
class="mobile-menu-btn mobile-menu-btn-dark"></span><a
href="/en-us/index.html"><img class="logo" src="/img/hlogo_white.svg"/></a><div
class="search search-dark"><span class="icon-search"></span></div><span
class="language-switch language-switch-dark">中</span><div
class="header-menu"><div><ul class="ant-menu whiteClass ant-menu-light ant-
[...]
<h2>Background</h2>
-<p>Generally, projects and processes are created through pages, but
integration with third-party systems requires API calls to manage projects and
workflows.</p>
-<h2>The Operation Steps of DS API Calls</h2>
+<p>Generally, projects and processes are created through pages, but
considering the integration with third-party systems requires API calls to
manage projects and workflows.</p>
+<h2>The Operation Steps of DolphinScheduler API Calls</h2>
<h3>Create a Token</h3>
<ol>
<li>Log in to the scheduling system, click "Security", then click
"Token manage" on the left, and click "Create token" to
create a token.</li>
@@ -22,16 +22,16 @@
<img src="/img/token-management-en.png" width="80%" />
</p>
<ol start="2">
-<li>Select the "Expiration time" (Token validity), select
"User" (to perform the API operation with the specified user), click
"Generate token", copy the Token string, and click
"Submit"</li>
+<li>Select the "Expiration time" (Token validity time), select
"User" (choose the specified user to perform the API operation),
click "Generate token", copy the <code>Token</code> string, and click
"Submit".</li>
</ol>
<p align="center">
<img src="/img/create-token-en1.png" width="80%" />
</p>
-<h3>Use Token</h3>
+<h3>Token Usage</h3>
<ol>
<li>Open the API documentation page
<blockquote>
-<p>Address：http://{api server
ip}:12345/dolphinscheduler/doc.html?language=en_US&lang=en</p>
+<p>Address：http://{API server
ip}:12345/dolphinscheduler/doc.html?language=en_US&lang=en</p>
</blockquote>
</li>
</ol>
@@ -39,12 +39,12 @@
<img src="/img/api-documentation-en.png" width="80%" />
</p>
<ol start="2">
-<li>select a test API, the API selected for this test: queryAllProjectList
+<li>select a test API, the API selected for this test is
<code>queryAllProjectList</code>
<blockquote>
<p>projects/query-project-list</p>
</blockquote>
</li>
-<li>Open Postman, fill in the API address, and enter the Token in Headers, and
then send the request to view the result<pre><code>token: The Token just
generated
+<li>Open <code>Postman</code>, fill in the API address, enter the
<code>Token</code> in <code>Headers</code>, and then send the request to view
the result:<pre><code>token: The Token just generated
</code></pre>
</li>
</ol>
@@ -62,9 +62,9 @@
<p align="center">
<img src="/img/api/create_project3.png" width="80%" />
</p>
-The returned msg information is "success", indicating that we have
successfully created the project through API.
-<p>If you are interested in the source code of the project, please continue to
read the following：</p>
-<h3>Appendix：The Source Code of Creating a Project</h3>
+The returned `msg` information is "success", indicating that we have
successfully created the project through API.
+<p>If you are interested in the source code of creating a project, please
continue to read the following：</p>
+<h3>Appendix： The Source Code of Creating a Project</h3>
<p align="center">
<img src="/img/api/create_source1.png" width="80%" />
</p>
diff --git a/en-us/docs/dev/user_doc/guide/open-api.json
b/en-us/docs/dev/user_doc/guide/open-api.json
index 9c607fc..affcc74 100644
--- a/en-us/docs/dev/user_doc/guide/open-api.json
+++ b/en-us/docs/dev/user_doc/guide/open-api.json
@@ -1,6 +1,6 @@
{
"filename": "open-api.md",
- "__html": "<h1>Open API</h1>\n<h2>Background</h2>\n<p>Generally, projects
and processes are created through pages, but integration with third-party
systems requires API calls to manage projects and workflows.</p>\n<h2>The
Operation Steps of DS API Calls</h2>\n<h3>Create a Token</h3>\n<ol>\n<li>Log in
to the scheduling system, click "Security", then click "Token
manage" on the left, and click "Create token" to create a
token.</li>\n</ol>\n<p align=\"center\ [...]
+ "__html": "<h1>Open API</h1>\n<h2>Background</h2>\n<p>Generally, projects
and processes are created through pages, but considering the integration with
third-party systems requires API calls to manage projects and
workflows.</p>\n<h2>The Operation Steps of DolphinScheduler API
Calls</h2>\n<h3>Create a Token</h3>\n<ol>\n<li>Log in to the scheduling system,
click "Security", then click "Token manage" on the left,
and click "Create token" to create a token.</ [...]
"link": "/dist/en-us/docs/dev/user_doc/guide/open-api.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/dev/user_doc/guide/quick-start.html
b/en-us/docs/dev/user_doc/guide/quick-start.html
index b598688..081ae5b 100644
--- a/en-us/docs/dev/user_doc/guide/quick-start.html
+++ b/en-us/docs/dev/user_doc/guide/quick-start.html
@@ -13,9 +13,13 @@
<div id="root"><div class="md2html docs-page" data-reactroot=""><header
class="header-container header-container-dark"><div class="header-body"><span
class="mobile-menu-btn mobile-menu-btn-dark"></span><a
href="/en-us/index.html"><img class="logo" src="/img/hlogo_white.svg"/></a><div
class="search search-dark"><span class="icon-search"></span></div><span
class="language-switch language-switch-dark">中</span><div
class="header-menu"><div><ul class="ant-menu whiteClass ant-menu-light ant-
[...]
<ul>
<li>
+<p>Watch Apache DolphinScheduler Quick Start Tutorile here:
+<a href="https://www.youtube.com/watch?v=nrF20hpCkug";><img
src="/img/video_cover/quick-use.png" alt="image"></a></p>
+</li>
+<li>
<p>Administrator user login</p>
<blockquote>
-<p>Address：<a
href="http://localhost:12345/dolphinscheduler";>http://localhost:12345/dolphinscheduler</a>
Username and password: admin/dolphinscheduler123</p>
+<p>Address：<a
href="http://localhost:12345/dolphinscheduler";>http://localhost:12345/dolphinscheduler</a>
Username and password: <code>admin/dolphinscheduler123</code></p>
</blockquote>
</li>
</ul>
@@ -23,13 +27,13 @@
<img src="/img/login_en.png" width="60%" />
</p>
<ul>
-<li>Create queue</li>
+<li>Create a queue</li>
</ul>
<p align="center">
<img src="/img/create-queue-en.png" width="60%" />
</p>
<ul>
-<li>Create tenant</li>
+<li>Create a tenant</li>
</ul>
<p align="center">
<img src="/img/create-tenant-en.png" width="60%" />
@@ -47,43 +51,47 @@
<img src="/img/alarm-group-en.png" width="60%" />
</p>
<ul>
-<li>Create a worker group</li>
-</ul>
- <p align="center">
- <img src="/img/worker-group-en.png" width="60%" />
- </p>
-<ul>
-<li>Create environment</li>
-</ul>
- <p align="center">
- <img src="/img/create-environment.png" width="60%" />
- </p>
-<ul>
-<li>Create a token</li>
+<li>
+<p>Create a worker group</p>
+ <p align="center">
+ <img src="/img/worker-group-en.png" width="60%" />
+ </p>
+</li>
+<li>
+<p>Create environment</p>
+<p align="center">
+ <img src="/img/create-environment.png" width="60%" />
+</p>
+</li>
+<li>
+<p>Create a token</p>
+</li>
</ul>
<p align="center">
<img src="/img/token-en.png" width="60%" />
</p>
<ul>
-<li>Login with regular users</li>
-</ul>
+<li>
+<p>Login with regular users</p>
<blockquote>
<p>Click on the user name in the upper right corner to "exit" and
re-use the normal user login.</p>
</blockquote>
-<ul>
-<li>Project Management - > Create Project - > Click on Project Name</li>
+</li>
+<li>
+<p><code>Project Management - > Create Project - > Click on Project
Name</code></p>
+</li>
</ul>
<p align="center">
<img src="/img/create_project_en.png" width="60%" />
</p>
<ul>
-<li>Click Workflow Definition - > Create Workflow Definition - > Online
Process Definition</li>
+<li><code>Click Workflow Definition - > Create Workflow Definition - >
Online Process Definition</code></li>
</ul>
<p align="center">
<img src="/img/process_definition_en.png" width="60%" />
</p>
<ul>
-<li>Running Process Definition - > Click Workflow Instance - > Click
Process Instance Name - > Double-click Task Node - > View Task Execution
Log</li>
+<li><code>Running Process Definition - > Click Workflow Instance - >
Click Process Instance Name - > Double-click Task Node - > View Task
Execution Log</code></li>
</ul>
<p align="center">
<img src="/img/log_en.png" width="60%" />
diff --git a/en-us/docs/dev/user_doc/guide/quick-start.json
b/en-us/docs/dev/user_doc/guide/quick-start.json
index 2849f55..3cedec3 100644
--- a/en-us/docs/dev/user_doc/guide/quick-start.json
+++ b/en-us/docs/dev/user_doc/guide/quick-start.json
@@ -1,6 +1,6 @@
{
"filename": "quick-start.md",
- "__html": "<h1>Quick Start</h1>\n<ul>\n<li>\n<p>Administrator user
login</p>\n<blockquote>\n<p>Address：<a
href=\"http://localhost:12345/dolphinscheduler\";>http://localhost:12345/dolphinscheduler</a>
Username and password:
admin/dolphinscheduler123</p>\n</blockquote>\n</li>\n</ul>\n<p
align=\"center\">\n <img src=\"/img/login_en.png\" width=\"60%\" />\n
</p>\n<ul>\n<li>Create queue</li>\n</ul>\n<p align=\"center\">\n <img
src=\"/img/create-queue-en.png\" width=\"60%\" />\n </p>\n<u [...]
+ "__html": "<h1>Quick Start</h1>\n<ul>\n<li>\n<p>Watch Apache
DolphinScheduler Quick Start Tutorile here:\n<a
href=\"https://www.youtube.com/watch?v=nrF20hpCkug\";><img
src=\"/img/video_cover/quick-use.png\"
alt=\"image\"></a></p>\n</li>\n<li>\n<p>Administrator user
login</p>\n<blockquote>\n<p>Address：<a
href=\"http://localhost:12345/dolphinscheduler\";>http://localhost:12345/dolphinscheduler</a>
Username and password:
<code>admin/dolphinscheduler123</code></p>\n</blockquote>\n</li>\n</u [...]
"link": "/dist/en-us/docs/dev/user_doc/guide/quick-start.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/dev/user_doc/guide/resource.html
b/en-us/docs/dev/user_doc/guide/resource.html
index cfe5d55..7f3b795 100644
--- a/en-us/docs/dev/user_doc/guide/resource.html
+++ b/en-us/docs/dev/user_doc/guide/resource.html
@@ -11,25 +11,25 @@
</head>
<body>
<div id="root"><div class="md2html docs-page" data-reactroot=""><header
class="header-container header-container-dark"><div class="header-body"><span
class="mobile-menu-btn mobile-menu-btn-dark"></span><a
href="/en-us/index.html"><img class="logo" src="/img/hlogo_white.svg"/></a><div
class="search search-dark"><span class="icon-search"></span></div><span
class="language-switch language-switch-dark">中</span><div
class="header-menu"><div><ul class="ant-menu whiteClass ant-menu-light ant-
[...]
-<p>If you want to use the resource upload function, you can select the local
file 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 and other related environments</p>
+<p>If you want to use the resource upload function, 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>
<blockquote>
<p><strong><em>Note:</em></strong></p>
<ul>
-<li>If the resource upload function is used, the deployment user in <a
href="installation/standalone.md">installation and deployment</a> must to have
operation authority</li>
-<li>If you using 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>/opt/dolphinscheduler/conf</code>, otherwise Skip step</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>/opt/dolphinscheduler/conf</code>, otherwise skip this copy step.</li>
</ul>
</blockquote>
<h2>HDFS Resource Configuration</h2>
<ul>
-<li>Upload resource files and udf functions, all uploaded files and resources
will be stored on hdfs, so the following configuration items are required:</li>
+<li>Upload resource files and UDF functions, all uploaded files and resources
will be stored on HDFS, so require the following configurations:</li>
</ul>
-<pre><code>conf/common/common.properties
+<pre><code>conf/common.properties
# Users who have permission to create directories under the HDFS root path
hdfs.root.user=hdfs
- # data base dir, resource file will store to this hadoop hdfs path, self
configuration, please make sure the directory exists on hdfs and have read
write permissions。"/escheduler" is recommended
- data.store2hdfs.basepath=/dolphinscheduler
- # resource upload startup type : HDFS,S3,NONE
- res.upload.startup.type=HDFS
+ # data base dir, resource file will store to this hadoop hdfs path, self
configuration, please make sure the directory exists on hdfs and have read
write permissions。"/dolphinscheduler" is recommended
+ resource.upload.path=/dolphinscheduler
+ # resource storage type : HDFS,S3,NONE
+ resource.storage.type=HDFS
# whether kerberos starts
hadoop.security.authentication.startup.state=false
# java.security.krb5.conf path
@@ -37,25 +37,20 @@
# loginUserFromKeytab user
[email protected]
# loginUserFromKeytab path
- login.user.keytab.path=/opt/hdfs.headless.keytab
-
-conf/common/hadoop.properties
- # ha or single namenode,If namenode ha needs to copy core-site.xml and
hdfs-site.xml
- # to the conf directory，support s3，for example : s3a://dolphinscheduler
- fs.defaultFS=hdfs://mycluster:8020
+ login.user.keytab.path=/opt/hdfs.headless.keytab
+ # if resource.storage.type is HDFS，and your Hadoop Cluster NameNode has HA
enabled, you need to put core-site.xml and hdfs-site.xml in the
installPath/conf directory. In this example, it is placed under
/opt/soft/dolphinscheduler/conf, and configure the namenode cluster name; if
the NameNode is not HA, modify it to a specific IP or host name.
+ # if resource.storage.type is S3，write S3 address，HA，for example
：s3a://dolphinscheduler，
+ # Note，s3 be sure to create the root directory /dolphinscheduler
+ fs.defaultFS=hdfs://mycluster:8020
#resourcemanager ha note this need ips , this empty if single
- yarn.resourcemanager.ha.rm.ids=192.168.xx.xx,192.168.xx.xx
+ yarn.resourcemanager.ha.rm.ids=192.168.xx.xx,192.168.xx.xx
# If it is a single resourcemanager, you only need to configure one host
name. If it is resourcemanager HA, the default configuration is fine
yarn.application.status.address=http://xxxx:8088/ws/v1/cluster/apps/%s
</code></pre>
-<ul>
-<li>Only one address needs to be configured for yarn.resourcemanager.ha.rm.ids
and yarn.application.status.address, and the other address is empty.</li>
-<li>You need to copy core-site.xml and hdfs-site.xml from the conf directory
of the Hadoop cluster to the conf directory of the dolphinscheduler project,
and restart the api-server service.</li>
-</ul>
<h2>File Management</h2>
<blockquote>
-<p>It is the management of various resource files, including creating basic
txt/log/sh/conf/py/java and other files, uploading jar packages and other types
of files, and can do edit, rename, download, delete and other operations.</p>
+<p>It is the management of various resource files, including creating basic
<code>txt/log/sh/conf/py/java</code> and jar packages and other type files, and
can do edit, rename, download, delete and other operations to the files.</p>
</blockquote>
<p align="center">
<img src="/img/file-manage-en.png" width="80%" />
@@ -63,7 +58,7 @@ conf/common/hadoop.properties
<ul>
<li>Create a file
<blockquote>
-<p>The file format supports the following types: txt, log, sh, conf, cfg, py,
java, sql, xml, hql, properties</p>
+<p>The file format supports the following types: txt, log, sh, conf, cfg, py,
java, sql, xml, hql, properties.</p>
</blockquote>
</li>
</ul>
@@ -74,7 +69,7 @@ conf/common/hadoop.properties
<li>upload files</li>
</ul>
<blockquote>
-<p>Upload file: Click the "Upload File" button to upload, drag the
file to the upload area, the file name will be automatically completed with the
uploaded file name</p>
+<p>Upload file: Click the "Upload File" button to upload, drag the
file to the upload area, the file name will be automatically completed with the
uploaded file name.</p>
</blockquote>
<p align="center">
<img src="/img/file-upload-en.png" width="80%" />
@@ -83,16 +78,16 @@ conf/common/hadoop.properties
<li>File View</li>
</ul>
<blockquote>
-<p>For the file types that can be viewed, click the file name to view the file
details</p>
+<p>For the files that can be viewed, click the file name to view the file
details.</p>
</blockquote>
<p align="center">
<img src="/img/file_detail_en.png" width="80%" />
</p>
<ul>
-<li>download file</li>
+<li>Download file</li>
</ul>
<blockquote>
-<p>Click the "Download" button in the file list to download the file
or click the "Download" button in the upper right corner of the file
details to download the file</p>
+<p>Click the "Download" button in the file list to download the file
or click the "Download" button in the upper right corner of the file
details to download the file.</p>
</blockquote>
<ul>
<li>File rename</li>
@@ -104,13 +99,13 @@ conf/common/hadoop.properties
<li>
<p>delete</p>
<blockquote>
-<p>File list -> Click the "Delete" button to delete the specified
file</p>
+<p>File list -> Click the "Delete" button to delete the specified
file.</p>
</blockquote>
</li>
<li>
<p>Re-upload file</p>
<blockquote>
-<p>Re-upload file: Click the "Re-upload File" button to upload a new
file to replace the old file, drag the file to the re-upload area, the file
name will be automatically completed with the new file name</p>
+<p>Re-upload file: Click the "Re-upload File" button to upload a new
file to replace the old file, drag the file to the re-upload area, the file
name will be automatically completed with the new uploaded file name.</p>
</blockquote>
<p align="center">
<img src="/img/reupload_file_en.png" width="80%" />
@@ -120,11 +115,11 @@ conf/common/hadoop.properties
<h2>UDF Management</h2>
<h3>Resource Management</h3>
<blockquote>
-<p>The resource management and file management functions are similar. The
difference is that the resource management is the uploaded UDF function, and
the file management uploads the user program, script and configuration file.
+<p>The resource management and file management functions are similar. The
difference is that the resource management is the UDF upload function, and the
file management uploads the user programs, scripts and configuration files.
Operation function: rename, download, delete.</p>
</blockquote>
<ul>
-<li>Upload udf resources
+<li>Upload UDF resources
<blockquote>
<p>Same as uploading files.</p>
</blockquote>
@@ -134,57 +129,71 @@ Operation function: rename, download, delete.</p>
<ul>
<li>Create UDF function
<blockquote>
-<p>Click "Create UDF Function", enter the udf function parameters,
select the udf resource, and click "Submit" to create the udf
function.</p>
+<p>Click "Create UDF Function", enter the UDF function parameters,
select the UDF resource, and click "Submit" to create the UDF
function.</p>
</blockquote>
</li>
</ul>
<blockquote>
-<p>Currently only supports temporary UDF functions of HIVE</p>
+<p>Currently, only supports temporary UDF functions of Hive.</p>
</blockquote>
<ul>
-<li>UDF function name: the name when the UDF function is entered</li>
-<li>Package name Class name: Enter the full path of the UDF function</li>
-<li>UDF resource: Set the resource file corresponding to the created UDF</li>
+<li>UDF function name: enter the name of the UDF function.</li>
+<li>Package name Class name: enter the full path of the UDF function.</li>
+<li>UDF resource: set the resource file corresponding to the created UDF
function.</li>
</ul>
<p align="center">
<img src="/img/udf_edit_en.png" width="80%" />
</p>
<h2>Task Group Settings</h2>
-<p>The task group is mainly used to control the concurrency of task instances,
and is designed to control the pressure of other resources (it can also control
the pressure of the Hadoop cluster, the cluster will have queue control it).
When creating a new task definition, you can configure the corresponding task
group and configure the priority of the task running in the task group.</p>
+<p>The task group is mainly used to control the concurrency of task instances
and is designed to control the pressure of other resources (it can also control
the pressure of the Hadoop cluster, the cluster will have queue control it).
When creating a new task definition, you can configure the corresponding task
group and configure the priority of the task running in the task group.</p>
<h3>Task Group Configuration</h3>
<h4>Create Task Group</h4>
<p align="center">
<img src="/img/task_group_manage_eng.png" width="80%" />
</p>
-<p>The user clicks [Resources] - [Task Group Management] - [Task Group option]
- create task Group</p>
+<p>The user clicks [Resources] - [Task Group Management] - [Task Group option]
- [Create Task Group]</p>
<p align="center">
<img src="/img/task_group_create_eng.png" width="80%" />
</p>
-<p>You need to enter the information in the picture:</p>
-<p>[Task group name]: The name displayed when the task group is used</p>
-<p>[Project name]: The project that the task group functions, this item is
optional, if not selected, all the projects in the whole system can use this
task group.</p>
-<p>[Resource pool size]: The maximum number of concurrent task instances
allowed</p>
+<p>You need to enter the information inside the picture:</p>
+<ul>
+<li>
+<p>Task group name: the name displayed of the task group</p>
+</li>
+<li>
+<p>Project name: the project range that the task group functions, this item is
optional, if not selected, all the projects in the whole system can use this
task group.</p>
+</li>
+<li>
+<p>Resource pool size: The maximum number of concurrent task instances
allowed.</p>
+</li>
+</ul>
<h4>View Task Group Queue</h4>
<p align="center">
<img src="/img/task_group_conf_eng.png" width="80%" />
</p>
-<p>Click the button to view task group usage information</p>
+<p>Click the button to view task group usage information:</p>
<p align="center">
<img src="/img/task_group_queue_list_eng.png" width="80%" />
</p>
<h4>Use of Task Groups</h4>
-<p>Note: The use of task groups is applicable to tasks executed by workers,
such as [switch] nodes, [condition] nodes, [sub_process] and other node types
executed by the master are not controlled by the task group. Let's take the
shell node as an example:</p>
+<p><strong>Note</strong>: The usage of task groups is applicable to tasks
executed by workers, such as [switch] nodes, [condition] nodes, [sub_process]
and other node types executed by the master are not controlled by the task
group. Let's take the shell node as an example:</p>
<p align="center">
<img src="/img/task_group_use_eng.png" width="80%" />
</p>
-<p>Regarding the configuration of the task group, all you need to do is to
configure the part in the red box:</p>
-<p>[Task group name] : The task group name displayed on the task group
configuration page. Here you can only see the task group that the project has
permission to (the project is selected when creating a task group), or the task
group that acts globally (the new task group is created). when no item is
selected)</p>
-<p>[Priority] : When there is a waiting resource, the task with high priority
will be distributed to the worker by the master first. The larger the value of
this part, the higher the priority.</p>
+<p>Regarding the configuration of the task group, all you need to do is to
configure these parts in the red box:</p>
+<ul>
+<li>
+<p>Task group name: The task group name is displayed on the task group
configuration page. Here you can only see the task group that the project has
permission to access (the project is selected when creating a task group) or
the task group that scope globally (no project is selected when creating a task
group).</p>
+</li>
+<li>
+<p>Priority: When there is a waiting resource, the task with high priority
will be distributed to the worker by the master first. The larger the value of
this part, the higher the priority.</p>
+</li>
+</ul>
<h3>Implementation Logic of Task Group</h3>
<h4>Get Task Group Resources:</h4>
<p>The master judges whether the task is configured with a task group when
distributing the task. If the task is not configured, it is normally thrown to
the worker to run; if a task group is configured, it checks whether the
remaining size of the task group resource pool meets the current task operation
before throwing it to the worker for execution. , if the resource pool -1 is
satisfied, continue to run; if not, exit the task distribution and wait for
other tasks to wake up.</p>
<h4>Release and Wake Up:</h4>
-<p>When the task that has obtained the task group resource ends, the task
group resource will be released. After the release, it will check whether there
is a task waiting in the current task group. If there is, mark the task with
the best priority to run, and create a new executable event. . The event stores
the task id that is marked to obtain the resource, and then obtains the task
group resource and then runs it.</p>
+<p>When the task that has occupied the task group resource is finished, the
task group resource will be released. After the release, it will check whether
there is a task waiting in the current task group. If there is, mark the task
with the best priority to run, and create a new executable event. The event
stores the task ID that is marked to acquire the resource, and then the task
obtains the task group resource and run.</p>
<h4>Task Group Flowchart</h4>
<p align="center">
<img src="/img/task_group_process.png" width="80%" />
diff --git a/en-us/docs/dev/user_doc/guide/resource.json
b/en-us/docs/dev/user_doc/guide/resource.json
index 1d535dd..3f2221a 100644
--- a/en-us/docs/dev/user_doc/guide/resource.json
+++ b/en-us/docs/dev/user_doc/guide/resource.json
@@ -1,6 +1,6 @@
{
"filename": "resource.md",
- "__html": "<h1>Resource Center</h1>\n<p>If you want to use the resource
upload function, you can select the local file 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 and other related
environments</p>\n<blockquote>\n<p><strong><em>Note:</em></strong></p>\n<ul>\n<li>If
the resource upload function is used, the deployment user in <a
href=\"installatio [...]
+ "__html": "<h1>Resource Center</h1>\n<p>If you want to use the resource
upload function, 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<blockquote>\n<p><strong><em>Note:</em></strong></p>\n<ul>\n<li>If
you want to use the resource upload function, the deploy [...]
"link": "/dist/en-us/docs/dev/user_doc/guide/resource.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/dev/user_doc/guide/security.html
b/en-us/docs/dev/user_doc/guide/security.html
index 8d246ba..0c7f92e 100644
--- a/en-us/docs/dev/user_doc/guide/security.html
+++ b/en-us/docs/dev/user_doc/guide/security.html
@@ -10,24 +10,24 @@
<link rel="stylesheet" href="/build/vendor.23870e5.css">
</head>
<body>
- <div id="root"><div class="md2html docs-page" data-reactroot=""><header
class="header-container header-container-dark"><div class="header-body"><span
class="mobile-menu-btn mobile-menu-btn-dark"></span><a
href="/en-us/index.html"><img class="logo" src="/img/hlogo_white.svg"/></a><div
class="search search-dark"><span class="icon-search"></span></div><span
class="language-switch language-switch-dark">中</span><div
class="header-menu"><div><ul class="ant-menu whiteClass ant-menu-light ant-
[...]
+ <div id="root"><div class="md2html docs-page" data-reactroot=""><header
class="header-container header-container-dark"><div class="header-body"><span
class="mobile-menu-btn mobile-menu-btn-dark"></span><a
href="/en-us/index.html"><img class="logo" src="/img/hlogo_white.svg"/></a><div
class="search search-dark"><span class="icon-search"></span></div><span
class="language-switch language-switch-dark">中</span><div
class="header-menu"><div><ul class="ant-menu whiteClass ant-menu-light ant-
[...]
<ul>
-<li>Only the administrator account in the security center has the authority to
operate. It has functions such as queue management, tenant management, user
management, alarm group management, worker group management, token management,
etc. In the user management module, resources, data sources, projects, etc.
Authorization</li>
-<li>Administrator login, default user name and password:
admin/dolphinscheduler123</li>
+<li>Only the administrator account in the security center has the authority to
operate. It has functions such as queue management, tenant management, user
management, alarm group management, worker group management, token management,
etc. In the user management module, can authorize to the resources, data
sources, projects, etc.</li>
+<li>Administrator login, the default username and password is
<code>admin/dolphinscheduler123</code></li>
</ul>
<h2>Create Queue</h2>
<ul>
-<li>Queue is used when the "queue" parameter is needed to execute
programs such as spark and mapreduce.</li>
-<li>The administrator enters the Security Center->Queue Management page and
clicks the "Create Queue" button to create a queue.</li>
+<li>Configure <code>queue</code> parameter to execute programs such as Spark
and MapReduce.</li>
+<li>The administrator enters the <code>Security Center->Queue
Management</code> page and clicks the "Create Queue" button to create
a new queue.</li>
</ul>
<p align="center">
<img src="/img/create-queue-en.png" width="80%" />
</p>
<h2>Add Tenant</h2>
<ul>
-<li>The tenant corresponds to the Linux user, which is used by the worker to
submit the job. Task will fail if Linux does not exists this user. You can set
the parameter <code>worker.tenant.auto.create</code> as <code>true</code> in
configuration file <code>worker.properties</code>. After that DolphinScheduler
would create user if not exists, The property
<code>worker.tenant.auto.create=true</code> requests worker run
<code>sudo</code> command without password.</li>
+<li>The tenant corresponds to the Linux user, which is used by the worker to
submit the job. The task will fail if Linux does not have this user exists. You
can set the parameter <code>worker.tenant.auto.create</code> as
<code>true</code> in configuration file <code>worker.properties</code>. After
that DolphinScheduler will create a user if not exists, The property
<code>worker.tenant.auto.create=true</code> requests worker run
<code>sudo</code> command without password.</li>
<li>Tenant Code: <strong>Tenant Code is the only user on Linux and cannot be
repeated</strong></li>
-<li>The administrator enters the Security Center->Tenant Management page
and clicks the "Create Tenant" button to create a tenant.</li>
+<li>The administrator enters the <code>Security Center->Tenant
Management</code> page and clicks the <code>Create Tenant</code> button to
create a tenant.</li>
</ul>
<p align="center">
<img src="/img/addtenant-en.png" width="80%" />
@@ -37,13 +37,13 @@
<li>
<p>Users are divided into <strong>administrator users</strong> and
<strong>normal users</strong></p>
<ul>
-<li>The administrator has authorization and user management authority, but
does not have the authority to create project and workflow definition
operations.</li>
-<li>Ordinary users can create projects and create, edit, and execute workflow
definitions.</li>
-<li>Note: If the user switches tenants, all resources under the tenant where
the user belongs will be copied to the new tenant that is switched.</li>
+<li>The administrator has authorization to authorize and user management
authorities but does not have the authority to create project and workflow
definition operations.</li>
+<li>Normal users can create projects and create, edit and execute workflow
definitions.</li>
+<li><strong>Note</strong>: If the user switches tenants, all resources under
the tenant to which the user belongs will be copied to the new tenant that is
switched.</li>
</ul>
</li>
<li>
-<p>The administrator enters the Security Center -> User Management page and
clicks the "Create User" button to create a user.</p>
+<p>The administrator enters the <code>Security Center -> User
Management</code> page and clicks the <code>Create User</code> button to create
a user.</p>
</li>
</ul>
<p align="center">
@@ -53,40 +53,40 @@
<p><strong>Edit user information</strong></p>
</blockquote>
<ul>
-<li>The administrator enters the Security Center->User Management page and
clicks the "Edit" button to edit user information.</li>
-<li>After an ordinary user logs in, click the user information in the user
name drop-down box to enter the user information page, and click the
"Edit" button to edit the user information.</li>
+<li>The administrator enters the <code>Security Center->User
Management</code> page and clicks the <code>Edit</code> button to edit user
information.</li>
+<li>After a normal user logs in, click the user information in the username
drop-down box to enter the user information page, and click the
<code>Edit</code> button to edit the user information.</li>
</ul>
<blockquote>
<p><strong>Modify user password</strong></p>
</blockquote>
<ul>
-<li>The administrator enters the Security Center->User Management page and
clicks the "Edit" button. When editing user information, enter the
new password to modify the user password.</li>
-<li>After a normal user logs in, click the user information in the user name
drop-down box to enter the password modification page, enter the password and
confirm the password and click the "Edit" button, then the password
modification is successful.</li>
+<li>The administrator enters the <code>Security Center->User
Management</code> page and clicks the <code>Edit</code> button. When editing
user information, enter the new password to modify the user password.</li>
+<li>After a normal user logs in, click the user information in the username
drop-down box to enter the password modification page, enter the password and
confirm the password and click the <code>Edit</code> button, then the password
modification is a success.</li>
</ul>
<h2>Create Alarm Group</h2>
<ul>
-<li>The alarm group is a parameter set at startup. After the process ends, the
status of the process and other information will be sent to the alarm group in
the form of email.</li>
+<li>The alarm group is a parameter set at startup. After the process ends, the
status of the process and other information will be sent to the alarm group by
email.</li>
</ul>
<ul>
<li>
-<p>The administrator enters the Security Center -> Alarm Group Management
page and clicks the "Create Alarm Group" button to create an alarm
group.</p>
+<p>The administrator enters the <code>Security Center -> Alarm Group
Management</code> page and clicks the <code>Create Alarm Group</code> button to
create an alarm group.</p>
<p align="center">
<img src="/img/mail-en.png" width="80%" />
</li>
</ul>
<h2>Token Management</h2>
<blockquote>
-<p>Since the back-end interface has login check, token management provides a
way to perform various operations on the system by calling the interface.</p>
+<p>Since the back-end interface has login check, token management provides a
way to execute various operations on the system by calling interfaces.</p>
</blockquote>
<ul>
<li>
-<p>The administrator enters the Security Center -> Token Management page,
clicks the "Create Token" button, selects the expiration time and
user, clicks the "Generate Token" button, and clicks the
"Submit" button, then the selected user's token is created
successfully.</p>
+<p>The administrator enters the <code>Security Center -> Token Management
page</code>, clicks the <code>Create Token</code> button, selects the
expiration time and user, clicks the <code>Generate Token</code> button, and
clicks the <code>Submit</code> button, then create the selected user's token
successfully.</p>
<p align="center">
<img src="/img/create-token-en.png" width="80%" />
</p>
</li>
<li>
-<p>After an ordinary user logs in, click the user information in the user name
drop-down box, enter the token management page, select the expiration time,
click the "generate token" button, and click the "submit"
button, then the user creates a token successfully.</p>
+<p>After a normal user logs in, click the user information in the username
drop-down box, enter the token management page, select the expiration time,
click the <code>Generate Token</code> button, and click the <code>Submit</code>
button, then the user creates a token successfully.</p>
</li>
<li>
<p>Call example:</p>
@@ -125,19 +125,19 @@
}
}
</code></pre>
-<h2>Granted Permission</h2>
+<h2>Granted Permissions</h2>
<pre><code>* Granted permissions include project permissions, resource
permissions, data source permissions, UDF function permissions.
-* The administrator can authorize the projects, resources, data sources and
UDF functions not created by ordinary users. Because the authorization methods
for projects, resources, data sources and UDF functions are the same, we take
project authorization as an example.
-* Note: For projects created by users themselves, the user has all
permissions. The project list and the selected project list will not be
displayed.
+* The administrator can authorize the projects, resources, data sources and
UDF functions to normal users which not created by them. Because the way to
authorize projects, resources, data sources and UDF functions to users is the
same, we take project authorization as an example.
+* Note: The user has all permissions to the projects created by them. Projects
will not be displayed in the project list and the selected project list.
</code></pre>
<ul>
-<li>The administrator enters the Security Center -> User Management page
and clicks the "Authorize" button of the user who needs to be
authorized, as shown in the figure below:</li>
+<li>The administrator enters the <code>Security Center -> User
Management</code> page and clicks the <code>Authorize</code> button of the user
who needs to be authorized, as shown in the figure below:</li>
</ul>
<p align="center">
<img src="/img/auth-en.png" width="80%" />
</p>
<ul>
-<li>Select the project to authorize the project.</li>
+<li>Select the project and authorize the project.</li>
</ul>
<p align="center">
<img src="/img/authproject-en.png" width="80%" />
@@ -147,49 +147,49 @@
</ul>
<h2>Worker Grouping</h2>
<p>Each worker node will belong to its own worker group, and the default group
is "default".</p>
-<p>When the task is executed, the task can be assigned to the specified worker
group, and the task will be executed by the worker node in the group.</p>
+<p>When executing a task, the task can be assigned to the specified worker
group, and the task will be executed by the worker node in the group.</p>
<blockquote>
-<p>Add/Update worker group</p>
+<p>Add or update worker group</p>
</blockquote>
<ul>
-<li>Open the "conf/worker.properties" configuration file on the
worker node where you want to set the groups, and modify the
"worker.groups" parameter</li>
-<li>The "worker.groups" parameter is followed by the name of the
group corresponding to the worker node, which is “default”.</li>
-<li>If the worker node corresponds to more than one group, they are separated
by commas</li>
+<li>Open the <code>conf/worker.properties</code> configuration file on the
worker node where you want to configure the groups and modify the
<code>worker.groups</code> parameter.</li>
+<li>The <code>worker.groups</code> parameter is followed by the name of the
group corresponding to the worker node, which is <code>default</code>.</li>
+<li>If the worker node corresponds to more than one group, they are separated
by commas.</li>
</ul>
<pre><code class="language-conf">worker.groups=default,test
</code></pre>
<ul>
-<li>You can also modify the worker group for worker which be assigned to
specific worker group, and if the modification is successful, the worker will
use the new group and ignore the configuration in
<code>worker.properties</code>. The step to modify it as below: "security
center -> worker group management -> click 'new worker group' -> click
'new worker group' -> enter 'group name' -> select exists worker ->
click submit".</li>
+<li>You can also change the worker group for the worker during execution, and
if the modification is successful, the worker will use the new group and ignore
the configuration in <code>worker.properties</code>. The step to modify work
group as below: <code>Security Center -> Worker Group Management -> click
'New Worker Group' -> click 'New Worker Group' -> enter 'Group Name'
-> Select Exists Worker -> Click Submit</code>.</li>
</ul>
<h2>Environmental Management</h2>
<ul>
<li>
-<p>Configure the Worker operating environment online. A Worker can specify
multiple environments, and each environment is equivalent to the
dolphinscheduler_env.sh file.</p>
+<p>Configure the Worker operating environment online. A Worker can specify
multiple environments, and each environment is equivalent to the
<code>dolphinscheduler_env.sh</code> file.</p>
</li>
<li>
-<p>The default environment is the dolphinscheduler_env.sh file.</p>
+<p>The default environment is the <code>dolphinscheduler_env.sh</code>
file.</p>
</li>
<li>
-<p>When the task is executed, the task can be assigned to the designated
worker group, and the corresponding environment can be selected according to
the worker group. Finally, the worker node executes the environment first and
then executes the task.</p>
+<p>When executing a task, the task can be assigned to the specified worker
group, and select the corresponding environment according to the worker group.
Finally, the worker node executes the environment first and then executes the
task.</p>
</li>
</ul>
<blockquote>
-<p>Add/Update environment</p>
+<p>Add or update environment</p>
</blockquote>
<ul>
<li>
-<p>The environment configuration is equivalent to the configuration in the
dolphinscheduler_env.sh file.</p>
+<p>The environment configuration is equivalent to the configuration in the
<code>dolphinscheduler_env.sh</code> file.</p>
<p align="center">
<img src="/img/create-environment.png" width="80%" />
</p>
</li>
</ul>
<blockquote>
-<p>Use environment</p>
+<p>Usage environment</p>
</blockquote>
<ul>
<li>
-<p>Create a task node in the workflow definition and select the environment
corresponding to the Worker group and the Worker group. When the task is
executed, the Worker will execute the environment first before executing the
task.</p>
+<p>Create a task node in the workflow definition, select the worker group and
the environment corresponding to the worker group. When executing the task, the
Worker will execute the environment first before executing the task.</p>
<p align="center">
<img src="/img/use-environment.png" width="80%" />
</p>
diff --git a/en-us/docs/dev/user_doc/guide/security.json
b/en-us/docs/dev/user_doc/guide/security.json
index 378b756..e13415d 100644
--- a/en-us/docs/dev/user_doc/guide/security.json
+++ b/en-us/docs/dev/user_doc/guide/security.json
@@ -1,6 +1,6 @@
{
"filename": "security.md",
- "__html": "<h1>Security</h1>\n<ul>\n<li>Only the administrator account in
the security center has the authority to operate. It has functions such as
queue management, tenant management, user management, alarm group management,
worker group management, token management, etc. In the user management module,
resources, data sources, projects, etc. Authorization</li>\n<li>Administrator
login, default user name and password:
admin/dolphinscheduler123</li>\n</ul>\n<h2>Create Queue</h2>\n<ul>\ [...]
+ "__html": "<h1>Security (Authorization System)</h1>\n<ul>\n<li>Only the
administrator account in the security center has the authority to operate. It
has functions such as queue management, tenant management, user management,
alarm group management, worker group management, token management, etc. In the
user management module, can authorize to the resources, data sources, projects,
etc.</li>\n<li>Administrator login, the default username and password is
<code>admin/dolphinscheduler123< [...]
"link": "/dist/en-us/docs/dev/user_doc/guide/security.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/dev/user_doc/guide/upgrade.html
b/en-us/docs/dev/user_doc/guide/upgrade.html
index 06e8f13..34530f8 100644
--- a/en-us/docs/dev/user_doc/guide/upgrade.html
+++ b/en-us/docs/dev/user_doc/guide/upgrade.html
@@ -11,10 +11,10 @@
</head>
<body>
<div id="root"><div class="md2html docs-page" data-reactroot=""><header
class="header-container header-container-dark"><div class="header-body"><span
class="mobile-menu-btn mobile-menu-btn-dark"></span><a
href="/en-us/index.html"><img class="logo" src="/img/hlogo_white.svg"/></a><div
class="search search-dark"><span class="icon-search"></span></div><span
class="language-switch language-switch-dark">中</span><div
class="header-menu"><div><ul class="ant-menu whiteClass ant-menu-light ant-
[...]
-<h2>Back Up Previous Version's Files and Database</h2>
+<h2>Back-Up Previous Version's Files and Database</h2>
<h2>Stop All Services of DolphinScheduler</h2>
<p><code>sh ./script/stop-all.sh</code></p>
-<h2>Download the New Version's Installation Package</h2>
+<h2>Download the Newest Version Installation Package</h2>
<ul>
<li><a href="/en-us/download/download.html">download</a> the latest version of
the installation packages.</li>
<li>The following upgrade operations need to be performed in the new version's
directory.</li>
@@ -22,10 +22,10 @@
<h2>Database Upgrade</h2>
<ul>
<li>
-<p>Modify the following properties in conf/datasource.properties.</p>
+<p>Modify the following properties in
<code>conf/datasource.properties</code>.</p>
</li>
<li>
-<p>If you use MySQL as the database to run DolphinScheduler, please comment
out PostgreSQL related configurations, and add mysql connector jar into lib
dir, here we download mysql-connector-java-8.0.16.jar, and then correctly
config database connect information. You can download mysql connector jar <a
href="https://downloads.MySQL.com/archives/c-j/";>here</a>. Alternatively, if
you use Postgres as database, you just need to comment out Mysql related
configurations, and correctly config da [...]
+<p>If using MySQL as the database to run DolphinScheduler, please comment out
PostgreSQL related configurations, and add MYSQL connector jar into lib dir,
here we download <code>mysql-connector-java-8.0.16.jar</code>, and then
correctly configure database connection information. You can download MYSQL
connector jar from <a
href="https://downloads.MySQL.com/archives/c-j/";>here</a>. Alternatively, if
you use PostgreSQL as the database, you just need to comment out Mysql related
configurati [...]
<pre><code class="language-properties"><span class="hljs-comment"> #
postgre</span>
<span class="hljs-comment">
#spring.datasource.driver-class-name=org.postgresql.Driver</span>
<span class="hljs-comment">
#spring.datasource.url=jdbc:postgresql://localhost:5432/dolphinscheduler</span>
@@ -37,25 +37,25 @@
</code></pre>
</li>
<li>
-<p>Execute database upgrade script</p>
+<p>Execute database upgrade script:</p>
<p><code>sh ./script/upgrade-dolphinscheduler.sh</code></p>
</li>
</ul>
<h2>Backend Service Upgrade</h2>
<h3>Modify the Content in <code>conf/config/install_config.conf</code>
File</h3>
<ul>
-<li>Standalone Deployment please refer the [6, Modify running arguments] in <a
href="./installation/standalone.md">Standalone-Deployment</a>.</li>
-<li>Cluster Deployment please refer the [6, Modify running arguments] in <a
href="./installation/cluster.md">Cluster-Deployment</a>.</li>
+<li>Standalone Deployment please refer to the <a
href="./installation/standalone.md">Standalone-Deployment</a>.</li>
+<li>Cluster Deployment please refer to the <a
href="./installation/cluster.md">Cluster-Deployment</a>.</li>
</ul>
<h4>Masters Need Attentions</h4>
-<p>Create worker group in 1.3.1 version has different design:</p>
+<p>Create worker group in 1.3.1 version has a different design:</p>
<ul>
<li>Before version 1.3.1 worker group can be created through UI interface.</li>
-<li>Since version 1.3.1 worker group can be created by modify the worker
configuration.</li>
+<li>Since version 1.3.1 worker group can be created by modifying the worker
configuration.</li>
</ul>
-<h4>When Upgrade from Version Before 1.3.1 to 1.3.2, Below Operations are What
We Need to Do to Keep Worker Group Config Consist with Previous</h4>
+<h4>When Upgrade from Version Before 1.3.1 to 1.3.2, the Below Operations are
What We Need to Do to Keep Worker Group Configuration Consist with Previous</h4>
<ol>
-<li>Go to the backup database, search records in t_ds_worker_group table,
mainly focus id, name and IP three columns.</li>
+<li>Go to the backup database, search records in <code>t_ds_worker_group
table</code>, mainly focus <code>id, name and IP</code> three columns.</li>
</ol>
<table>
<thead>
@@ -79,9 +79,9 @@
</tbody>
</table>
<ol start="2">
-<li>Modify the workers config item in conf/config/install_config.conf
file.</li>
+<li>Modify the worker configuration in
<code>conf/config/install_config.conf</code> file.</li>
</ol>
-<p>Imaging bellow are the machine worker service to be deployed:</p>
+<p>Assume bellow are the machine worker service to be deployed:</p>
<table>
<thead>
<tr>
@@ -104,12 +104,12 @@
</tr>
</tbody>
</table>
-<p>To keep worker group config consistent with the previous version, we need
to modify workers config item as below:</p>
+<p>To keep worker group config consistent with the previous version, we need
to modify workers configuration as below:</p>
<pre><code class="language-shell"><span class="hljs-meta">#</span><span
class="bash">worker service is deployed on <span
class="hljs-built_in">which</span> machine, and also specify <span
class="hljs-built_in">which</span> worker group this worker belongs to.</span>
workers="ds1:service1,ds2:service2,ds3:service2"
</code></pre>
<h4>The Worker Group has Been Enhanced in Version 1.3.2</h4>
-<p>Worker in 1.3.1 can't belong to more than one worker group, in 1.3.2 it's
supported. So in 1.3.1 it's not supported when
workers="ds1:service1,ds1:service2", and in 1.3.2 it's supported.</p>
+<p>Workers in 1.3.1 can't belong to more than one worker group, but in 1.3.2
it's supported. So in 1.3.1 it's not supported when
<code>workers="ds1:service1,ds1:service2"</code>, and in 1.3.2 it's
supported.</p>
<h3>Execute Deploy Script</h3>
<pre><code class="language-shell">`sh install.sh`
</code></pre>
diff --git a/en-us/docs/dev/user_doc/guide/upgrade.json
b/en-us/docs/dev/user_doc/guide/upgrade.json
index f51d7f1..e5ae157 100644
--- a/en-us/docs/dev/user_doc/guide/upgrade.json
+++ b/en-us/docs/dev/user_doc/guide/upgrade.json
@@ -1,6 +1,6 @@
{
"filename": "upgrade.md",
- "__html": "<h1>DolphinScheduler Upgrade Documentation</h1>\n<h2>Back Up
Previous Version's Files and Database</h2>\n<h2>Stop All Services of
DolphinScheduler</h2>\n<p><code>sh
./script/stop-all.sh</code></p>\n<h2>Download the New Version's Installation
Package</h2>\n<ul>\n<li><a href=\"/en-us/download/download.html\">download</a>
the latest version of the installation packages.</li>\n<li>The following
upgrade operations need to be performed in the new version's
directory.</li>\n</ul>\n [...]
+ "__html": "<h1>DolphinScheduler Upgrade Documentation</h1>\n<h2>Back-Up
Previous Version's Files and Database</h2>\n<h2>Stop All Services of
DolphinScheduler</h2>\n<p><code>sh
./script/stop-all.sh</code></p>\n<h2>Download the Newest Version Installation
Package</h2>\n<ul>\n<li><a href=\"/en-us/download/download.html\">download</a>
the latest version of the installation packages.</li>\n<li>The following
upgrade operations need to be performed in the new version's
directory.</li>\n</ul>\ [...]
"link": "/dist/en-us/docs/dev/user_doc/guide/upgrade.html",
"meta": {}
}
\ No newline at end of file
diff --git a/img/video_cover/quick-use.png b/img/video_cover/quick-use.png
new file mode 100644
index 0000000..df65898
Binary files /dev/null and b/img/video_cover/quick-use.png differ
diff --git a/zh-cn/docs/dev/user_doc/guide/introduction.html
b/zh-cn/docs/dev/user_doc/guide/introduction.html
index 92ad7f4..0f21450 100644
--- a/zh-cn/docs/dev/user_doc/guide/introduction.html
+++ b/zh-cn/docs/dev/user_doc/guide/introduction.html
@@ -11,7 +11,7 @@
</head>
<body>
<div id="root"><div class="md2html docs-page" data-reactroot=""><header
class="header-container header-container-dark"><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
class="search search-dark"><span class="icon-search"></span></div><span
class="language-switch language-switch-dark">En</span><div
class="header-menu"><div><ul class="ant-menu whiteClass ant-menu-light ant [...]
-<p>用户使用手册向你介绍 DolphinScheduler 所有常见的操作告诉，如果你还没有安装 DolphinScheduler 请参照<a
href="./quick-start.md">快速上手</a> 完成安装</p>
+<p>用户使用手册向你介绍 DolphinScheduler 所有常见的操作，如果你还没有安装 DolphinScheduler 请参照<a
href="./quick-start.md">快速上手</a> 完成安装</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="//cdn.jsdelivr.net/npm/[email protected]/dist/react-with-addons.min.js"></script>
<script
src="//cdn.jsdelivr.net/npm/[email protected]/dist/react-dom.min.js"></script>
diff --git a/zh-cn/docs/dev/user_doc/guide/introduction.json
b/zh-cn/docs/dev/user_doc/guide/introduction.json
index ed3fa7e..f486241 100644
--- a/zh-cn/docs/dev/user_doc/guide/introduction.json
+++ b/zh-cn/docs/dev/user_doc/guide/introduction.json
@@ -1,6 +1,6 @@
{
"filename": "introduction.md",
- "__html": "<h1>系统使用手册</h1>\n<p>用户使用手册向你介绍 DolphinScheduler
所有常见的操作告诉，如果你还没有安装 DolphinScheduler 请参照<a href=\"./quick-start.md\">快速上手</a>
完成安装</p>\n",
+ "__html": "<h1>系统使用手册</h1>\n<p>用户使用手册向你介绍 DolphinScheduler 所有常见的操作，如果你还没有安装
DolphinScheduler 请参照<a href=\"./quick-start.md\">快速上手</a> 完成安装</p>\n",
"link": "/dist/zh-cn/docs/dev/user_doc/guide/introduction.html",
"meta": {}
}
\ No newline at end of file
