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 43d681a92 Automated deployment:
bd5d4b4eadf206439824a437649690f6710ca0d8
43d681a92 is described below
commit 43d681a927fc45fc9c34b679e30e3f7189e6c64c
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri May 27 05:09:58 2022 +0000
Automated deployment: bd5d4b4eadf206439824a437649690f6710ca0d8
---
.../dev/user_doc/architecture/configuration.html | 10 +++
.../dev/user_doc/architecture/configuration.json | 2 +-
.../user_doc/guide/installation/kubernetes.html | 2 +-
.../user_doc/guide/installation/kubernetes.json | 2 +-
.../guide/installation/pseudo-cluster.html | 4 +-
.../guide/installation/pseudo-cluster.json | 2 +-
.../user_doc/guide/installation/standalone.html | 20 +++---
.../user_doc/guide/installation/standalone.json | 2 +-
.../docs/dev/user_doc/guide/start/quick-start.html | 2 +-
.../docs/dev/user_doc/guide/start/quick-start.json | 2 +-
en-us/docs/dev/user_doc/guide/upgrade.html | 76 +++++++++++----------
en-us/docs/dev/user_doc/guide/upgrade.json | 2 +-
.../dev/user_doc/architecture/configuration.html | 10 +++
.../dev/user_doc/architecture/configuration.json | 2 +-
.../user_doc/guide/installation/kubernetes.html | 4 +-
.../user_doc/guide/installation/kubernetes.json | 2 +-
.../guide/installation/pseudo-cluster.html | 2 +-
.../guide/installation/pseudo-cluster.json | 2 +-
.../user_doc/guide/installation/standalone.html | 19 +++---
.../user_doc/guide/installation/standalone.json | 2 +-
.../docs/dev/user_doc/guide/start/quick-start.html | 2 +-
.../docs/dev/user_doc/guide/start/quick-start.json | 2 +-
zh-cn/docs/dev/user_doc/guide/upgrade.html | 79 ++++++++++++----------
zh-cn/docs/dev/user_doc/guide/upgrade.json | 2 +-
24 files changed, 138 insertions(+), 116 deletions(-)
diff --git a/en-us/docs/dev/user_doc/architecture/configuration.html
b/en-us/docs/dev/user_doc/architecture/configuration.html
index d3753c87f..c063f11da 100644
--- a/en-us/docs/dev/user_doc/architecture/configuration.html
+++ b/en-us/docs/dev/user_doc/architecture/configuration.html
@@ -620,6 +620,16 @@ Currently, DS just makes a basic config, remember to
config further JVM options
<td>default</td>
<td>worker groups separated by comma, e.g., 'worker.groups=default,test' <br>
worker will join corresponding group according to this config when startup</td>
</tr>
+<tr>
+<td>worker.tenant.auto.create</td>
+<td>true</td>
+<td>tenant corresponds to the user of the system, which is used by the worker
to submit the job. If system does not have this user, it will be automatically
created after the parameter worker.tenant.auto.create is true.</td>
+</tr>
+<tr>
+<td>worker.tenant.distributed.user</td>
+<td>false</td>
+<td>Scenes to be used for distributed users.For example,users created by
FreeIpa are stored in LDAP.This parameter only applies to Linux, When this
parameter is true, worker.tenant.auto.create has no effect and will not
automatically create tenants.</td>
+</tr>
</tbody>
</table>
<h3>alert.properties [alert-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 a4fb55c45..0cf7663b1 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/installation/kubernetes.html
b/en-us/docs/dev/user_doc/guide/installation/kubernetes.html
index 61f17295a..160a3ecca 100644
--- a/en-us/docs/dev/user_doc/guide/installation/kubernetes.html
+++ b/en-us/docs/dev/user_doc/guide/installation/kubernetes.html
@@ -51,7 +51,7 @@ $ kubectl port-forward --address 0.0.0.0 -n <span
class="hljs-built_in">test</sp
<blockquote>
<p><strong>Tip</strong>: If the error of <code>unable to do port forwarding:
socat not found</code> appears, you need to install <code>socat</code>
first.</p>
</blockquote>
-<p>Access the web: <code>http://localhost:12345/dolphinscheduler</code>
(Modify the IP address if needed).</p>
+<p>Access the web: <code>http://localhost:12345/dolphinscheduler/ui</code>
(Modify the IP address if needed).</p>
<p>Or when <code>api.service.type=NodePort</code> you need to execute the
command:</p>
<pre><code class="language-bash">NODE_IP=$(kubectl get no -n {{
.Release.Namespace }} -o jsonpath=<span
class="hljs-string">"{.items[0].status.addresses[0].address}"</span>)
NODE_PORT=$(kubectl get svc {{ template <span
class="hljs-string">"dolphinscheduler.fullname"</span> . }}-api -n {{
.Release.Namespace }} -o jsonpath=<span
class="hljs-string">"{.spec.ports[0].nodePort}"</span>)
diff --git a/en-us/docs/dev/user_doc/guide/installation/kubernetes.json
b/en-us/docs/dev/user_doc/guide/installation/kubernetes.json
index b08b6c2bc..f08faf56b 100644
--- a/en-us/docs/dev/user_doc/guide/installation/kubernetes.json
+++ b/en-us/docs/dev/user_doc/guide/installation/kubernetes.json
@@ -1,6 +1,6 @@
{
"filename": "kubernetes.md",
- "__html": "<h1>QuickStart in Kubernetes</h1>\n<p>Kubernetes deployment is
DolphinScheduler deployment in a Kubernetes cluster, which can schedule massive
tasks and can be used in production.</p>\n<p>If you are a new hand and want to
experience DolphinScheduler functions, we recommend you install follow <a
href=\"standalone.md\">Standalone deployment</a>. If you want to experience
more complete functions and schedule massive tasks, we recommend you install
follow <a href=\"pseudo-cluste [...]
+ "__html": "<h1>QuickStart in Kubernetes</h1>\n<p>Kubernetes deployment is
DolphinScheduler deployment in a Kubernetes cluster, which can schedule massive
tasks and can be used in production.</p>\n<p>If you are a new hand and want to
experience DolphinScheduler functions, we recommend you install follow <a
href=\"standalone.md\">Standalone deployment</a>. If you want to experience
more complete functions and schedule massive tasks, we recommend you install
follow <a href=\"pseudo-cluste [...]
"link": "/dist/en-us/docs/dev/user_doc/guide/installation/kubernetes.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.html
b/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.html
index d435f84f6..2c5468f90 100644
--- a/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.html
+++ b/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.html
@@ -12,7 +12,7 @@
<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://join.slack.com/t/asf-dolphinscheduler/shared_invite/zt-omtdhuio-_JISsxYhiVsltmC5h38yfw";>join
#dolphinscheduler channel</a>! 🌟</div></div><div class="header-body"><span
class="mobile-menu-btn mobile-menu-btn-dark"></span> [...]
<p>The purpose of the pseudo-cluster deployment is to deploy the
DolphinScheduler service on a single machine. In this mode, DolphinScheduler's
master, worker, API server, are all on the same machine.</p>
-<p>If you are a new hand and want to experience DolphinScheduler functions, we
recommend you install follow <a href="standalone.md">Standalone deployment</a>.
If you want to experience more complete functions and schedule massive tasks,
we recommend you install follow <a href="pseudo-cluster.md">pseudo-cluster
deployment</a>. If you want to deploy DolphinScheduler in production, we
recommend you follow <a href="cluster.md">cluster deployment</a> or <a
href="kubernetes.md">Kubernetes depl [...]
+<p>If you are a new hand and want to experience DolphinScheduler functions, we
recommend you install follow <a href="standalone.md">Standalone deployment</a>.
If you want to experience more complete functions and schedule massive tasks,
we recommend you install follow[pseudo-cluster deployment. If you want to
deploy DolphinScheduler in production, we recommend you follow <a
href="cluster.md">cluster deployment</a> or <a href="kubernetes.md">Kubernetes
deployment</a>.</p>
<h2>Preparation</h2>
<p>Pseudo-cluster deployment of DolphinScheduler requires external software
support:</p>
<ul>
@@ -176,7 +176,7 @@ export SPRING_DATASOURCE_PASSWORD={password}
this is non-important information that you can ignore.</p>
</blockquote>
<h2>Login DolphinScheduler</h2>
-<p>Access address <code>http://localhost:12345/dolphinscheduler</code> and
login DolphinScheduler UI. The default username and password are
<strong>admin/dolphinscheduler123</strong></p>
+<p>Access address <code>http://localhost:12345/dolphinscheduler/ui</code> and
login DolphinScheduler UI. The default username and password are
<strong>admin/dolphinscheduler123</strong></p>
<h2>Start or Stop Server</h2>
<pre><code class="language-shell"><span class="hljs-meta">#</span><span
class="bash"> Stop all DolphinScheduler server</span>
sh ./bin/stop-all.sh
diff --git a/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.json
b/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.json
index d61d5e926..0c3c76a33 100644
--- a/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.json
+++ b/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.json
@@ -1,6 +1,6 @@
{
"filename": "pseudo-cluster.md",
- "__html": "<h1>Pseudo-Cluster Deployment</h1>\n<p>The purpose of the
pseudo-cluster deployment is to deploy the DolphinScheduler service on a single
machine. In this mode, DolphinScheduler's master, worker, API server, are all
on the same machine.</p>\n<p>If you are a new hand and want to experience
DolphinScheduler functions, we recommend you install follow <a
href=\"standalone.md\">Standalone deployment</a>. If you want to experience
more complete functions and schedule massive tasks [...]
+ "__html": "<h1>Pseudo-Cluster Deployment</h1>\n<p>The purpose of the
pseudo-cluster deployment is to deploy the DolphinScheduler service on a single
machine. In this mode, DolphinScheduler's master, worker, API server, are all
on the same machine.</p>\n<p>If you are a new hand and want to experience
DolphinScheduler functions, we recommend you install follow <a
href=\"standalone.md\">Standalone deployment</a>. If you want to experience
more complete functions and schedule massive tasks [...]
"link":
"/dist/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/dev/user_doc/guide/installation/standalone.html
b/en-us/docs/dev/user_doc/guide/installation/standalone.html
index 0270a86f3..914b3d5ab 100644
--- a/en-us/docs/dev/user_doc/guide/installation/standalone.html
+++ b/en-us/docs/dev/user_doc/guide/installation/standalone.html
@@ -12,7 +12,7 @@
<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://join.slack.com/t/asf-dolphinscheduler/shared_invite/zt-omtdhuio-_JISsxYhiVsltmC5h38yfw";>join
#dolphinscheduler channel</a>! 🌟</div></div><div class="header-body"><span
class="mobile-menu-btn mobile-menu-btn-dark"></span> [...]
<p>Standalone only for quick experience for DolphinScheduler.</p>
-<p>If you are a new hand and want to experience DolphinScheduler functions, we
recommend you install follow <a href="standalone.md">Standalone deployment</a>.
If you want to experience more complete functions and schedule massive tasks,
we recommend you install follow <a href="pseudo-cluster.md">pseudo-cluster
deployment</a>. If you want to deploy DolphinScheduler in production, we
recommend you follow <a href="cluster.md">cluster deployment</a> or <a
href="kubernetes.md">Kubernetes depl [...]
+<p>If you are a new hand and want to experience DolphinScheduler functions, we
recommend you install follow Standalone deployment. If you want to experience
more complete functions and schedule massive tasks, we recommend you install
follow <a href="pseudo-cluster.md">pseudo-cluster deployment</a>. If you want
to deploy DolphinScheduler in production, we recommend you follow <a
href="cluster.md">cluster deployment</a> or <a href="kubernetes.md">Kubernetes
deployment</a>.</p>
<blockquote>
<p><strong><em>Note:</em></strong> Standalone only recommends the usage of
fewer than 20 workflows, because it uses in-memory H2 Database in default,
ZooKeeper Testing Server, too many tasks may cause instability.
When Standalone stops or restarts, in-memory H2 database will clear up. To use
Standalone with external databases like mysql or postgresql, please see <a
href="#database-configuration"><code>Database Configuration</code></a>.</p>
@@ -31,7 +31,7 @@ cd apache-dolphinscheduler-*-bin
sh ./bin/dolphinscheduler-daemon.sh start standalone-server
</code></pre>
<h3>Login DolphinScheduler</h3>
-<p>Access address <code>http://localhost:12345/dolphinscheduler</code> and
login DolphinScheduler UI. The default username and password are
<strong>admin/dolphinscheduler123</strong></p>
+<p>Access address <code>http://localhost:12345/dolphinscheduler/ui</code> and
login DolphinScheduler UI. The default username and password are
<strong>admin/dolphinscheduler123</strong></p>
<h3>Start or Stop Server</h3>
<p>The script <code>./bin/dolphinscheduler-daemon.sh</code>can be used not
only quickly start standalone, but also to stop the service operation. The
following are all the commands:</p>
<pre><code class="language-shell"><span class="hljs-meta">#</span><span
class="bash"> Start Standalone Server</span>
@@ -44,11 +44,13 @@ sh ./bin/dolphinscheduler-daemon.sh stop standalone-server
service please disabled it by changing the yaml config
<code>python-gateway.enabled : false</code> in api-server's configuration
path <code>api-server/conf/application.yaml</code></p>
</blockquote>
-<h3>Database Configuration</h3>
+<h2>Database Configuration</h2>
+<p>Standalone server use H2 database as its metadata store, it is easy and
users do not need to start database before they set up server.
+But if user want to store metabase in other database like MySQL or PostgreSQL,
they have to change some configuration. And we here use
+MySQL as an example to illustrate how to configure an external database:</p>
<ul>
-<li>Use mysql as an example to illustrate how to configure an external
database:</li>
<li>First of all, follow the instructions in <a
href="pseudo-cluster.md">pseudo-cluster deployment</a> <code>Initialize the
Database</code> section to create and initialize database</li>
-<li>Set the following environment variables in your terminal with your
database username and password for {user} and {password}:</li>
+<li>Set the following environment variables in your terminal with your
database username and password for <code>{user}</code> and
<code>{password}</code>:</li>
</ul>
<pre><code class="language-shell">export DATABASE=${DATABASE:-mysql}
export SPRING_PROFILES_ACTIVE=${DATABASE}
@@ -56,12 +58,8 @@ export SPRING_DATASOURCE_USERNAME={user}
export SPRING_DATASOURCE_PASSWORD={password}
</code></pre>
<ul>
-<li>
-<p>Add mysql-connector-java driver to
<code>./standalone-server/libs/standalone-server/</code>, see <a
href="pseudo-cluster.md">pseudo-cluster deployment</a> <code>Initialize the
Database</code> section about where to download</p>
-</li>
-<li>
-<p>Start standalone-server, now you are using mysql as database and it will
not clear up your data when you stop or restart standalone-server.</p>
-</li>
+<li>Add mysql-connector-java driver to
<code>./standalone-server/libs/standalone-server/</code>, see <a
href="pseudo-cluster.md">pseudo-cluster deployment</a> <code>Initialize the
Database</code> section about where to download</li>
+<li>Start standalone-server, now you are using mysql as database and it will
not clear up your data when you stop or restart standalone-server.</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/installation/standalone.json
b/en-us/docs/dev/user_doc/guide/installation/standalone.json
index 843827281..a41ee8f2a 100644
--- a/en-us/docs/dev/user_doc/guide/installation/standalone.json
+++ b/en-us/docs/dev/user_doc/guide/installation/standalone.json
@@ -1,6 +1,6 @@
{
"filename": "standalone.md",
- "__html": "<h1>Standalone</h1>\n<p>Standalone only for quick experience for
DolphinScheduler.</p>\n<p>If you are a new hand and want to experience
DolphinScheduler functions, we recommend you install follow <a
href=\"standalone.md\">Standalone deployment</a>. If you want to experience
more complete functions and schedule massive tasks, we recommend you install
follow <a href=\"pseudo-cluster.md\">pseudo-cluster deployment</a>. If you want
to deploy DolphinScheduler in production, we re [...]
+ "__html": "<h1>Standalone</h1>\n<p>Standalone only for quick experience for
DolphinScheduler.</p>\n<p>If you are a new hand and want to experience
DolphinScheduler functions, we recommend you install follow Standalone
deployment. If you want to experience more complete functions and schedule
massive tasks, we recommend you install follow <a
href=\"pseudo-cluster.md\">pseudo-cluster deployment</a>. If you want to deploy
DolphinScheduler in production, we recommend you follow <a href=\"c [...]
"link": "/dist/en-us/docs/dev/user_doc/guide/installation/standalone.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/dev/user_doc/guide/start/quick-start.html
b/en-us/docs/dev/user_doc/guide/start/quick-start.html
index 4d0779ee9..23c50f19d 100644
--- a/en-us/docs/dev/user_doc/guide/start/quick-start.html
+++ b/en-us/docs/dev/user_doc/guide/start/quick-start.html
@@ -19,7 +19,7 @@
<li>
<p>Administrator user login</p>
<blockquote>
-<p>Address：<a
href="http://localhost:12345/dolphinscheduler";>http://localhost:12345/dolphinscheduler</a>
Username and password: <code>admin/dolphinscheduler123</code></p>
+<p>Address：<a
href="http://localhost:12345/dolphinscheduler/ui";>http://localhost:12345/dolphinscheduler/ui</a>
Username and password: <code>admin/dolphinscheduler123</code></p>
</blockquote>
</li>
</ul>
diff --git a/en-us/docs/dev/user_doc/guide/start/quick-start.json
b/en-us/docs/dev/user_doc/guide/start/quick-start.json
index 2bd121363..fcbd95c92 100644
--- a/en-us/docs/dev/user_doc/guide/start/quick-start.json
+++ b/en-us/docs/dev/user_doc/guide/start/quick-start.json
@@ -1,6 +1,6 @@
{
"filename": "quick-start.md",
- "__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 [...]
+ "__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/ui\";>http://localhost:12345/dolphinscheduler/ui</a>
Username and password:
<code>admin/dolphinscheduler123</code></p>\n</blockquote>\n</li [...]
"link": "/dist/en-us/docs/dev/user_doc/guide/start/quick-start.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 0cc90a518..e34bfb16f 100644
--- a/en-us/docs/dev/user_doc/guide/upgrade.html
+++ b/en-us/docs/dev/user_doc/guide/upgrade.html
@@ -10,47 +10,48 @@
<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://join.slack.com/t/asf-dolphinscheduler/shared_invite/zt-omtdhuio-_JISsxYhiVsltmC5h38yfw";>join
#dolphinscheduler channel</a>! 🌟</div></div><div class="header-body"><span
class="mobile-menu-btn mobile-menu-btn-dark"></span> [...]
-<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 Latest 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>
-</ul>
-<h2>Database Upgrade</h2>
-<ul>
-<li>
-<p>If using MySQL as the database to run DolphinScheduler, please config it in
<code>./bin/env/dolphinscheduler_env.sh</code>, change username and password to
yours, and add MYSQL connector jar into lib dir <code>./tools/libs</code>, 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>. Otherwise,
PostgreSQL is the [...]
-<pre><code class="language-shell">export DATABASE=${DATABASE:-mysql}
+ <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://join.slack.com/t/asf-dolphinscheduler/shared_invite/zt-omtdhuio-_JISsxYhiVsltmC5h38yfw";>join
#dolphinscheduler channel</a>! 🌟</div></div><div class="header-body"><span
class="mobile-menu-btn mobile-menu-btn-dark"></span> [...]
+<h2>Prepare</h2>
+<h3>Backup Previous Version's Files and Database</h3>
+<p>To prevent data loss by some miss-operation, it is recommended to back up
data before upgrading. The backup way according to your environment.</p>
+<h3>Download the Latest Version Installation Package</h3>
+<p>Download the latest binary distribute package from <a
href="/en-us/download/download.html">download</a> and then put it in the
different
+directory where current service running. And all below command is running in
this directory.</p>
+<h2>Upgrade</h2>
+<h3>Stop All Services of DolphinScheduler</h3>
+<p>Stop all services of dolphinscheduler according to your deployment method.
If you deploy your dolphinscheduler according to <a
href="./installation/cluster.md">cluster deployment</a>, you can stop all
services by command <code>sh ./script/stop-all.sh</code>.</p>
+<h3>Upgrade Database</h3>
+<p>Change configuration in <code>./bin/env/dolphinscheduler_env.sh</code>
({user} and {password} are changed to your database username and password), and
then run the upgrade script.</p>
+<p>Using MySQL as an example, change the value if you use other databases.
Please manually download the <a
href="https://downloads.MySQL.com/archives/c-j/";>mysql-connector-java driver
jar</a>
+jar package and add it to the <code>./tools/libs</code> directory, then change
<code>./bin/ env/dolphinscheduler_env.sh</code> file</p>
+<pre><code>```shell
+export DATABASE=${DATABASE:-mysql}
export SPRING_PROFILES_ACTIVE=${DATABASE}
export
SPRING_DATASOURCE_URL=jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8
export SPRING_DATASOURCE_USERNAME={user}
export SPRING_DATASOURCE_PASSWORD={password}
+```
</code></pre>
-</li>
-<li>
-<p>Execute database upgrade script:</p>
-<p><code>sh ./tools/bin/upgrade-schema.sh</code></p>
-</li>
+<p>Execute database upgrade script: <code>sh
./tools/bin/upgrade-schema.sh</code>
+K</p>
+<h3>Upgrade Service</h3>
+<h4>Change Configuration <code>bin/env/install_config.conf</code></h4>
+<ul>
+<li>If you deploy with Pseudo-Cluster deployment, change it according to <a
href="./installation/pseudo-cluster.md">Pseudo-Cluster</a> section "Modify
Configuration".</li>
+<li>If you deploy with Cluster deployment, change it according to <a
href="./installation/cluster.md">Cluster</a> section "Modify
Configuration".</li>
</ul>
-<h2>Backend Service Upgrade</h2>
-<h3>Modify the Content in <code>conf/config/install_config.conf</code>
File</h3>
+<p>And them run command <code>sh ./bin/start-all.sh</code> to start all
services.</p>
+<h2>Notice</h2>
+<h3>Differences of worker group (before or after version 1.3.1 of
dolphinscheduler)</h3>
+<p>The architecture of worker group is different between version before
version 1.3.1 until version 2.0.0</p>
<ul>
-<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>
+<li>Before version 1.3.1(include itself) worker group can be created through
UI interface.</li>
+<li>Since version 1.3.1 and before version 2.0.0, worker group can be created
by modifying the worker configuration.</li>
</ul>
-<h4>Masters Need Attentions</h4>
-<p>Create worker group in 1.3.1 version has a different design:</p>
+<h4>How Can I Do When I Upgrade from 1.3.1 to version before 2.0.0</h4>
<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 modifying the worker
configuration.</li>
+<li>Check the backup database, search records in table
<code>t_ds_worker_group</code> table and mainly focus on three columns:
<code>id, name and IP</code>.</li>
</ul>
-<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 <code>t_ds_worker_group
table</code>, mainly focus <code>id, name and IP</code> three columns.</li>
-</ol>
<table>
<thead>
<tr>
@@ -72,9 +73,9 @@ export SPRING_DATASOURCE_PASSWORD={password}
</tr>
</tbody>
</table>
-<ol start="2">
-<li>Modify the worker configuration in
<code>conf/config/install_config.conf</code> file.</li>
-</ol>
+<ul>
+<li>Modify worker related configuration in
<code>bin/env/install_config.conf</code>.</li>
+</ul>
<p>Assume bellow are the machine worker service to be deployed:</p>
<table>
<thead>
@@ -103,10 +104,11 @@ export SPRING_DATASOURCE_PASSWORD={password}
workers="ds1:service1,ds2:service2,ds3:service2"
</code></pre>
<h4>The Worker Group has Been Enhanced in Version 1.3.2</h4>
-<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`
+<p>Workers in 1.3.1 can only belong to one worker group, but after version
1.3.2 and before version 2.0.0 worker support more than one worker group.</p>
+<pre><code class="language-sh">workers=<span
class="hljs-string">"ds1:service1,ds1:service2"</span>
</code></pre>
+<h4>Recovery UI Create Worker Group after Version 2.0.0</h4>
+<p>After version 2.0.0, include itself, we are recovery function create worker
group from web UI.</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/upgrade.json
b/en-us/docs/dev/user_doc/guide/upgrade.json
index fbe4da65d..b548e4806 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 Latest 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>\ [...]
+ "__html": "<h1>DolphinScheduler Upgrade</h1>\n<h2>Prepare</h2>\n<h3>Backup
Previous Version's Files and Database</h3>\n<p>To prevent data loss by some
miss-operation, it is recommended to back up data before upgrading. The backup
way according to your environment.</p>\n<h3>Download the Latest Version
Installation Package</h3>\n<p>Download the latest binary distribute package
from <a href=\"/en-us/download/download.html\">download</a> and then put it in
the different\ndirectory where cu [...]
"link": "/dist/en-us/docs/dev/user_doc/guide/upgrade.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/dev/user_doc/architecture/configuration.html
b/zh-cn/docs/dev/user_doc/architecture/configuration.html
index e1fa3fb81..465d38ce6 100644
--- a/zh-cn/docs/dev/user_doc/architecture/configuration.html
+++ b/zh-cn/docs/dev/user_doc/architecture/configuration.html
@@ -619,6 +619,16 @@
<td>default</td>
<td>worker分组配置,逗号分隔,例如'worker.groups=default,test' <br>
worker启动时会根据该配置自动加入对应的分组</td>
</tr>
+<tr>
+<td>worker.tenant.auto.create</td>
+<td>true</td>
+<td>租户对应于系统的用户,由worker提交作业.如果系统没有该用户,则在参数worker.tenant.auto.create为true后自动创建。</td>
+</tr>
+<tr>
+<td>worker.tenant.distributed.user</td>
+<td>false</td>
+<td>使用场景为分布式用户例如使用FreeIpa创建的用户存于LDAP中.该参数只适用于Linux,当该参数为true时worker.tenant.auto.create将不生效,不会自动去创建租户</td>
+</tr>
</tbody>
</table>
<h2>8.alert.properties [Alert 告警服务配置]</h2>
diff --git a/zh-cn/docs/dev/user_doc/architecture/configuration.json
b/zh-cn/docs/dev/user_doc/architecture/configuration.json
index 593eaadbe..5e41e0d3d 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/installation/kubernetes.html
b/zh-cn/docs/dev/user_doc/guide/installation/kubernetes.html
index a3b6dd453..2aae3e4c6 100644
--- a/zh-cn/docs/dev/user_doc/guide/installation/kubernetes.html
+++ b/zh-cn/docs/dev/user_doc/guide/installation/kubernetes.html
@@ -51,13 +51,13 @@ $ kubectl port-forward --address 0.0.0.0 -n <span
class="hljs-built_in">test</sp
<blockquote>
<p><strong>提示</strong>: 如果出现 <code>unable to do port forwarding: socat not
found</code> 错误, 需要先安装 <code>socat</code></p>
</blockquote>
-<p>访问前端页面：<a
href="http://localhost:12345/dolphinscheduler%EF%BC%8C%E5%A6%82%E6%9E%9C%E6%9C%89%E9%9C%80%E8%A6%81%E8%AF%B7%E4%BF%AE%E6%94%B9%E6%88%90%E5%AF%B9%E5%BA%94%E7%9A%84";>http://localhost:12345/dolphinscheduler，如果有需要请修改成对应的</a>
IP 地址</p>
+<p>访问前端页面：<a
href="http://localhost:12345/dolphinscheduler/ui%EF%BC%8C%E5%A6%82%E6%9E%9C%E6%9C%89%E9%9C%80%E8%A6%81%E8%AF%B7%E4%BF%AE%E6%94%B9%E6%88%90%E5%AF%B9%E5%BA%94%E7%9A%84";>http://localhost:12345/dolphinscheduler/ui，如果有需要请修改成对应的</a>
IP 地址</p>
<p>或者当 <code>api.service.type=NodePort</code> 时，你需要执行命令：</p>
<pre><code class="language-bash">NODE_IP=$(kubectl get no -n {{
.Release.Namespace }} -o jsonpath=<span
class="hljs-string">"{.items[0].status.addresses[0].address}"</span>)
NODE_PORT=$(kubectl get svc {{ template <span
class="hljs-string">"dolphinscheduler.fullname"</span> . }}-api -n {{
.Release.Namespace }} -o jsonpath=<span
class="hljs-string">"{.spec.ports[0].nodePort}"</span>)
<span class="hljs-built_in">echo</span> http://<span
class="hljs-variable">$NODE_IP</span>:<span
class="hljs-variable">$NODE_PORT</span>/dolphinscheduler
</code></pre>
-<p>然后访问前端页面: <a
href="http://localhost:12345/dolphinscheduler";>http://localhost:12345/dolphinscheduler</a></p>
+<p>然后访问前端页面: <a
href="http://localhost:12345/dolphinscheduler/ui";>http://localhost:12345/dolphinscheduler/ui</a></p>
<p>默认的用户是<code>admin</code>，默认的密码是<code>dolphinscheduler123</code></p>
<p>请参考用户手册章节的<a
href="../start/quick-start.md">快速上手</a>查看如何使用DolphinScheduler</p>
<h2>卸载 dolphinscheduler</h2>
diff --git a/zh-cn/docs/dev/user_doc/guide/installation/kubernetes.json
b/zh-cn/docs/dev/user_doc/guide/installation/kubernetes.json
index 7a8d3fcbc..5d1f39d32 100644
--- a/zh-cn/docs/dev/user_doc/guide/installation/kubernetes.json
+++ b/zh-cn/docs/dev/user_doc/guide/installation/kubernetes.json
@@ -1,6 +1,6 @@
{
"filename": "kubernetes.md",
- "__html": "<h1>快速试用 Kubernetes 部署</h1>\n<p>Kubernetes部署目的是在Kubernetes集群中部署
DolphinScheduler 服务，能调度大量任务，可用于在生产中部署。</p>\n<p>如果你是新手，想要体验 DolphinScheduler
的功能，推荐使用<a
href=\"standalone.md\">Standalone</a>方式体检。如果你想体验更完整的功能，或者更大的任务量，推荐使用<a
href=\"pseudo-cluster.md\">伪集群部署</a>。如果你是在生产中使用，推荐使用<a
href=\"cluster.md\">集群部署</a>或者<a
href=\"kubernetes.md\">kubernetes</a></p>\n<h2>先决条件</h2>\n<ul>\n<li><a
href=\"https://helm.sh/\";>Helm</a> 3.1.0+</li>\n<li><a
href=\"https://kubernetes.io/\";>Kubernetes< [...]
+ "__html": "<h1>快速试用 Kubernetes 部署</h1>\n<p>Kubernetes部署目的是在Kubernetes集群中部署
DolphinScheduler 服务，能调度大量任务，可用于在生产中部署。</p>\n<p>如果你是新手，想要体验 DolphinScheduler
的功能，推荐使用<a
href=\"standalone.md\">Standalone</a>方式体检。如果你想体验更完整的功能，或者更大的任务量，推荐使用<a
href=\"pseudo-cluster.md\">伪集群部署</a>。如果你是在生产中使用，推荐使用<a
href=\"cluster.md\">集群部署</a>或者<a
href=\"kubernetes.md\">kubernetes</a></p>\n<h2>先决条件</h2>\n<ul>\n<li><a
href=\"https://helm.sh/\";>Helm</a> 3.1.0+</li>\n<li><a
href=\"https://kubernetes.io/\";>Kubernetes< [...]
"link": "/dist/zh-cn/docs/dev/user_doc/guide/installation/kubernetes.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.html
b/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.html
index 8a200a230..a6fb1813f 100644
--- a/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.html
+++ b/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.html
@@ -172,7 +172,7 @@ export SPRING_DATASOURCE_PASSWORD={password}
<p><strong><em>注意:</em></strong> 第一次部署的话，可能出现 5 次<code>sh:
bin/dolphinscheduler-daemon.sh: No such file or
directory</code>相关信息，次为非重要信息直接忽略即可</p>
</blockquote>
<h2>登录 DolphinScheduler</h2>
-<p>浏览器访问地址 <a
href="http://localhost:12345/dolphinscheduler";>http://localhost:12345/dolphinscheduler</a>
即可登录系统UI。默认的用户名和密码是 <strong>admin/dolphinscheduler123</strong></p>
+<p>浏览器访问地址 <a
href="http://localhost:12345/dolphinscheduler/ui";>http://localhost:12345/dolphinscheduler/ui</a>
即可登录系统UI。默认的用户名和密码是 <strong>admin/dolphinscheduler123</strong></p>
<h2>启停服务</h2>
<pre><code class="language-shell"><span class="hljs-meta">#</span><span
class="bash"> 一键停止集群所有服务</span>
sh ./bin/stop-all.sh
diff --git a/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.json
b/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.json
index 220bf6894..a13185fc2 100644
--- a/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.json
+++ b/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.json
@@ -1,6 +1,6 @@
{
"filename": "pseudo-cluster.md",
- "__html": "<h1>伪集群部署</h1>\n<p>伪集群部署目的是在单台机器部署 DolphinScheduler
服务，该模式下master、worker、api server 都在同一台机器上</p>\n<p>如果你是新手，想要体验 DolphinScheduler
的功能，推荐使用<a
href=\"standalone.md\">Standalone</a>方式体检。如果你想体验更完整的功能，或者更大的任务量，推荐使用<a
href=\"pseudo-cluster.md\">伪集群部署</a>。如果你是在生产中使用，推荐使用<a
href=\"cluster.md\">集群部署</a>或者<a
href=\"kubernetes.md\">kubernetes</a></p>\n<h2>前置准备工作</h2>\n<p>伪分布式部署
DolphinScheduler 需要有外部软件的支持</p>\n<ul>\n<li>JDK：下载<a
href=\"https://www.oracle.com/technetwork/java/javase/dow [...]
+ "__html": "<h1>伪集群部署</h1>\n<p>伪集群部署目的是在单台机器部署 DolphinScheduler
服务，该模式下master、worker、api server 都在同一台机器上</p>\n<p>如果你是新手，想要体验 DolphinScheduler
的功能，推荐使用<a
href=\"standalone.md\">Standalone</a>方式体检。如果你想体验更完整的功能，或者更大的任务量，推荐使用<a
href=\"pseudo-cluster.md\">伪集群部署</a>。如果你是在生产中使用，推荐使用<a
href=\"cluster.md\">集群部署</a>或者<a
href=\"kubernetes.md\">kubernetes</a></p>\n<h2>前置准备工作</h2>\n<p>伪分布式部署
DolphinScheduler 需要有外部软件的支持</p>\n<ul>\n<li>JDK：下载<a
href=\"https://www.oracle.com/technetwork/java/javase/dow [...]
"link":
"/dist/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/dev/user_doc/guide/installation/standalone.html
b/zh-cn/docs/dev/user_doc/guide/installation/standalone.html
index 4a6ef54cf..714ac10e8 100644
--- a/zh-cn/docs/dev/user_doc/guide/installation/standalone.html
+++ b/zh-cn/docs/dev/user_doc/guide/installation/standalone.html
@@ -12,7 +12,7 @@
<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://join.slack.com/t/asf-dolphinscheduler/shared_invite/zt-omtdhuio-_JISsxYhiVsltmC5h38yfw";>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 cl [...]
<p>Standalone 仅适用于 DolphinScheduler 的快速体验.</p>
-<p>如果你是新手，想要体验 DolphinScheduler 的功能，推荐使用<a
href="standalone.md">Standalone</a>方式体检。如果你想体验更完整的功能，或者更大的任务量，推荐使用<a
href="pseudo-cluster.md">伪集群部署</a>。如果你是在生产中使用，推荐使用<a
href="cluster.md">集群部署</a>或者<a href="kubernetes.md">kubernetes</a></p>
+<p>如果你是新手，想要体验 DolphinScheduler
的功能，推荐使用Standalone方式体检。如果你想体验更完整的功能，或者更大的任务量，推荐使用<a
href="pseudo-cluster.md">伪集群部署</a>。如果你是在生产中使用，推荐使用<a
href="cluster.md">集群部署</a>或者<a href="kubernetes.md">kubernetes</a></p>
<blockquote>
<p><strong><em>注意:</em></strong> Standalone仅建议20个以下工作流使用，因为其采用内存式的H2 Database,
Zookeeper Testing Server，任务过多可能导致不稳定，并且如果重启或者停止standalone-server会导致内存中数据库里的数据清空。
如果您要连接外部数据库，比如mysql或者postgresql，请看<a
href="#%E9%85%8D%E7%BD%AE%E6%95%B0%E6%8D%AE%E5%BA%93">配置数据库</a></p>
@@ -31,7 +31,7 @@ cd apache-dolphinscheduler-*-bin
sh ./bin/dolphinscheduler-daemon.sh start standalone-server
</code></pre>
<h3>登录 DolphinScheduler</h3>
-<p>浏览器访问地址 <a
href="http://localhost:12345/dolphinscheduler";>http://localhost:12345/dolphinscheduler</a>
即可登录系统UI。默认的用户名和密码是 <strong>admin/dolphinscheduler123</strong></p>
+<p>浏览器访问地址 <a
href="http://localhost:12345/dolphinscheduler/ui";>http://localhost:12345/dolphinscheduler/ui</a>
即可登录系统UI。默认的用户名和密码是 <strong>admin/dolphinscheduler123</strong></p>
<h2>启停服务</h2>
<p>脚本 <code>./bin/dolphinscheduler-daemon.sh</code> 除了可以快捷启动 standalone
外，还能停止服务运行，全部命令如下</p>
<pre><code class="language-shell"><span class="hljs-meta">#</span><span
class="bash"> 启动 Standalone Server 服务</span>
@@ -39,11 +39,12 @@ sh ./bin/dolphinscheduler-daemon.sh start standalone-server
<span class="hljs-meta">#</span><span class="bash"> 停止 Standalone Server
服务</span>
sh ./bin/dolphinscheduler-daemon.sh stop standalone-server
</code></pre>
-<h3>配置数据库</h3>
+<h2>配置数据库</h2>
+<p>Standalone server 使用 H2
数据库作为其元数据存储数据，这是为了上手简单，用户在启动服务器之前不需要启动数据库。但是如果用户想将元数据库存储在
+MySQL 或 PostgreSQL 等其他数据库中，他们必须更改一些配置。我们这里以 MySQL 为例来说明如何配置外部数据库：</p>
<ul>
-<li>这里以mysql为例介绍如何连接外部数据库</li>
<li>首先，参照 <a href="pseudo-cluster.md">伪集群部署</a> <code>初始化数据库</code>
创建并初始化数据库</li>
-<li>在你的命令行设定下列环境变量，将{user}和{password}改为你数据库的用户名和密码</li>
+<li>在你的命令行设定下列环境变量，将 <code>{user}</code> 和 <code>{password}</code>
改为你数据库的用户名和密码</li>
</ul>
<pre><code class="language-shell">export DATABASE=${DATABASE:-mysql}
export SPRING_PROFILES_ACTIVE=${DATABASE}
@@ -51,12 +52,8 @@ export SPRING_DATASOURCE_USERNAME={user}
export SPRING_DATASOURCE_PASSWORD={password}
</code></pre>
<ul>
-<li>
-<p>将mysql-connector-java驱动加到<code>./standalone-server/libs/standalone-server/</code>目录下,
下载方法见 <a href="pseudo-cluster.md">伪集群部署</a> <code>初始化数据库</code> 一栏</p>
-</li>
-<li>
-<p>启动standalone-server，此时你已经连接上mysql，重启或者停止standalone-server并不会清空您数据库里的数据</p>
-</li>
+<li>将mysql-connector-java驱动加到<code>./standalone-server/libs/standalone-server/</code>目录下,
下载方法见 <a href="pseudo-cluster.md">伪集群部署</a> <code>初始化数据库</code> 一栏</li>
+<li>启动standalone-server，此时你已经连接上mysql，重启或者停止standalone-server并不会清空您数据库里的数据</li>
</ul>
</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>
diff --git a/zh-cn/docs/dev/user_doc/guide/installation/standalone.json
b/zh-cn/docs/dev/user_doc/guide/installation/standalone.json
index 2b9ee2290..9f4834049 100644
--- a/zh-cn/docs/dev/user_doc/guide/installation/standalone.json
+++ b/zh-cn/docs/dev/user_doc/guide/installation/standalone.json
@@ -1,6 +1,6 @@
{
"filename": "standalone.md",
- "__html": "<h1>Standalone极速体验版</h1>\n<p>Standalone 仅适用于 DolphinScheduler
的快速体验.</p>\n<p>如果你是新手，想要体验 DolphinScheduler 的功能，推荐使用<a
href=\"standalone.md\">Standalone</a>方式体检。如果你想体验更完整的功能，或者更大的任务量，推荐使用<a
href=\"pseudo-cluster.md\">伪集群部署</a>。如果你是在生产中使用，推荐使用<a
href=\"cluster.md\">集群部署</a>或者<a
href=\"kubernetes.md\">kubernetes</a></p>\n<blockquote>\n<p><strong><em>注意:</em></strong>
Standalone仅建议20个以下工作流使用，因为其采用内存式的H2 Database, Zookeeper Testing
Server，任务过多可能导致不稳定，并且如果重启或者停止standalone-server会导致 [...]
+ "__html": "<h1>Standalone极速体验版</h1>\n<p>Standalone 仅适用于 DolphinScheduler
的快速体验.</p>\n<p>如果你是新手，想要体验 DolphinScheduler
的功能，推荐使用Standalone方式体检。如果你想体验更完整的功能，或者更大的任务量，推荐使用<a
href=\"pseudo-cluster.md\">伪集群部署</a>。如果你是在生产中使用，推荐使用<a
href=\"cluster.md\">集群部署</a>或者<a
href=\"kubernetes.md\">kubernetes</a></p>\n<blockquote>\n<p><strong><em>注意:</em></strong>
Standalone仅建议20个以下工作流使用，因为其采用内存式的H2 Database, Zookeeper Testing
Server，任务过多可能导致不稳定，并且如果重启或者停止standalone-server会导致内存中数据库里的数据清空。\n如果您要连接外部数据库，比如m
[...]
"link": "/dist/zh-cn/docs/dev/user_doc/guide/installation/standalone.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/dev/user_doc/guide/start/quick-start.html
b/zh-cn/docs/dev/user_doc/guide/start/quick-start.html
index fd5946671..7ee0dc93a 100644
--- a/zh-cn/docs/dev/user_doc/guide/start/quick-start.html
+++ b/zh-cn/docs/dev/user_doc/guide/start/quick-start.html
@@ -19,7 +19,7 @@
<li>
<p>管理员用户登录</p>
<blockquote>
-<p>地址：<a
href="http://localhost:12345/dolphinscheduler";>http://localhost:12345/dolphinscheduler</a>
用户名/密码：admin/dolphinscheduler123</p>
+<p>地址：<a
href="http://localhost:12345/dolphinscheduler/ui";>http://localhost:12345/dolphinscheduler/ui</a>
用户名/密码：admin/dolphinscheduler123</p>
</blockquote>
</li>
</ul>
diff --git a/zh-cn/docs/dev/user_doc/guide/start/quick-start.json
b/zh-cn/docs/dev/user_doc/guide/start/quick-start.json
index db9b6d2fc..577cdeb8b 100644
--- a/zh-cn/docs/dev/user_doc/guide/start/quick-start.json
+++ b/zh-cn/docs/dev/user_doc/guide/start/quick-start.json
@@ -1,6 +1,6 @@
{
"filename": "quick-start.md",
- "__html": "<h1>快速上手</h1>\n<ul>\n<li>\n<p>喜欢看视频的伙伴可以参见手把手教你如何《快速上手 Apache
DolphinScheduler 教程》\n<a
href=\"https://www.bilibili.com/video/BV1d64y1s7eZ\";><img
src=\"https://user-images.githubusercontent.com/15833811/126286960-dfb3bfee-c8fb-4bdf-a717-d3be221c9711.png\";
alt=\"image\"></a></p>\n</li>\n<li>\n<p>管理员用户登录</p>\n<blockquote>\n<p>地址：<a
href=\"http://localhost:12345/dolphinscheduler\";>http://localhost:12345/dolphinscheduler</a>
用户名/密码：admin/dolphinscheduler123</p>\n</blockquote>\n</ [...]
+ "__html": "<h1>快速上手</h1>\n<ul>\n<li>\n<p>喜欢看视频的伙伴可以参见手把手教你如何《快速上手 Apache
DolphinScheduler 教程》\n<a
href=\"https://www.bilibili.com/video/BV1d64y1s7eZ\";><img
src=\"https://user-images.githubusercontent.com/15833811/126286960-dfb3bfee-c8fb-4bdf-a717-d3be221c9711.png\";
alt=\"image\"></a></p>\n</li>\n<li>\n<p>管理员用户登录</p>\n<blockquote>\n<p>地址：<a
href=\"http://localhost:12345/dolphinscheduler/ui\";>http://localhost:12345/dolphinscheduler/ui</a>
用户名/密码：admin/dolphinscheduler123</p>\n</blockquot [...]
"link": "/dist/zh-cn/docs/dev/user_doc/guide/start/quick-start.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/dev/user_doc/guide/upgrade.html
b/zh-cn/docs/dev/user_doc/guide/upgrade.html
index 44551a6ab..24a28533f 100644
--- a/zh-cn/docs/dev/user_doc/guide/upgrade.html
+++ b/zh-cn/docs/dev/user_doc/guide/upgrade.html
@@ -10,43 +10,47 @@
<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://join.slack.com/t/asf-dolphinscheduler/shared_invite/zt-omtdhuio-_JISsxYhiVsltmC5h38yfw";>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 cl [...]
-<h2>1. 备份上一版本文件和数据库</h2>
-<h2>2. 停止dolphinscheduler所有服务</h2>
-<p><code>sh ./script/stop-all.sh</code></p>
-<h2>3. 下载新版本的安装包</h2>
-<ul>
-<li><a href="/zh-cn/download/download.html">下载</a>, 下载最新版本的二进制安装包</li>
-<li>以下升级操作都需要在新版本的目录进行</li>
-</ul>
-<h2>4. 数据库升级</h2>
-<ul>
-<li>
-<p>如果选择
MySQL，请修改<code>./bin/env/dolphinscheduler_env.sh</code>中的如下配置（{user}和{password}改成你数据库的用户名和密码）,
还需要手动添加 <a href="https://downloads.MySQL.com/archives/c-j/";>
mysql-connector-java 驱动 jar </a> 包到 lib
目录（<code>./tools/lib</code>）下，这里下载的是mysql-connector-java-8.0.16.jar</p>
-<pre><code class="language-shell">export DATABASE=${DATABASE:-mysql}
+ <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://join.slack.com/t/asf-dolphinscheduler/shared_invite/zt-omtdhuio-_JISsxYhiVsltmC5h38yfw";>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 cl [...]
+<h2>准备工作</h2>
+<h3>备份上一版本文件和数据库</h3>
+<p>为了防止操作错误导致数据丢失，建议升级之前备份数据，备份方法请结合你数据库的情况来定</p>
+<h3>下载新版本的安装包</h3>
+<p>在<a href="/zh-cn/download/download.html">下载</a>页面下载最新版本的二进制安装包，并将二进制包放到与当前
dolphinscheduler 服务不一样的路径中，以下升级操作都需要在新版本的目录进行。</p>
+<h2>升级步骤</h2>
+<h3>停止 dolphinscheduler 所有服务</h3>
+<p>根据你部署方式停止 dolphinscheduler 的所有服务，如果你是通过 <a
href="./installation/cluster.md">集群部署</a> 来部署你的 dolphinscheduler 的话，可以通过
<code>sh ./script/stop-all.sh</code> 停止全部服务。</p>
+<h3>数据库升级</h3>
+<p>修改 <code>./bin/env/dolphinscheduler_env.sh</code>
中的如下配置（{user}和{password}改成你数据库的用户名和密码），然后运行升级脚本。</p>
+<p>下面以 MySQL 为例，别的数据库仅需要修改成对应的配置即可。请先手动下载 <a
href="https://downloads.MySQL.com/archives/c-j/";>mysql-connector-java 驱动 jar</a>
+jar 包 并添加到 <code>./tools/libs</code> 目录下，修改
<code>./bin/env/dolphinscheduler_env.sh</code> 文件</p>
+<pre><code>```shell
+export DATABASE=${DATABASE:-mysql}
export SPRING_PROFILES_ACTIVE=${DATABASE}
export
SPRING_DATASOURCE_URL=jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8
export SPRING_DATASOURCE_USERNAME={user}
export SPRING_DATASOURCE_PASSWORD={password}
+```
</code></pre>
-</li>
-<li>
-<p>执行数据库升级脚本</p>
-</li>
+<p>执行数据库升级脚本：<code>sh ./tools/bin/upgrade-schema.sh</code></p>
+<h3>服务升级</h3>
+<h4>修改 <code>bin/env/install_config.conf</code> 配置内容</h4>
+<ul>
+<li>伪集群部署请参照<a
href="./installation/pseudo-cluster.md">伪集群部署(Pseudo-Cluster)</a>中的
<code>修改相关配置</code></li>
+<li>集群部署请参照<a href="./installation/cluster.md">集群部署(Cluster)</a>中的
<code>修改相关配置</code></li>
</ul>
-<p><code>sh ./tools/bin/upgrade-schema.sh</code></p>
-<h2>5. 服务升级</h2>
-<h3>5.1 修改<code>conf/config/install_config.conf</code>配置内容</h3>
-<p>单机部署请参照<a
href="./installation/standalone.md">单机部署(Standalone)</a>中的<code>6.修改运行参数部分</code>
-集群部署请参照<a
href="./installation/cluster.md">集群部署(Cluster)</a>中的<code>6.修改运行参数部分</code></p>
-<h3>注意事项</h3>
-<p>创建worker分组在1.3.1版本和之前版本有了不同的设计</p>
+<p>然后运行命令 <code>sh ./bin/start-all.sh</code> 重启全部服务。</p>
+<h2>注意事项</h2>
+<h3>worker 分组的区别（以 1.3.1 版本为界）</h3>
+<p>创建worker分组在1.3.1版本之前，与 1.3.1之后到 2.0.0 之间的版本有不同的设计：</p>
<ul>
<li>worker分组在1.3.1版本之前是通过UI界面创建</li>
-<li>worker分组在1.3.1版本是修改worker配置指定</li>
+<li>worker分组在1.3.1 到 2.0.0之前的版本是修改 worker 配置指定</li>
+</ul>
+<h4>面对这种区别我应该怎么升级</h4>
+<p>1.3.1之前的版本升级1.3.2时如何设置worker分组与之前一致</p>
+<ul>
+<li>查询已备份的数据库，查看 <code>t_ds_worker_group</code>
表记录，重点看下id、name和ip_list三个字段</li>
</ul>
-<h3>1.3.1之前的版本升级1.3.2时如何设置worker分组与之前一致</h3>
-<p>1、查询已备份的数据库,查看t_ds_worker_group表记录，重点看下id、name和ip_list三个字段</p>
<table>
<thead>
<tr>
@@ -68,7 +72,9 @@ export SPRING_DATASOURCE_PASSWORD={password}
</tr>
</tbody>
</table>
-<p>2、修改conf/config/install_config.conf中的workers参数</p>
+<ul>
+<li>修改 <code>bin/env/install_config.conf</code> 中的 workers 参数</li>
+</ul>
<p>假设以下为要部署的worker主机名和ip的对应关系</p>
<table>
<thead>
@@ -93,16 +99,15 @@ export SPRING_DATASOURCE_PASSWORD={password}
</tbody>
</table>
<p>那么为了保持与之前版本worker分组一致，则需要把workers参数改为如下</p>
-<pre><code class="language-shell"><span class="hljs-meta">#</span><span
class="bash">worker服务部署在哪台机器上,并指定此worker属于哪一个worker组</span>
-workers="ds1:service1,ds2:service2,ds3:service2"
+<pre><code class="language-sh"><span class="hljs-comment">#
worker服务部署在哪台机器上,并指定此worker属于哪一个worker组</span>
+workers=<span
class="hljs-string">"ds1:service1,ds2:service2,ds3:service2"</span>
</code></pre>
-<h3>1.3.2的worker分组进行了增强</h3>
-<p>1.3.1版本的worker不能同时属于多个worker分组，1.3.2是可以支持的
-所以在1.3.1里面的workers="ds1:service1,ds1:service2"是不支持的，
-在1.3.2可以设置workers="ds1:service1,ds1:service2"</p>
-<h3>5.2 执行部署脚本</h3>
-<pre><code class="language-shell">`sh install.sh`
+<h4>1.3.2及以后的版本对 worker 分组功能进行增强</h4>
+<p>1.3.1
以及之前的版本worker不能同时属于多个worker分组，1.3.2及之后，2.0.0之前的版本是可以支持的，所以可以使用如下配置对一台worker配置多个分组</p>
+<pre><code class="language-sh">workers=<span
class="hljs-string">"ds1:service1,ds1:service2"</span>
</code></pre>
+<h4>在 2.0.0 版本之后恢复 UI 创建 worker group</h4>
+<p>在 2.0.0 以及之后的版本，我们恢复了在 UI 创建 worker group 的功能。</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/upgrade.json
b/zh-cn/docs/dev/user_doc/guide/upgrade.json
index 6deaeb4a6..70b4820ca 100644
--- a/zh-cn/docs/dev/user_doc/guide/upgrade.json
+++ b/zh-cn/docs/dev/user_doc/guide/upgrade.json
@@ -1,6 +1,6 @@
{
"filename": "upgrade.md",
- "__html": "<h1>DolphinScheduler升级文档</h1>\n<h2>1. 备份上一版本文件和数据库</h2>\n<h2>2.
停止dolphinscheduler所有服务</h2>\n<p><code>sh
./script/stop-all.sh</code></p>\n<h2>3. 下载新版本的安装包</h2>\n<ul>\n<li><a
href=\"/zh-cn/download/download.html\">下载</a>,
下载最新版本的二进制安装包</li>\n<li>以下升级操作都需要在新版本的目录进行</li>\n</ul>\n<h2>4.
数据库升级</h2>\n<ul>\n<li>\n<p>如果选择
MySQL，请修改<code>./bin/env/dolphinscheduler_env.sh</code>中的如下配置（{user}和{password}改成你数据库的用户名和密码）,
还需要手动添加 <a href=\"https://downloads.MySQL.com/archives/c-j/\";> mysql [...]
+ "__html": "<h1>DolphinScheduler
升级</h1>\n<h2>准备工作</h2>\n<h3>备份上一版本文件和数据库</h3>\n<p>为了防止操作错误导致数据丢失，建议升级之前备份数据，备份方法请结合你数据库的情况来定</p>\n<h3>下载新版本的安装包</h3>\n<p>在<a
href=\"/zh-cn/download/download.html\">下载</a>页面下载最新版本的二进制安装包，并将二进制包放到与当前
dolphinscheduler 服务不一样的路径中，以下升级操作都需要在新版本的目录进行。</p>\n<h2>升级步骤</h2>\n<h3>停止
dolphinscheduler 所有服务</h3>\n<p>根据你部署方式停止 dolphinscheduler 的所有服务，如果你是通过 <a
href=\"./installation/cluster.md\">集群部署</a> 来部署你的 dolphinscheduler 的话，可以通过
<code>sh ./script/stop-all.sh</code> [...]
"link": "/dist/zh-cn/docs/dev/user_doc/guide/upgrade.html",
"meta": {}
}
\ No newline at end of file
![https://user-images.githubusercontent.com/15833811/126286960-dfb3bfee-c8fb-4bdf-a717-d3be221c9711.png\"](https://user-images.githubusercontent.com/15833811/126286960-dfb3bfee-c8fb-4bdf-a717-d3be221c9711.png\"){kind=link}