You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by gi...@apache.org on 2020/06/11 09:22:45 UTC
[incubator-dolphinscheduler-website] branch asf-site updated:
Automated deployment: Thu Jun 11 09:22:34 UTC 2020
b57401fe289b0dccef5bb2abd8449cc869756a65
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/incubator-dolphinscheduler-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new d23192e Automated deployment: Thu Jun 11 09:22:34 UTC 2020 b57401fe289b0dccef5bb2abd8449cc869756a65
d23192e is described below
commit d23192ecd1b44d82e18b7137803ef951db18a635
Author: dailidong <da...@users.noreply.github.com>
AuthorDate: Thu Jun 11 09:22:34 2020 +0000
Automated deployment: Thu Jun 11 09:22:34 UTC 2020 b57401fe289b0dccef5bb2abd8449cc869756a65
---
zh-cn/docs/1.3.0/user_doc/cluster-deployment.html | 121 ++++++++++-----------
zh-cn/docs/1.3.0/user_doc/cluster-deployment.json | 2 +-
.../docs/1.3.0/user_doc/standalone-deployment.html | 103 +++++++++---------
.../docs/1.3.0/user_doc/standalone-deployment.json | 2 +-
zh-cn/docs/1.3.0/user_doc/upgrade.html | 121 +++++++++++++++++++++
zh-cn/docs/1.3.0/user_doc/upgrade.json | 6 +
6 files changed, 237 insertions(+), 118 deletions(-)
diff --git a/zh-cn/docs/1.3.0/user_doc/cluster-deployment.html b/zh-cn/docs/1.3.0/user_doc/cluster-deployment.html
index f0a8061..da858bb 100644
--- a/zh-cn/docs/1.3.0/user_doc/cluster-deployment.html
+++ b/zh-cn/docs/1.3.0/user_doc/cluster-deployment.html
@@ -24,7 +24,7 @@
</code></pre>
<h1>2、下载二进制tar.gz包</h1>
<ul>
-<li>请下载最新版本的后端安装包至服务器部署目录,比如创建 /opt/dolphinscheduler 做为安装部署目录，下载地址： <a href="https://dolphinscheduler.apache.org/zh-cn/docs/release/download.html">下载</a> (以1.2.0版本为例)，下载后上传tar包到该目录中，并进行解压</li>
+<li>请下载最新版本的后端安装包至服务器部署目录,比如创建 /opt/dolphinscheduler 做为安装部署目录，下载地址： <a href="https://dist.apache.org/repos/dist/dev/incubator/dolphinscheduler/1.3.0/apache-dolphinscheduler-incubating-1.3.0-dolphinscheduler-bin.tar.gz">下载</a>，下载后上传tar包到该目录中，并进行解压</li>
</ul>
<pre><code class="language-shell"><span class="hljs-meta">#</span><span class="bash"> 创建部署目录,部署目录请不要创建在/root、/home等高权限目录 </span>
mkdir -p /opt/dolphinscheduler;
@@ -137,9 +137,9 @@ done
<li>
<p>创建表和导入基础数据</p>
<ul>
-<li>修改 conf 目录下 application-dao.properties 中的下列配置</li>
+<li>修改 conf 目录下 datasource.properties 中的下列配置</li>
</ul>
-<pre><code class="language-shell"> vi conf/application-dao.properties
+<pre><code class="language-shell"> vi conf/datasource.properties
</code></pre>
<ul>
<li>如果选择 MySQL，请注释掉 PostgreSQL 相关配置(反之同理), 还需要手动添加 [<a href="https://downloads.mysql.com/archives/c-j/"> mysql-connector-java 驱动 jar </a>] 包到 lib 目录下，这里下载的是mysql-connector-java-5.1.47.jar，然后正确配置数据库连接相关信息</li>
@@ -149,7 +149,7 @@ done
<span class="hljs-comment"> #spring.datasource.url=jdbc:postgresql://localhost:5432/dolphinscheduler</span>
<span class="hljs-comment"> # mysql</span>
<span class="hljs-meta">spring.datasource.driver-class-name</span>=<span class="hljs-string">com.mysql.jdbc.Driver</span>
- <span class="hljs-meta">spring.datasource.url</span>=<span class="hljs-string">jdbc:mysql://xxx:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8 需要修改ip</span>
+ <span class="hljs-meta">spring.datasource.url</span>=<span class="hljs-string">jdbc:mysql://xxx:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true 需要修改ip</span>
<span class="hljs-meta">spring.datasource.username</span>=<span class="hljs-string">xxx 需要修改为上面的{user}值</span>
<span class="hljs-meta">spring.datasource.password</span>=<span class="hljs-string">xxx 需要修改为上面的{password}值</span>
</code></pre>
@@ -165,18 +165,24 @@ done
<ul>
<li>
<p>修改 conf/env 目录下的 <code>dolphinscheduler_env.sh</code> 环境变量(以相关用到的软件都安装在/opt/soft下为例)</p>
-<pre><code class="language-shell">export HADOOP_HOME=/opt/soft/hadoop
-export HADOOP_CONF_DIR=/opt/soft/hadoop/etc/hadoop
-<span class="hljs-meta">#</span><span class="bash"><span class="hljs-built_in">export</span> SPARK_HOME1=/opt/soft/spark1</span>
-export SPARK_HOME2=/opt/soft/spark2
-export PYTHON_HOME=/opt/soft/python
-export JAVA_HOME=/opt/soft/java
-export HIVE_HOME=/opt/soft/hive
-export FLINK_HOME=/opt/soft/flink
-export PATH=$HADOOP_HOME/bin:$SPARK_HOME2/bin:$PYTHON_HOME:$JAVA_HOME/bin:$HIVE_HOME/bin:$PATH:$FLINK_HOME/bin:$PATH
+<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
+ export SPARK_HOME2=/opt/soft/spark2
+ export PYTHON_HOME=/opt/soft/python
+ export JAVA_HOME=/opt/soft/java
+ export HIVE_HOME=/opt/soft/hive
+ export FLINK_HOME=/opt/soft/flink
+ export DATAX_HOME=/opt/soft/datax/bin/datax.py
+ export PATH=$HADOOP_HOME/bin:$SPARK_HOME2/bin:$PYTHON_HOME:$JAVA_HOME/bin:$HIVE_HOME/bin:$PATH:$FLINK_HOME/bin:$DATAX_HOME:$PATH
+
+ ```
+
+ `注: 这一步非常重要,例如 JAVA_HOME 和 PATH 是必须要配置的，没有用到的可以忽略或者注释掉`
+
+
</code></pre>
-<p><code>注: 这一步非常重要,例如 JAVA_HOME 和 PATH 是必须要配置的，没有用到的可以忽略或者注释掉；如果找不到.dolphinscheduler_env.sh, 请运行 ls -a</code></p>
</li>
<li>
<p>将jdk软链到/usr/bin/java下(仍以 JAVA_HOME=/opt/soft/java 为例)</p>
@@ -184,12 +190,12 @@ export PATH=$HADOOP_HOME/bin:$SPARK_HOME2/bin:$PYTHON_HOME:$JAVA_HOME/bin:$HIVE_
</code></pre>
</li>
<li>
-<p>修改一键部署脚本 <code>install.sh</code>中的各参数，特别注意以下参数的配置</p>
+<p>修改一键部署配置文件 <code>conf/config/install_config.conf</code>中的各参数，特别注意以下参数的配置</p>
<pre><code class="language-shell"><span class="hljs-meta">#</span><span class="bash"> 这里填 mysql or postgresql</span>
dbtype="mysql"
<span class="hljs-meta">
#</span><span class="bash"> 数据库连接地址</span>
-dbhost="localhost:3306"
+dbhost="192.168.xx.xx:3306"
<span class="hljs-meta">
#</span><span class="bash"> 数据库名</span>
dbname="dolphinscheduler"
@@ -200,40 +206,21 @@ username="xxx"
#</span><span class="bash"> 数据库密码, 如果有特殊字符，请使用\转义，需要修改为上面设置的{passowrd}具体值</span>
passowrd="xxx"
<span class="hljs-meta">
+#</span><span class="bash">Zookeeper地址</span>
+zkQuorum="192.168.xx.xx:2181,192.168.xx.xx:2181,192.168.xx.xx:2181"
+<span class="hljs-meta">
#</span><span class="bash">将DS安装到哪个目录，如: /opt/soft/dolphinscheduler，不同于现在的目录</span>
installPath="/opt/soft/dolphinscheduler"
<span class="hljs-meta">
-#</span><span class="bash">使用哪个用户部署，使用1.3小节创建的用户</span>
+#</span><span class="bash">使用哪个用户部署，使用第3节创建的用户</span>
deployUser="dolphinscheduler"
<span class="hljs-meta">
-#</span><span class="bash">Zookeeper地址，单机本机是localhost:2181，记得把2181端口带上</span>
-zkQuorum="localhost:2181"
-<span class="hljs-meta">
-#</span><span class="bash">在哪些机器上部署DS服务，本机选localhost</span>
-ips="localhost"
-<span class="hljs-meta">
-#</span><span class="bash">ssh端口,默认22</span>
-sshPort="22"
-<span class="hljs-meta">
-#</span><span class="bash">master服务部署在哪台机器上</span>
-masters="localhost"
-<span class="hljs-meta">
-#</span><span class="bash">worker服务部署在哪台机器上,并指定此worker属于哪一个worker组</span>
-workers="localhost:default"
-<span class="hljs-meta">
-#</span><span class="bash">报警服务部署在哪台机器上</span>
-alertServer="localhost"
-<span class="hljs-meta">
-#</span><span class="bash">后端api服务部署在在哪台机器上</span>
-apiServers="localhost"
-<span class="hljs-meta">
-
#</span><span class="bash"> 邮件配置，以qq邮箱为例</span>
<span class="hljs-meta">#</span><span class="bash"> 邮件协议</span>
mailProtocol="SMTP"
<span class="hljs-meta">
#</span><span class="bash"> 邮件服务地址</span>
-mailServerHost="smtp.exmail.qq.com"
+mailServerHost="smtp.qq.com"
<span class="hljs-meta">
#</span><span class="bash"> 邮件服务端口</span>
mailServerPort="25"
@@ -251,42 +238,52 @@ mailPassword="xxx"
#</span><span class="bash"> TLS协议的邮箱设置为<span class="hljs-literal">true</span>，否则设置为<span class="hljs-literal">false</span></span>
starttlsEnable="true"
<span class="hljs-meta">
-#</span><span class="bash"> 邮件服务地址值，参考上面 mailServerHost</span>
-sslTrust="smtp.exmail.qq.com"
-<span class="hljs-meta">
#</span><span class="bash"> 开启SSL协议的邮箱配置为<span class="hljs-literal">true</span>，否则为<span class="hljs-literal">false</span>。注意: starttlsEnable和sslEnable不能同时为<span class="hljs-literal">true</span></span>
sslEnable="false"
<span class="hljs-meta">
-#</span><span class="bash"> excel下载路径</span>
-xlsFilePath="/tmp/xls"
+#</span><span class="bash"> 邮件服务地址值，参考上面 mailServerHost</span>
+sslTrust="smtp.qq.com"
<span class="hljs-meta">
+
#</span><span class="bash"> 业务用到的比如sql等资源文件上传到哪里，可以设置：HDFS,S3,NONE，单机如果想使用本地文件系统，请配置为HDFS，因为HDFS支持本地文件系统；如果不需要资源上传功能请选择NONE。强调一点：使用本地文件系统不需要部署hadoop</span>
resourceStorageType="HDFS"
<span class="hljs-meta">
-#</span><span class="bash"> 资源上传根路径,主持HDFS和S3,由于hdfs支持本地文件系统，需要确保本地文件夹存在且有读写权限</span>
- resourceUploadPath="/data/dolphinscheduler"
+#</span><span class="bash">如果上传资源保存想保存在hadoop上，hadoop集群的NameNode启用了HA的话，需要将hadoop的配置文件core-site.xml和hdfs-site.xml放到conf目录下，本例即是放到/opt/dolphinscheduler/conf下面，并配置namenode cluster名称；如果NameNode不是HA,则只需要将mycluster修改为具体的ip或者主机名即可</span>
+defaultFS="hdfs://mycluster:8020"
<span class="hljs-meta">
-#</span><span class="bash"> 具备权限创建resourceUploadPath的用户</span>
- hdfsRootUser="hdfs"
+
+#</span><span class="bash"> 如果没有使用到Yarn,保持以下默认值即可;如果ResourceManager是HA，则配置为ResourceManager节点的主备ip或者hostname,比如<span class="hljs-string">"192.168.xx.xx,192.168.xx.xx"</span>;如果是单ResourceManager请配置yarnHaIps=<span class="hljs-string">""</span>即可</span>
+yarnHaIps="192.168.xx.xx,192.168.xx.xx"
<span class="hljs-meta">
-#</span><span class="bash"> 这里以保存到本地文件系统为例</span>
-<span class="hljs-meta">#</span><span class="bash">注：但是如果你想上传到HDFS的话，NameNode启用了HA，则需要将core-site.xml和hdfs-site.xml放到conf目录下，本例即是放到/opt/dolphinscheduler/conf下面，并配置namenode cluster名称；如果NameNode不是HA,则修改为具体的ip或者主机名即可</span>
-defaultFS="file:///data/dolphinscheduler" #hdfs://{具体的ip/主机名}:8020
+#</span><span class="bash"> 如果ResourceManager是HA或者没有使用到Yarn保持默认值即可；如果是单ResourceManager，请配置真实的ResourceManager主机名或者ip</span>
+singleYarnIp="yarnIp1"
<span class="hljs-meta">
-
-#</span><span class="bash"> 如果ResourceManager是HA，则配置为ResourceManager节点的主备ip或者hostname,比如<span class="hljs-string">"192.168.xx.xx,192.168.xx.xx"</span>，否则如果是单ResourceManager或者根本没用到yarn,请配置yarnHaIps=<span class="hljs-string">""</span>即可，我这里没用到yarn，配置为<span class="hljs-string">""</span></span>
-yarnHaIps=""
+#</span><span class="bash"> 资源上传根路径,主持HDFS和S3,由于hdfs支持本地文件系统，需要确保本地文件夹存在且有读写权限</span>
+resourceUploadPath="/data/dolphinscheduler"
+<span class="hljs-meta">
+#</span><span class="bash"> 具备权限创建resourceUploadPath的用户</span>
+hdfsRootUser="hdfs"
<span class="hljs-meta">
-#</span><span class="bash"> 如果是单ResourceManager，则配置为ResourceManager节点ip或主机名，否则保持默认值即可。我这里没用到yarn，保持默认</span>
-singleYarnIp="ark1"
-
-*注：如果打算用到`资源中心`功能，请执行以下命令：*
+#</span><span class="bash">在哪些机器上部署DS服务，本机选localhost</span>
+ips="ds1,ds2,ds3,ds4"
+<span class="hljs-meta">
+#</span><span class="bash">ssh端口,默认22</span>
+sshPort="22"
+<span class="hljs-meta">
+#</span><span class="bash">master服务部署在哪台机器上</span>
+masters="ds1,ds2"
+<span class="hljs-meta">
+#</span><span class="bash">worker服务部署在哪台机器上,并指定此worker属于哪一个worker组,下面示例的default即为组名</span>
+workers="ds3:default,ds4:default"
+<span class="hljs-meta">
+#</span><span class="bash">报警服务部署在哪台机器上</span>
+alertServer="ds2"
+<span class="hljs-meta">
+#</span><span class="bash">后端api服务部署在在哪台机器上</span>
+apiServers="ds1"
-```shell
-sudo mkdir /data/dolphinscheduler
-sudo chown -R dolphinscheduler:dolphinscheduler /data/dolphinscheduler
</code></pre>
<p><em>特别注意：</em></p>
<ul>
diff --git a/zh-cn/docs/1.3.0/user_doc/cluster-deployment.json b/zh-cn/docs/1.3.0/user_doc/cluster-deployment.json
index 8ec8972..e41954c 100644
--- a/zh-cn/docs/1.3.0/user_doc/cluster-deployment.json
+++ b/zh-cn/docs/1.3.0/user_doc/cluster-deployment.json
@@ -1,6 +1,6 @@
{
"filename": "cluster-deployment.md",
- "__html": "<h1>集群部署(Cluster)</h1>\n<h1>1、基础软件安装(必装项请自行安装)</h1>\n<ul>\n<li>PostgreSQL (8.2.15+) or MySQL (5.7系列) : 两者任选其一即可</li>\n<li><a href=\"https://www.oracle.com/technetwork/java/javase/downloads/index.html\">JDK</a> (1.8+) : 必装，请安装好后在/etc/profile下配置 JAVA_HOME 及 PATH 变量</li>\n<li>ZooKeeper (3.4.6+) ：必装</li>\n<li>Hadoop (2.6+) or MinIO ：选装，如果需要用到资源上传功能，可以选择上传到Hadoop or MinIO上</li>\n</ul>\n<pre><code class=\"language-markdown\"> 注意：DolphinScheduler本身不依赖Hadoop、Hive、Spark,仅是会调用他们的Cl [...]
+ "__html": "<h1>集群部署(Cluster)</h1>\n<h1>1、基础软件安装(必装项请自行安装)</h1>\n<ul>\n<li>PostgreSQL (8.2.15+) or MySQL (5.7系列) : 两者任选其一即可</li>\n<li><a href=\"https://www.oracle.com/technetwork/java/javase/downloads/index.html\">JDK</a> (1.8+) : 必装，请安装好后在/etc/profile下配置 JAVA_HOME 及 PATH 变量</li>\n<li>ZooKeeper (3.4.6+) ：必装</li>\n<li>Hadoop (2.6+) or MinIO ：选装，如果需要用到资源上传功能，可以选择上传到Hadoop or MinIO上</li>\n</ul>\n<pre><code class=\"language-markdown\"> 注意：DolphinScheduler本身不依赖Hadoop、Hive、Spark,仅是会调用他们的Cl [...]
"link": "/zh-cn/docs/1.3.0/user_doc/cluster-deployment.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/1.3.0/user_doc/standalone-deployment.html b/zh-cn/docs/1.3.0/user_doc/standalone-deployment.html
index 5e201f9..29e8f89 100644
--- a/zh-cn/docs/1.3.0/user_doc/standalone-deployment.html
+++ b/zh-cn/docs/1.3.0/user_doc/standalone-deployment.html
@@ -25,7 +25,7 @@
</code></pre>
<h1>2、下载二进制tar.gz包</h1>
<ul>
-<li>请下载最新版本的后端安装包至服务器部署目录,比如创建 /opt/dolphinscheduler 做为安装部署目录，下载地址： <a href="https://dolphinscheduler.apache.org/zh-cn/docs/release/download.html">下载</a> (以1.3.0版本为例)，下载后上传tar包到该目录中，并进行解压</li>
+<li>请下载最新版本的后端安装包至服务器部署目录,比如创建 /opt/dolphinscheduler 做为安装部署目录，下载地址： <a href="https://dist.apache.org/repos/dist/dev/incubator/dolphinscheduler/1.3.0/apache-dolphinscheduler-incubating-1.3.0-dolphinscheduler-bin.tar.gz">下载</a>，下载后上传tar包到该目录中，并进行解压</li>
</ul>
<pre><code class="language-shell"><span class="hljs-meta">#</span><span class="bash"> 创建部署目录,部署目录请不要创建在/root、/home等高权限目录 </span>
mkdir -p /opt/dolphinscheduler;
@@ -87,10 +87,10 @@ mysql> flush privileges;
<p>创建表和导入基础数据</p>
<ul>
<li>
-<p>修改 conf 目录下 application-dao.properties 中的下列配置</p>
+<p>修改 conf 目录下 datasource.properties 中的下列配置</p>
<ul>
<li>
-<pre><code class="language-shell">vi conf/application-dao.properties
+<pre><code class="language-shell">vi conf/datasource.properties
</code></pre>
</li>
</ul>
@@ -104,7 +104,7 @@ mysql> flush privileges;
<span class="hljs-comment"> #spring.datasource.url=jdbc:postgresql://localhost:5432/dolphinscheduler</span>
<span class="hljs-comment"> # mysql</span>
<span class="hljs-meta">spring.datasource.driver-class-name</span>=<span class="hljs-string">com.mysql.jdbc.Driver</span>
- <span class="hljs-meta">spring.datasource.url</span>=<span class="hljs-string">jdbc:mysql://xxx:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8 需要修改ip，本机localhost即可</span>
+ <span class="hljs-meta">spring.datasource.url</span>=<span class="hljs-string">jdbc:mysql://xxx:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true 需要修改ip，本机localhost即可</span>
<span class="hljs-meta">spring.datasource.username</span>=<span class="hljs-string">xxx 需要修改为上面的{user}值</span>
<span class="hljs-meta">spring.datasource.password</span>=<span class="hljs-string">xxx 需要修改为上面的{password}值</span>
</code></pre>
@@ -128,10 +128,10 @@ export PYTHON_HOME=/opt/soft/python
export JAVA_HOME=/opt/soft/java
export HIVE_HOME=/opt/soft/hive
export FLINK_HOME=/opt/soft/flink
-export PATH=$HADOOP_HOME/bin:$SPARK_HOME2/bin:$PYTHON_HOME:$JAVA_HOME/bin:$HIVE_HOME/bin:$PATH:$FLINK_HOME/bin:$PATH
-
+export DATAX_HOME=/opt/soft/datax/bin/datax.py
+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>注: 这一步非常重要,例如 JAVA_HOME 和 PATH 是必须要配置的，没有用到的可以忽略或者注释掉；如果找不到.dolphinscheduler_env.sh, 请运行 ls -a</code></p>
+<p><code>注: 这一步非常重要,例如 JAVA_HOME 和 PATH 是必须要配置的，没有用到的可以忽略或者注释掉；如果找不到dolphinscheduler_env.sh, 请运行 ls -a</code></p>
</li>
<li>
<p>将jdk软链到/usr/bin/java下(仍以 JAVA_HOME=/opt/soft/java 为例)</p>
@@ -139,7 +139,7 @@ export PATH=$HADOOP_HOME/bin:$SPARK_HOME2/bin:$PYTHON_HOME:$JAVA_HOME/bin:$HIVE_
</code></pre>
</li>
<li>
-<p>修改一键部署脚本 <code>install.sh</code>中的各参数，特别注意以下参数的配置</p>
+<p>修改一键部署配置文件 <code>conf/config/install_config.conf</code>中的各参数，特别注意以下参数的配置</p>
<pre><code class="language-shell"><span class="hljs-meta">#</span><span class="bash"> 这里填 mysql or postgresql</span>
dbtype="mysql"
<span class="hljs-meta">
@@ -155,40 +155,21 @@ username="xxx"
#</span><span class="bash"> 数据库密码, 如果有特殊字符，请使用\转义，需要修改为上面设置的{passowrd}具体值</span>
passowrd="xxx"
<span class="hljs-meta">
-#</span><span class="bash">将DS安装到哪个目录，如: /opt/soft/dolphinscheduler，不同于现在的目录</span>
-installPath="/opt/soft/dolphinscheduler"
-<span class="hljs-meta">
-#</span><span class="bash">使用哪个用户部署，使用1.3小节创建的用户</span>
-deployUser="dolphinscheduler"
-<span class="hljs-meta">
#</span><span class="bash">Zookeeper地址，单机本机是localhost:2181，记得把2181端口带上</span>
zkQuorum="localhost:2181"
<span class="hljs-meta">
-#</span><span class="bash">在哪些机器上部署DS服务，本机选localhost</span>
-ips="localhost"
-<span class="hljs-meta">
-#</span><span class="bash">ssh端口,默认22</span>
-sshPort="22"
-<span class="hljs-meta">
-#</span><span class="bash">master服务部署在哪台机器上</span>
-masters="localhost"
-<span class="hljs-meta">
-#</span><span class="bash">worker服务部署在哪台机器上,并指定此worker属于哪一个worker组</span>
-workers="localhost:default"
-<span class="hljs-meta">
-#</span><span class="bash">报警服务部署在哪台机器上</span>
-alertServer="localhost"
+#</span><span class="bash">将DS安装到哪个目录，如: /opt/soft/dolphinscheduler，不同于现在的目录</span>
+installPath="/opt/soft/dolphinscheduler"
<span class="hljs-meta">
-#</span><span class="bash">后端api服务部署在在哪台机器上</span>
-apiServers="localhost"
+#</span><span class="bash">使用哪个用户部署，使用第3节创建的用户</span>
+deployUser="dolphinscheduler"
<span class="hljs-meta">
-
#</span><span class="bash"> 邮件配置，以qq邮箱为例</span>
<span class="hljs-meta">#</span><span class="bash"> 邮件协议</span>
mailProtocol="SMTP"
<span class="hljs-meta">
#</span><span class="bash"> 邮件服务地址</span>
-mailServerHost="smtp.exmail.qq.com"
+mailServerHost="smtp.qq.com"
<span class="hljs-meta">
#</span><span class="bash"> 邮件服务端口</span>
mailServerPort="25"
@@ -206,41 +187,55 @@ mailPassword="xxx"
#</span><span class="bash"> TLS协议的邮箱设置为<span class="hljs-literal">true</span>，否则设置为<span class="hljs-literal">false</span></span>
starttlsEnable="true"
<span class="hljs-meta">
-#</span><span class="bash"> 邮件服务地址值，参考上面 mailServerHost</span>
-sslTrust="smtp.exmail.qq.com"
-<span class="hljs-meta">
#</span><span class="bash"> 开启SSL协议的邮箱配置为<span class="hljs-literal">true</span>，否则为<span class="hljs-literal">false</span>。注意: starttlsEnable和sslEnable不能同时为<span class="hljs-literal">true</span></span>
sslEnable="false"
<span class="hljs-meta">
-#</span><span class="bash"> excel下载路径</span>
-xlsFilePath="/tmp/xls"
+#</span><span class="bash"> 邮件服务地址值，参考上面 mailServerHost</span>
+sslTrust="smtp.qq.com"
<span class="hljs-meta">
-#</span><span class="bash"> 业务用到的比如sql等资源文件上传到哪里，可以设置：HDFS,S3,NONE，单机如果想使用本地文件系统，请配置为HDFS，因为HDFS支持本地文件系统；如果不需要资源上传功能请选择NONE。强调一点：使用本地文件系统不需要部署hadoop </span>
+
+#</span><span class="bash"> 业务用到的比如sql等资源文件上传到哪里，可以设置：HDFS,S3,NONE，单机如果想使用本地文件系统，请配置为HDFS，因为HDFS支持本地文件系统；如果不需要资源上传功能请选择NONE。强调一点：使用本地文件系统不需要部署hadoop</span>
resourceStorageType="HDFS"
<span class="hljs-meta">
-#</span><span class="bash"> 资源上传根路径,主持HDFS和S3,由于hdfs支持本地文件系统，需要确保本地文件夹存在且有读写权限</span>
- resourceUploadPath="/data/dolphinscheduler"
-<span class="hljs-meta">
-#</span><span class="bash"> 具备权限创建resourceUploadPath的用户</span>
- hdfsRootUser="hdfs"
-<span class="hljs-meta">
#</span><span class="bash"> 这里以保存到本地文件系统为例</span>
-<span class="hljs-meta">#</span><span class="bash">注：但是如果你想上传到HDFS的话，NameNode启用了HA，则需要将core-site.xml和hdfs-site.xml放到conf目录下，本例即是放到/opt/dolphinscheduler/conf下面，并配置namenode cluster名称；如果NameNode不是HA,则修改为具体的ip或者主机名即可 </span>
+<span class="hljs-meta">#</span><span class="bash">注：但是如果你想上传到HDFS的话，NameNode启用了HA，则需要将hadoop的配置文件core-site.xml和hdfs-site.xml放到conf目录下，本例即是放到/opt/dolphinscheduler/conf下面，并配置namenode cluster名称；如果NameNode不是HA,则修改为具体的ip或者主机名即可</span>
defaultFS="file:///data/dolphinscheduler" #hdfs://{具体的ip/主机名}:8020
<span class="hljs-meta">
-
-#</span><span class="bash"> 如果ResourceManager是HA，则配置为ResourceManager节点的主备ip或者hostname,比如<span class="hljs-string">"192.168.xx.xx,192.168.xx.xx"</span>，否则如果是单ResourceManager或者根本没用到yarn,请配置yarnHaIps=<span class="hljs-string">""</span>即可，我这里没用到yarn，配置为<span class="hljs-string">""</span></span>
-yarnHaIps=""
+#</span><span class="bash"> 如果没有使用到Yarn,保持以下默认值即可；如果ResourceManager是HA，则配置为ResourceManager节点的主备ip或者hostname,比如<span class="hljs-string">"192.168.xx.xx,192.168.xx.xx"</span>;如果是单ResourceManager请配置yarnHaIps=<span class="hljs-string">""</span>即可</span>
+yarnHaIps="192.168.xx.xx,192.168.xx.xx"
+<span class="hljs-meta">
+#</span><span class="bash"> 如果ResourceManager是HA或者没有使用到Yarn保持默认值即可；如果是单ResourceManager，请配置真实的ResourceManager主机名或者ip</span>
+singleYarnIp="yarnIp1"
+<span class="hljs-meta">
+#</span><span class="bash"> 资源上传根路径,主持HDFS和S3,由于hdfs支持本地文件系统，需要确保本地文件夹存在且有读写权限</span>
+resourceUploadPath="/data/dolphinscheduler"
+<span class="hljs-meta">
+#</span><span class="bash"> 具备权限创建resourceUploadPath的用户</span>
+hdfsRootUser="hdfs"
<span class="hljs-meta">
-#</span><span class="bash"> 如果是单ResourceManager，则配置为ResourceManager节点ip或主机名，否则保持默认值即可。我这里没用到yarn，保持默认</span>
-singleYarnIp="ark1"
-
-*注：如果打算用到`资源中心`功能，请执行以下命令：*
+#</span><span class="bash">在哪些机器上部署DS服务，本机选localhost</span>
+ips="localhost"
+<span class="hljs-meta">
+#</span><span class="bash">ssh端口,默认22</span>
+sshPort="22"
+<span class="hljs-meta">
+#</span><span class="bash">master服务部署在哪台机器上</span>
+masters="localhost"
+<span class="hljs-meta">
+#</span><span class="bash">worker服务部署在哪台机器上,并指定此worker属于哪一个worker组,下面示例的default即为组名</span>
+workers="localhost:default"
+<span class="hljs-meta">
+#</span><span class="bash">报警服务部署在哪台机器上</span>
+alertServer="localhost"
+<span class="hljs-meta">
+#</span><span class="bash">后端api服务部署在在哪台机器上</span>
+apiServers="localhost"
-```shell
-sudo mkdir /data/dolphinscheduler
+</code></pre>
+<p><em>注：如果打算用到<code>资源中心</code>功能，请执行以下命令：</em></p>
+<pre><code class="language-shell">sudo mkdir /data/dolphinscheduler
sudo chown -R dolphinscheduler:dolphinscheduler /data/dolphinscheduler
</code></pre>
</li>
diff --git a/zh-cn/docs/1.3.0/user_doc/standalone-deployment.json b/zh-cn/docs/1.3.0/user_doc/standalone-deployment.json
index bf7d735..5085989 100644
--- a/zh-cn/docs/1.3.0/user_doc/standalone-deployment.json
+++ b/zh-cn/docs/1.3.0/user_doc/standalone-deployment.json
@@ -1,6 +1,6 @@
{
"filename": "standalone-deployment.md",
- "__html": "<h1>单机部署(Standalone)</h1>\n<p>DolphinScheduler单机部署分为后端部署和前端部署两部分：</p>\n<h1>1、基础软件安装(必装项请自行安装)</h1>\n<ul>\n<li>PostgreSQL (8.2.15+) or MySQL (5.7系列) : 两者任选其一即可</li>\n<li><a href=\"https://www.oracle.com/technetwork/java/javase/downloads/index.html\">JDK</a> (1.8+) : 必装，请安装好后在/etc/profile下配置 JAVA_HOME 及 PATH 变量</li>\n<li>ZooKeeper (3.4.6+) ：必装</li>\n<li>Hadoop (2.6+) or MinIO ：选装， 如果需要用到资源上传功能，针对单机可以选择本地文件目录作为上传文件夹(此操作不需要部署Hadoop)；当然也可以选择上传到Hadoop or MinIO集群上</li>\n</ul>\n< [...]
+ "__html": "<h1>单机部署(Standalone)</h1>\n<p>DolphinScheduler单机部署分为后端部署和前端部署两部分：</p>\n<h1>1、基础软件安装(必装项请自行安装)</h1>\n<ul>\n<li>PostgreSQL (8.2.15+) or MySQL (5.7系列) : 两者任选其一即可</li>\n<li><a href=\"https://www.oracle.com/technetwork/java/javase/downloads/index.html\">JDK</a> (1.8+) : 必装，请安装好后在/etc/profile下配置 JAVA_HOME 及 PATH 变量</li>\n<li>ZooKeeper (3.4.6+) ：必装</li>\n<li>Hadoop (2.6+) or MinIO ：选装， 如果需要用到资源上传功能，针对单机可以选择本地文件目录作为上传文件夹(此操作不需要部署Hadoop)；当然也可以选择上传到Hadoop or MinIO集群上</li>\n</ul>\n< [...]
"link": "/zh-cn/docs/1.3.0/user_doc/standalone-deployment.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/1.3.0/user_doc/upgrade.html b/zh-cn/docs/1.3.0/user_doc/upgrade.html
new file mode 100644
index 0000000..8808261
--- /dev/null
+++ b/zh-cn/docs/1.3.0/user_doc/upgrade.html
@@ -0,0 +1,121 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+ <meta charset="UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+ <meta name="keywords" content="upgrade" />
+ <meta name="description" content="upgrade" />
+ <!-- 网页标签标题 -->
+ <title>upgrade</title>
+ <link rel="shortcut icon" href="/img/docsite.ico"/>
+ <link rel="stylesheet" href="/build/documentation.css" />
+</head>
+<body>
+ <div id="root"><div class="documentation-page" data-reactroot=""><header class="header-container header-container-normal"><div class="header-body"><a href="/zh-cn/index.html"><img class="logo" src="/img/hlogo_colorful.svg"/></a><div class="search search-normal"><span class="icon-search"></span></div><span class="language-switch language-switch-normal">En</span><div class="header-menu"><img class="header-menu-toggle" src="/img/system/menu_gray.png"/><div><ul class="ant-menu blackClass an [...]
+<h2>1. 备份上一版本文件和数据库</h2>
+<h2>2. 停止dolphinscheduler所有服务</h2>
+<p><code>sh ./script/stop-all.sh</code></p>
+<h2>3. 下载新版本的安装包</h2>
+<ul>
+<li><a href="https://dolphinscheduler.apache.org/en-us/docs/user_doc/download.html">下载</a>, 下载最新版本的前后端安装包(dolphinscheduler-backend、dolphinscheduler-ui)</li>
+<li>以下升级操作都需要在新版本的目录进行</li>
+</ul>
+<h2>4. 数据库升级</h2>
+<ul>
+<li>
+<p>修改conf/datasource.properties中的下列属性</p>
+</li>
+<li>
+<p>如果选择 MySQL，请注释掉 PostgreSQL 相关配置(反之同理), 还需要手动添加 [<a href="https://downloads.MySQL.com/archives/c-j/"> mysql-connector-java 驱动 jar </a>] 包到 lib 目录下，这里下载的是mysql-connector-java-5.1.47.jar，然后正确配置数据库连接相关信息</p>
+<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>
+<span class="hljs-comment"> # mysql</span>
+ <span class="hljs-meta">spring.datasource.driver-class-name</span>=<span class="hljs-string">com.mysql.jdbc.Driver</span>
+ <span class="hljs-meta">spring.datasource.url</span>=<span class="hljs-string">jdbc:mysql://xxx:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true 需要修改ip，本机localhost即可</span>
+ <span class="hljs-meta">spring.datasource.username</span>=<span class="hljs-string">xxx 需要修改为上面的{user}值</span>
+ <span class="hljs-meta">spring.datasource.password</span>=<span class="hljs-string">xxx 需要修改为上面的{password}值</span>
+</code></pre>
+</li>
+<li>
+<p>执行数据库升级脚本</p>
+</li>
+</ul>
+<p><code>sh ./script/upgrade-escheduler.sh</code></p>
+<h2>5. 服务升级</h2>
+<h3>5.1 修改<code>conf/config/install_config.conf</code>配置内容</h3>
+<p>参照</p>
+<h3>注意事项</h3>
+<p>创建worker分组在1.3.0版本和之前版本有了不同的设计</p>
+<ul>
+<li>worker分组在1.3.0版本之前是通过UI界面创建</li>
+<li>worker分组在1.3.0版本是修改worker配置指定</li>
+</ul>
+<h3>升级时如何设置worker分组与之前一致</h3>
+<p>1、查询已备份的数据库,查看t_ds_worker_group表记录，重点看下id、name和ip_list三个字段</p>
+<table>
+<thead>
+<tr>
+<th style="text-align:left">id</th>
+<th style="text-align:center">name</th>
+<th style="text-align:right">ip_list</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td style="text-align:left">1</td>
+<td style="text-align:center">service1</td>
+<td style="text-align:right">192.168.xx.10</td>
+</tr>
+<tr>
+<td style="text-align:left">2</td>
+<td style="text-align:center">service2</td>
+<td style="text-align:right">192.168.xx.11,192.168.xx.12</td>
+</tr>
+</tbody>
+</table>
+<p>2、修改conf/config/install_config.conf中的workers参数</p>
+<p>假设以下为要部署的worker主机名和ip的对应关系</p>
+<table>
+<thead>
+<tr>
+<th style="text-align:left">主机名</th>
+<th style="text-align:center">ip</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td style="text-align:left">ds1</td>
+<td style="text-align:center">192.168.xx.10</td>
+</tr>
+<tr>
+<td style="text-align:left">ds2</td>
+<td style="text-align:center">192.168.xx.11</td>
+</tr>
+<tr>
+<td style="text-align:left">ds3</td>
+<td style="text-align:center">192.168.xx.12</td>
+</tr>
+</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"
+</code></pre>
+<h3>5.2 执行升级脚本</h3>
+<pre><code class="language-shell">`sh install.sh`
+</code></pre>
+</div></section><footer class="footer-container"><div class="footer-body"><img src="/img/ds_gray.svg"/><div class="cols-container"><div class="col col-12"><h3>Disclaimer</h3><p>Apache DolphinScheduler (incubating) is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by Incubator.
+Incubation is required of all newly accepted projects until a further review indicates
+that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects.
+While incubation status is not necessarily a reflection of the completeness or stability of the code,
+it does indicate that the project has yet to be fully endorsed by the ASF.</p></div><div class="col col-6"><dl><dt>文档</dt><dd><a href="/zh-cn/docs/1.2.0/user_doc/architecture-design.html" target="_self">概览</a></dd><dd><a href="/zh-cn/docs/1.2.0/user_doc/quick-start.html" target="_self">快速开始</a></dd><dd><a href="/zh-cn/docs/1.2.0/user_doc/backend-development.html" target="_self">开发者指南</a></dd></dl></div><div class="col col-6"><dl><dt>ASF</dt><dd><a href="http://www.apache.org" target="_se [...]
+ <script src="https://f.alicdn.com/react/15.4.1/react-with-addons.min.js"></script>
+ <script src="https://f.alicdn.com/react/15.4.1/react-dom.min.js"></script>
+ <script>
+ window.rootPath = '';
+ </script>
+ <script src="/build/documentation.js"></script>
+</body>
+</html>
\ No newline at end of file
diff --git a/zh-cn/docs/1.3.0/user_doc/upgrade.json b/zh-cn/docs/1.3.0/user_doc/upgrade.json
new file mode 100644
index 0000000..b3d2279
--- /dev/null
+++ b/zh-cn/docs/1.3.0/user_doc/upgrade.json
@@ -0,0 +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=\"https://dolphinscheduler.apache.org/en-us/docs/user_doc/download.html\">下载</a>, 下载最新版本的前后端安装包(dolphinscheduler-backend、dolphinscheduler-ui)</li>\n<li>以下升级操作都需要在新版本的目录进行</li>\n</ul>\n<h2>4. 数据库升级</h2>\n<ul>\n<li>\n<p>修改conf/datasource.properties中的下列属性</p>\n</li>\n<li>\n<p>如果选择 MySQL，请注释掉 PostgreSQL [...]
+ "link": "/zh-cn/docs/1.3.0/user_doc/upgrade.html",
+ "meta": {}
+}
\ No newline at end of file