You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@dolphinscheduler.apache.org by li...@apache.org on 2019/11/07 03:16:01 UTC
[incubator-dolphinscheduler-website] 30/34: update
escheduler/easyscheduler to dolphinscheduler
This is an automated email from the ASF dual-hosted git repository.
lidongdai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler-website.git
commit 6a57f95ee8784b7e5758030d40b018f6d3fe94ab
Author: baoliang <ba...@analysys.com.cn>
AuthorDate: Wed Nov 6 16:48:45 2019 +0800
update escheduler/easyscheduler to dolphinscheduler
---
docs/en-us/developer_guide/backend-development.md | 12 ++--
docs/en-us/developer_guide/frontend-development.md | 8 +--
docs/en-us/faq.md | 26 ++++----
docs/en-us/release/1.0.1-release.md | 2 +-
docs/en-us/release/1.0.2-release.md | 4 +-
docs/en-us/release/1.0.3-release.md | 4 +-
docs/en-us/release/1.1.0-release.md | 4 +-
docs/en-us/release/note.md | 2 +-
docs/en-us/release/upgrade.md | 8 +--
docs/en-us/user_doc/backend-deployment.md | 72 +++++++++++-----------
docs/en-us/user_doc/frontend-deployment.md | 10 +--
docs/en-us/user_doc/quick-start.md | 2 +-
docs/en-us/user_doc/system-manual.md | 4 +-
docs/zh-cn/developer_guide/architecture-design.md | 16 ++---
docs/zh-cn/developer_guide/backend-development.md | 10 +--
docs/zh-cn/developer_guide/frontend-development.md | 10 +--
docs/zh-cn/developer_guide/plugin-development.md | 12 ++--
docs/zh-cn/faq.md | 40 +++++-------
docs/zh-cn/release/1.0.1-release.md | 2 +-
docs/zh-cn/release/1.0.2-release.md | 2 +-
docs/zh-cn/release/1.0.3-release.md | 2 +-
docs/zh-cn/release/1.0.4-release.md | 2 +-
docs/zh-cn/release/1.0.5-release.md | 2 +-
docs/zh-cn/release/1.1.0-release.md | 2 +-
docs/zh-cn/release/note.md | 2 +-
docs/zh-cn/release/upgrade.md | 6 +-
docs/zh-cn/user_doc/backend-deployment.md | 70 ++++++++++-----------
docs/zh-cn/user_doc/frontend-deployment.md | 10 +--
docs/zh-cn/user_doc/quick-start.md | 2 +-
29 files changed, 169 insertions(+), 179 deletions(-)
diff --git a/docs/en-us/developer_guide/backend-development.md b/docs/en-us/developer_guide/backend-development.md
index 10f7ba4..937cf07 100755
--- a/docs/en-us/developer_guide/backend-development.md
+++ b/docs/en-us/developer_guide/backend-development.md
@@ -2,12 +2,12 @@
## Environmental requirements
- * [Mysql](http://geek.analysys.cn/topic/124) (5.5+) : Must be installed
- * [JDK](https://www.oracle.com/technetwork/java/javase/downloads/index.html) (1.8+) : Must be installed
- * [ZooKeeper](https://mirrors.tuna.tsinghua.edu.cn/apache/zookeeper)(3.4.6+) ：Must be installed
- * [Maven](http://maven.apache.org/download.cgi)(3.3+) ：Must be installed
+ * Mysql (5.5+) : Must be installed
+ * JDK (1.8+) : Must be installed
+ * ZooKeeper (3.4.6+) ：Must be installed
+ * Maven (3.3+) ：Must be installed
-Because the escheduler-rpc module in EasyScheduler uses Grpc, you need to use Maven to compile the generated classes.
+Because the dolphinscheduler-rpc module in EasyScheduler uses Grpc, you need to use Maven to compile the generated classes.
For those who are not familiar with maven, please refer to: [maven in five minutes](http://maven.apache.org/guides/getting-started/maven-in-five-minutes.html)(3.3+)
http://maven.apache.org/install.html
@@ -23,7 +23,7 @@ After importing the EasyScheduler source code into the development tools such as
* View directory
-After normal compilation, it will generate ./target/escheduler-{version}/ in the current directory.
+After normal compilation, it will generate ./target/dolphinscheduler-{version}/ in the current directory.
```
bin
diff --git a/docs/en-us/developer_guide/frontend-development.md b/docs/en-us/developer_guide/frontend-development.md
index 286c598..bb3e464 100755
--- a/docs/en-us/developer_guide/frontend-development.md
+++ b/docs/en-us/developer_guide/frontend-development.md
@@ -23,7 +23,7 @@ Node package download (note version 8.9.4) `https://nodejs.org/download/release/
- #### Front-end project construction
-Use the command line mode `cd` enter the `escheduler-ui` project directory and execute `npm install` to pull the project dependency package.
+Use the command line mode `cd` enter the `dolphinscheduler-ui` project directory and execute `npm install` to pull the project dependency package.
> If `npm install` is very slow
@@ -34,7 +34,7 @@ Use the command line mode `cd` enter the `escheduler-ui` project directory and
- Create a new `.env` file or the interface that interacts with the backend
-Create a new` .env` file in the `escheduler-ui `directory, add the ip address and port of the backend service to the file, and use it to interact with the backend. The contents of the` .env` file are as follows:
+Create a new` .env` file in the `dolphinscheduler-ui `directory, add the ip address and port of the backend service to the file, and use it to interact with the backend. The contents of the` .env` file are as follows:
```
# Proxy interface address (modified by yourself)
API_BASE = http://192.168.xx.xx:12345
@@ -67,7 +67,7 @@ Visit address` http://localhost:8888/#/`
Install pm2 `npm install -g pm2`
-Execute `pm2 start npm -- run dev` to start the project in the project `escheduler-ui `root directory
+Execute `pm2 start npm -- run dev` to start the project in the project `dolphinscheduler-ui `root directory
#### command
@@ -81,7 +81,7 @@ Execute `pm2 start npm -- run dev` to start the project in the project `eschedul
```
-[root@localhost escheduler-ui]# pm2 start npm -- run dev
+[root@localhost dolphinscheduler-ui]# pm2 start npm -- run dev
[PM2] Applying action restartProcessId on app [npm](ids: 0)
[PM2] [npm](0) ✓
[PM2] Process successfully started
diff --git a/docs/en-us/faq.md b/docs/en-us/faq.md
index 5351c97..1573d26 100755
--- a/docs/en-us/faq.md
+++ b/docs/en-us/faq.md
@@ -1,6 +1,6 @@
-## Q: EasyScheduler service introduction and recommended running memory
+## Q: DolphinScheduler service introduction and recommended running memory
-A: EasyScheduler consists of 5 services, MasterServer, WorkerServer, ApiServer, AlertServer, LoggerServer and UI.
+A: DolphinScheduler consists of 5 services, MasterServer, WorkerServer, ApiServer, AlertServer, LoggerServer and UI.
| Service | Description |
| ------------------------- | ------------------------------------------------------------ |
@@ -50,13 +50,13 @@ A: We also support **the priority of processes and tasks**. Priority We have fiv
----
-## Q: Escheduler-grpc gives an error
+## Q: dolphinscheduler-grpc gives an error
A: Execute in the root directory: mvn -U clean package assembly:assembly -Dmaven.test.skip=true , then refresh the entire project
----
-## Q: Does EasyScheduler support running on windows?
+## Q: Does DolphinScheduler support running on windows?
A: In theory, **only the Worker needs to run on Linux**. Other services can run normally on Windows. But it is still recommended to deploy on Linux.
@@ -70,11 +70,11 @@ A: Install **npm install node-sass --unsafe-perm** separately, then **npm instal
## Q: UI cannot log in normally.
-A: 1, if it is node startup, check whether the .env API_BASE configuration under escheduler-ui is the Api Server service address.
+A: 1, if it is node startup, check whether the .env API_BASE configuration under dolphinscheduler-ui is the Api Server service address.
- 2, If it is nginx booted and installed via **install-escheduler-ui.sh**, check if the proxy_pass configuration in **/etc/nginx/conf.d/escheduler.conf** is the Api Server service. address
+ 2, If it is nginx booted and installed via **install-dolphinscheduler-ui.sh**, check if the proxy_pass configuration in **/etc/nginx/conf.d/dolphinscheduler.conf** is the Api Server service. address
- 3, if the above configuration is correct, then please check if the Api Server service is normal, curl http://192.168.xx.xx:12345/escheduler/users/get-user-info, check the Api Server log, if Prompt cn.escheduler.api.interceptor.LoginHandlerInterceptor:[76] - session info is null, which proves that the Api Server service is normal.
+ 3, if the above configuration is correct, then please check if the Api Server service is normal, curl http://192.168.xx.xx:12345/dolphinscheduler/users/get-user-info, check the Api Server log, if Prompt cn.dolphinscheduler.api.interceptor.LoginHandlerInterceptor:[76] - session info is null, which proves that the Api Server service is normal.
4, if there is no problem above, you need to check if **server.context-path and server.port configuration** in **application.properties** is correct
@@ -84,7 +84,7 @@ A: 1, if it is node startup, check whether the .env API_BASE configuration under
A: 1, first **check whether the MasterServer service exists through jps**, or directly check whether there is a master service in zk from the service monitoring.
- 2,If there is a master service, check **the command status statistics** or whether new records are added in **t_escheduler_error_command**. If it is added, **please check the message field.**
+ 2,If there is a master service, check **the command status statistics** or whether new records are added in **t_ds_error_command**. If it is added, **please check the message field.**
---
@@ -112,9 +112,9 @@ Dockerfile address: https://github.com/qiaozhanwei/escheduler_dockerfile/tree/ma
A: 1, if the replacement variable contains special characters, **use the \ transfer character to transfer**
- 2, installPath="/data1_1T/escheduler", **this directory can not be the same as the install.sh directory currently installed with one click.**
+ 2, installPath="/data1_1T/dolphinscheduler", **this directory can not be the same as the install.sh directory currently installed with one click.**
- 3, deployUser = "escheduler", **the deployment user must have sudo privileges**, because the worker is executed by sudo -u tenant sh xxx.command
+ 3, deployUser = "dolphinscheduler", **the deployment user must have sudo privileges**, because the worker is executed by sudo -u tenant sh xxx.command
4, monitorServerState = "false", whether the service monitoring script is started, the default is not to start the service monitoring script. **If the service monitoring script is started, the master and worker services are monitored every 5 minutes, and if the machine is down, it will automatically restart.**
@@ -207,7 +207,7 @@ A: 1, in **the process definition list**, click the **Start** button.
## Q : Python task setting Python version
-A： 1，**for the version after 1.0.3** only need to modify PYTHON_HOME in conf/env/.escheduler_env.sh
+A： 1，**for the version after 1.0.3** only need to modify PYTHON_HOME in conf/env/.dolphinscheduler_env.sh
```
export PYTHON_HOME=/bin/python
@@ -227,9 +227,9 @@ A： We will add the kill task in 1.0.4 and kill all the various child processe
-## Q ： How to use the queue in EasyScheduler, what does the user queue and tenant queue mean?
+## Q ： How to use the queue in DolphinScheduler, what does the user queue and tenant queue mean?
-A ： The queue in the EasyScheduler can be configured on the user or the tenant. **The priority of the queue specified by the user is higher than the priority of the tenant queue.** For example, to specify a queue for an MR task, the queue is specified by mapreduce.job.queuename.
+A ： The queue in the DolphinScheduler can be configured on the user or the tenant. **The priority of the queue specified by the user is higher than the priority of the tenant queue.** For example, to specify a queue for an MR task, the queue is specified by mapreduce.job.queuename.
Note: When using the above method to specify the queue, the MR uses the following methods:
diff --git a/docs/en-us/release/1.0.1-release.md b/docs/en-us/release/1.0.1-release.md
index 8613d93..4cdd85f 100755
--- a/docs/en-us/release/1.0.1-release.md
+++ b/docs/en-us/release/1.0.1-release.md
@@ -1,4 +1,4 @@
-Easy Scheduler Release 1.0.1
+DolphinScheduler Release 1.0.1(Not Apache Release)
===
Easy Scheduler 1.0.1 is the second version in the 1.x series. The update is as follows:
diff --git a/docs/en-us/release/1.0.2-release.md b/docs/en-us/release/1.0.2-release.md
index 502dbf8..705d579 100755
--- a/docs/en-us/release/1.0.2-release.md
+++ b/docs/en-us/release/1.0.2-release.md
@@ -1,6 +1,6 @@
-Easy Scheduler Release 1.0.2
+DolphinScheduler Release 1.0.2(Not Apache Release)
===
-Easy Scheduler 1.0.2 is the third version in the 1.x series. This version adds scheduling open interfaces, worker grouping (the machine group for which the specified task runs), task flow and service monitoring, and support for oracle, clickhouse, etc., as follows:
+DolphinScheduler 1.0.2 is the third version in the 1.x series. This version adds scheduling open interfaces, worker grouping (the machine group for which the specified task runs), task flow and service monitoring, and support for oracle, clickhouse, etc., as follows:
New features:
===
diff --git a/docs/en-us/release/1.0.3-release.md b/docs/en-us/release/1.0.3-release.md
index b87f894..58c7dd6 100755
--- a/docs/en-us/release/1.0.3-release.md
+++ b/docs/en-us/release/1.0.3-release.md
@@ -1,6 +1,6 @@
-Easy Scheduler Release 1.0.3
+DolphinScheduler Release 1.0.3(Not Apache Release)
===
-Easy Scheduler 1.0.3 is the fourth version in the 1.x series.
+DolphinScheduler 1.0.3 is the fourth version in the 1.x series.
Enhanced：
===
diff --git a/docs/en-us/release/1.1.0-release.md b/docs/en-us/release/1.1.0-release.md
index c9ebe71..3a3f57c 100755
--- a/docs/en-us/release/1.1.0-release.md
+++ b/docs/en-us/release/1.1.0-release.md
@@ -1,6 +1,6 @@
-Easy Scheduler Release 1.1.0
+DolphinScheduler Release 1.1.0(Not Apache Release)
===
-Easy Scheduler 1.1.0 is the first release in the 1.1.x series.
+DolphinScheduler 1.1.0 is the first release in the 1.1.x series.
New features:
===
diff --git a/docs/en-us/release/note.md b/docs/en-us/release/note.md
index 7eb6b3d..34c0580 100644
--- a/docs/en-us/release/note.md
+++ b/docs/en-us/release/note.md
@@ -1,3 +1,3 @@
Note
===
-Both Easy Scheduler 1.1.0 and pre-1.1.0 versions are not Apache versions.
\ No newline at end of file
+Both DolphinScheduler 1.1.0 and pre-1.1.0 versions are not Apache versions.
\ No newline at end of file
diff --git a/docs/en-us/release/upgrade.md b/docs/en-us/release/upgrade.md
index fe2a1b0..6e6f158 100755
--- a/docs/en-us/release/upgrade.md
+++ b/docs/en-us/release/upgrade.md
@@ -1,15 +1,15 @@
-# EasyScheduler upgrade documentation
+# DolphinScheduler upgrade documentation
## 1. Back up the previous version of the files and database
-## 2. Stop all services of escheduler
+## 2. Stop all services of dolphinscheduler
`sh ./script/stop-all.sh`
## 3. Download the new version of the installation package
-- [gitee](https://gitee.com/easyscheduler/EasyScheduler/attach_files), download the latest version of the front and back installation packages (backend referred to as escheduler-backend, front end referred to as escheduler-ui)
+- [github](https://github.com/apache/incubator-dolphinscheduler/releases), download the latest version of the front and back installation packages (backend referred to as dolphinscheduler-backend, front end referred to as dolphinscheduler-ui)
- The following upgrade operations need to be performed in the new version of the directory
## 4. Database upgrade
@@ -23,7 +23,7 @@
- Execute database upgrade script
-`sh ./script/upgrade-escheduler.sh`
+`sh ./script/upgrade-dolphinscheduler.sh`
## 5. Backend service upgrade
diff --git a/docs/en-us/user_doc/backend-deployment.md b/docs/en-us/user_doc/backend-deployment.md
index 934a005..1720db4 100755
--- a/docs/en-us/user_doc/backend-deployment.md
+++ b/docs/en-us/user_doc/backend-deployment.md
@@ -7,22 +7,22 @@ There are two deployment modes for the backend:
## Preparations
-Download the latest version of the installation package, download address： [gitee download](https://gitee.com/easyscheduler/EasyScheduler/attach_files/) or [github download](https://github.com/analysys/EasyScheduler/releases), download escheduler-backend-x.x.x.tar.gz(back-end referred to as escheduler-backend),escheduler-ui-x.x.x.tar.gz(front-end referred to as escheduler-ui)
+Download the latest version of the installation package, download address： [github download](https://github.com/apache/incubator-dolphinscheduler/releases), download dolphinscheduler-backend-x.x.x.tar.gz(back-end referred to as dolphinscheduler-backend),dolphinscheduler-ui-x.x.x.tar.gz(front-end referred to as dolphinscheduler-ui)
#### Preparations 1: Installation of basic software (self-installation of required items)
- * [Mysql](http://geek.analysys.cn/topic/124) (5.5+) : Mandatory
- * [JDK](https://www.oracle.com/technetwork/java/javase/downloads/index.html) (1.8+) : Mandatory
- * [ZooKeeper](https://www.jianshu.com/p/de90172ea680)(3.4.6+) ：Mandatory
- * [Hadoop](https://blog.csdn.net/Evankaka/article/details/51612437)(2.6+) ：Optionally, if you need to use the resource upload function, MapReduce task submission needs to configure Hadoop (uploaded resource files are currently stored on Hdfs)
- * [Hive](https://staroon.pro/2017/12/09/HiveInstall/)(1.2.1) : Optional, hive task submission needs to be installed
+ * Mysql (5.5+) : Mandatory
+ * JDK (1.8+) : Mandatory
+ * ZooKeeper(3.4.6+) ：Mandatory
+ * Hadoop (2.6+) ：Optionally, if you need to use the resource upload function, MapReduce task submission needs to configure Hadoop (uploaded resource files are currently stored on Hdfs)
+ * Hive (1.2.1) : Optional, hive task submission needs to be installed
* Spark(1.x,2.x) : Optional, Spark task submission needs to be installed
* PostgreSQL(8.2.15+) : Optional, PostgreSQL PostgreSQL stored procedures need to be installed
```
- Note: Easy Scheduler itself does not rely on Hadoop, Hive, Spark, PostgreSQL, but only calls their Client to run the corresponding tasks.
+ Note: DolphinScheduler itself does not rely on Hadoop, Hive, Spark, PostgreSQL, but only calls their Client to run the corresponding tasks.
```
#### Preparations 2: Create deployment users
@@ -32,17 +32,17 @@ Download the latest version of the installation package, download address： [gi
```
vi /etc/sudoers
-# For example, the deployment user is an escheduler account
-escheduler ALL=(ALL) NOPASSWD: NOPASSWD: ALL
+# For example, the deployment user is an dolphinscheduler account
+dolphinscheduler ALL=(ALL) NOPASSWD: NOPASSWD: ALL
# And you need to comment out the Default requiretty line
#Default requiretty
```
#### Preparations 3: SSH Secret-Free Configuration
-Configure SSH secret-free login on deployment machines and other installation machines. If you want to install easyscheduler on deployment machines, you need to configure native password-free login itself.
+Configure SSH secret-free login on deployment machines and other installation machines. If you want to install dolphinscheduler on deployment machines, you need to configure native password-free login itself.
-- [Connect the host and other machines SSH](http://geek.analysys.cn/topic/113)
+- Connect the host and other machines SSH
#### Preparations 4: database initialization
@@ -51,9 +51,9 @@ Configure SSH secret-free login on deployment machines and other installation ma
Execute the following command to create database and account
```
- CREATE DATABASE escheduler DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;
- GRANT ALL PRIVILEGES ON escheduler.* TO '{user}'@'%' IDENTIFIED BY '{password}';
- GRANT ALL PRIVILEGES ON escheduler.* TO '{user}'@'localhost' IDENTIFIED BY '{password}';
+ CREATE DATABASE dolphinscheduler DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;
+ GRANT ALL PRIVILEGES ON dolphinscheduler.* TO '{user}'@'%' IDENTIFIED BY '{password}';
+ GRANT ALL PRIVILEGES ON dolphinscheduler.* TO '{user}'@'localhost' IDENTIFIED BY '{password}';
flush privileges;
```
@@ -69,12 +69,12 @@ Configure SSH secret-free login on deployment machines and other installation ma
Execute scripts for creating tables and importing basic data
```
- sh ./script/create-escheduler.sh
+ sh ./script/create-dolphinscheduler.sh
```
#### Preparations 5: Modify the deployment directory permissions and operation parameters
- instruction of escheduler-backend directory
+ instruction of dolphinscheduler-backend directory
```directory
bin : Basic service startup script
@@ -85,11 +85,11 @@ sql : The project relies on SQL files
install.sh : One-click deployment script
```
-- Modify permissions (please modify the 'deployUser' to the corresponding deployment user) so that the deployment user has operational privileges on the escheduler-backend directory
+- Modify permissions (please modify the 'deployUser' to the corresponding deployment user) so that the deployment user has operational privileges on the dolphinscheduler-backend directory
- `sudo chown -R deployUser:deployUser escheduler-backend`
+ `sudo chown -R deployUser:deployUser dolphinscheduler-backend`
-- Modify the `.escheduler_env.sh` environment variable in the conf/env/directory
+- Modify the `.dolphinscheduler_env.sh` environment variable in the conf/env/directory
- Modify deployment parameters (depending on your server and business situation):
@@ -132,11 +132,11 @@ After successful deployment, the log can be viewed and stored in a specified fol
```logPath
logs/
- ├── escheduler-alert-server.log
- ├── escheduler-master-server.log
- |—— escheduler-worker-server.log
- |—— escheduler-api-server.log
- |—— escheduler-logger-server.log
+ ├── dolphinscheduler-alert-server.log
+ ├── dolphinscheduler-master-server.log
+ |—— dolphinscheduler-worker-server.log
+ |—— dolphinscheduler-api-server.log
+ |—— dolphinscheduler-logger-server.log
```
### Compile source code to deploy
@@ -151,7 +151,7 @@ After downloading the release version of the source package, unzip it into the r
* View directory
-After normal compilation, ./target/escheduler-{version}/ is generated in the current directory
+After normal compilation, ./target/dolphinscheduler-{version}/ is generated in the current directory
### Start-and-stop services commonly used in systems (for service purposes, please refer to System Architecture Design for details)
@@ -167,41 +167,41 @@ After normal compilation, ./target/escheduler-{version}/ is generated in the cur
* start and stop one master server
```master
-sh ./bin/escheduler-daemon.sh start master-server
-sh ./bin/escheduler-daemon.sh stop master-server
+sh ./bin/dolphinscheduler-daemon.sh start master-server
+sh ./bin/dolphinscheduler-daemon.sh stop master-server
```
* start and stop one worker server
```worker
-sh ./bin/escheduler-daemon.sh start worker-server
-sh ./bin/escheduler-daemon.sh stop worker-server
+sh ./bin/dolphinscheduler-daemon.sh start worker-server
+sh ./bin/dolphinscheduler-daemon.sh stop worker-server
```
* start and stop api server
```Api
-sh ./bin/escheduler-daemon.sh start api-server
-sh ./bin/escheduler-daemon.sh stop api-server
+sh ./bin/dolphinscheduler-daemon.sh start api-server
+sh ./bin/dolphinscheduler-daemon.sh stop api-server
```
* start and stop logger server
```Logger
-sh ./bin/escheduler-daemon.sh start logger-server
-sh ./bin/escheduler-daemon.sh stop logger-server
+sh ./bin/dolphinscheduler-daemon.sh start logger-server
+sh ./bin/dolphinscheduler-daemon.sh stop logger-server
```
* start and stop alert server
```Alert
-sh ./bin/escheduler-daemon.sh start alert-server
-sh ./bin/escheduler-daemon.sh stop alert-server
+sh ./bin/dolphinscheduler-daemon.sh start alert-server
+sh ./bin/dolphinscheduler-daemon.sh stop alert-server
```
## Database Upgrade
Database upgrade is a function added in version 1.0.2. The database can be upgraded automatically by executing the following command:
```upgrade
-sh ./script/upgrade-escheduler.sh
+sh ./script/upgrade-dolphinscheduler.sh
```
diff --git a/docs/en-us/user_doc/frontend-deployment.md b/docs/en-us/user_doc/frontend-deployment.md
index 919caf1..8322a25 100755
--- a/docs/en-us/user_doc/frontend-deployment.md
+++ b/docs/en-us/user_doc/frontend-deployment.md
@@ -8,9 +8,9 @@ The front-end has three deployment modes: automated deployment, manual deploymen
#### Download the installation package
-Please download the latest version of the installation package, download address： [gitee](https://gitee.com/easyscheduler/EasyScheduler/attach_files/)
+Please download the latest version of the installation package, download address： [github download](https://github.com/apache/incubator-dolphinscheduler/releases)
-After downloading escheduler-ui-x.x.x.tar.gz，decompress`tar -zxvf escheduler-ui-x.x.x.tar.gz ./`and enter the`escheduler-ui`directory
+After downloading dolphinscheduler-ui-x.x.x.tar.gz，decompress`tar -zxvf dolphinscheduler-ui-x.x.x.tar.gz ./`and enter the`dolphinscheduler-ui`directory
@@ -21,7 +21,7 @@ Automated deployment is recommended for either of the following two ways
### Automated Deployment
-Edit the installation file`vi install-escheduler-ui.sh` in the` escheduler-ui` directory
+Edit the installation file`vi install-dolphinscheduler-ui.sh` in the` dolphinscheduler-ui` directory
Change the front-end access port and the back-end proxy interface address
@@ -35,7 +35,7 @@ esc_proxy_port="http://192.168.xx.xx:12345"
>Front-end automatic deployment based on Linux system `yum` operation, before deployment, please install and update`yum`
-under this directory, execute`./install-escheduler-ui.sh`
+under this directory, execute`./install-dolphinscheduler-ui.sh`
### Manual Deployment
@@ -63,7 +63,7 @@ server {
root /xx/dist; # the dist directory address decompressed by the front end above (self-modifying)
index index.html index.html;
}
- location /escheduler {
+ location /dolphinscheduler {
proxy_pass http://192.168.xx.xx:12345; # interface address (self-modifying)
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
diff --git a/docs/en-us/user_doc/quick-start.md b/docs/en-us/user_doc/quick-start.md
index a1dc255..b4dce0e 100755
--- a/docs/en-us/user_doc/quick-start.md
+++ b/docs/en-us/user_doc/quick-start.md
@@ -2,7 +2,7 @@
* Administrator user login
- > Address：192.168.xx.xx:8888 Username and password：admin/escheduler123
+ > Address：192.168.xx.xx:8888 Username and password：admin/dolphinscheduler123
<p align="center">
<img src="https://user-images.githubusercontent.com/48329107/61701549-ee738000-ad70-11e9-8d75-87ce04a0152f.png" width="60%" />
diff --git a/docs/en-us/user_doc/system-manual.md b/docs/en-us/user_doc/system-manual.md
index d571e1d..d566f4f 100755
--- a/docs/en-us/user_doc/system-manual.md
+++ b/docs/en-us/user_doc/system-manual.md
@@ -331,7 +331,7 @@ conf/common/hadoop.properties
## Security
- The security has the functions of queue management, tenant management, user management, warning group management, worker group manager, token manage and other functions. It can also authorize resources, data sources, projects, etc.
-- Administrator login, default username password: admin/escheduler 123
+- Administrator login, default username password: admin/dolphinscheduler 123
@@ -391,7 +391,7 @@ conf/common/hadoop.properties
CloseableHttpClient httpclient = HttpClients.createDefault();
// create http post request
- HttpPost httpPost = new HttpPost("http://127.0.0.1:12345/escheduler/projects/create");
+ HttpPost httpPost = new HttpPost("http://127.0.0.1:12345/dolphinscheduler/projects/create");
httpPost.setHeader("token", "123");
// set parameters
List<NameValuePair> parameters = new ArrayList<NameValuePair>();
diff --git a/docs/zh-cn/developer_guide/architecture-design.md b/docs/zh-cn/developer_guide/architecture-design.md
index 8c3ef4e..087e834 100755
--- a/docs/zh-cn/developer_guide/architecture-design.md
+++ b/docs/zh-cn/developer_guide/architecture-design.md
@@ -71,7 +71,7 @@
* **ZooKeeper**
ZooKeeper服务，系统中的MasterServer和WorkerServer节点都通过ZooKeeper来进行集群管理和容错。另外系统还基于ZooKeeper进行事件监听和分布式锁。
- 我们也曾经基于Redis实现过队列，不过我们希望EasyScheduler依赖到的组件尽量地少，所以最后还是去掉了Redis实现。
+ 我们也曾经基于Redis实现过队列，不过我们希望DolphinScheduler依赖到的组件尽量地少，所以最后还是去掉了Redis实现。
* **Task Queue**
@@ -124,17 +124,17 @@
-- EasyScheduler的去中心化是Master/Worker注册到Zookeeper中，实现Master集群和Worker集群无中心，并使用Zookeeper分布式锁来选举其中的一台Master或Worker为“管理者”来执行任务。
+- DolphinScheduler的去中心化是Master/Worker注册到Zookeeper中，实现Master集群和Worker集群无中心，并使用Zookeeper分布式锁来选举其中的一台Master或Worker为“管理者”来执行任务。
##### 二、分布式锁实践
-EasyScheduler使用ZooKeeper分布式锁来实现同一时刻只有一台Master执行Scheduler，或者只有一台Worker执行任务的提交。
+DolphinScheduler使用ZooKeeper分布式锁来实现同一时刻只有一台Master执行Scheduler，或者只有一台Worker执行任务的提交。
1. 获取分布式锁的核心流程算法如下
<p align="center">
<img src="https://analysys.github.io/easyscheduler_docs_cn/images/distributed_lock.png" alt="获取分布式锁流程" width="50%" />
</p>
-2. EasyScheduler中Scheduler线程分布式锁实现流程图：
+2. DolphinScheduler中Scheduler线程分布式锁实现流程图：
<p align="center">
<img src="https://analysys.github.io/easyscheduler_docs_cn/images/distributed_lock_procss.png" alt="获取分布式锁流程" width="50%" />
</p>
@@ -169,7 +169,7 @@ EasyScheduler使用ZooKeeper分布式锁来实现同一时刻只有一台Master
服务容错设计依赖于ZooKeeper的Watcher机制，实现原理如图：
<p align="center">
- <img src="https://analysys.github.io/easyscheduler_docs_cn/images/fault-tolerant.png" alt="EasyScheduler容错设计" width="40%" />
+ <img src="https://analysys.github.io/easyscheduler_docs_cn/images/fault-tolerant.png" alt="DolphinScheduler容错设计" width="40%" />
</p>
其中Master监控其他Master和Worker的目录，如果监听到remove事件，则会根据具体的业务逻辑进行流程实例容错或者任务实例容错。
@@ -180,7 +180,7 @@ EasyScheduler使用ZooKeeper分布式锁来实现同一时刻只有一台Master
<p align="center">
<img src="https://analysys.github.io/easyscheduler_docs_cn/images/fault-tolerant_master.png" alt="Master容错流程图" width="40%" />
</p>
-ZooKeeper Master容错完成之后则重新由EasyScheduler中Scheduler线程调度，遍历 DAG 找到”正在运行”和“提交成功”的任务，对”正在运行”的任务监控其任务实例的状态，对”提交成功”的任务需要判断Task Queue中是否已经存在，如果存在则同样监控任务实例的状态，如果不存在则重新提交任务实例。
+ZooKeeper Master容错完成之后则重新由DolphinScheduler中Scheduler线程调度，遍历 DAG 找到”正在运行”和“提交成功”的任务，对”正在运行”的任务监控其任务实例的状态，对”提交成功”的任务需要判断Task Queue中是否已经存在，如果存在则同样监控任务实例的状态，如果不存在则重新提交任务实例。
@@ -239,7 +239,7 @@ Master Scheduler线程一旦发现任务实例为” 需要容错”状态，则
- 将日志放到ES搜索引擎上
- 通过gRPC通信获取远程日志信息
-- 介于考虑到尽可能的EasyScheduler的轻量级性，所以选择了gRPC实现远程访问日志信息。
+- 介于考虑到尽可能的DolphinScheduler的轻量级性，所以选择了gRPC实现远程访问日志信息。
<p align="center">
<img src="https://analysys.github.io/easyscheduler_docs_cn/images/grpc.png" alt="grpc远程访问" width="50%" />
@@ -299,6 +299,6 @@ public class TaskLogFilter extends Filter<ILoggingEvent {
```
### 总结
-本文从调度出发，初步介绍了大数据分布式工作流调度系统--EasyScheduler的架构原理及实现思路。未完待续
+本文从调度出发，初步介绍了大数据分布式工作流调度系统--DolphinScheduler的架构原理及实现思路。未完待续
diff --git a/docs/zh-cn/developer_guide/backend-development.md b/docs/zh-cn/developer_guide/backend-development.md
index 7d2d34a..5660827 100755
--- a/docs/zh-cn/developer_guide/backend-development.md
+++ b/docs/zh-cn/developer_guide/backend-development.md
@@ -2,18 +2,18 @@
## 环境要求
- * [Mysql](http://geek.analysys.cn/topic/124) (5.5+) : 必装
+ * Mysql (5.5+) : 必装
* [JDK](https://www.oracle.com/technetwork/java/javase/downloads/index.html) (1.8+) : 必装
- * [ZooKeeper](https://mirrors.tuna.tsinghua.edu.cn/apache/zookeeper)(3.4.6+) ：必装
+ * ZooKeeper(3.4.6+) ：必装
* [Maven](http://maven.apache.org/download.cgi)(3.3+) ：必装
-因EasyScheduler中escheduler-rpc模块使用到Grpc，需要用到Maven编译生成所需要的类
+因DolphinScheduler中dolphinscheduler-rpc模块使用到Grpc，需要用到Maven编译生成所需要的类
对maven不熟的伙伴请参考: [maven in five minutes](http://maven.apache.org/guides/getting-started/maven-in-five-minutes.html)(3.3+)
http://maven.apache.org/install.html
## 项目编译
-将EasyScheduler源码下载导入Idea开发工具后，首先转为Maven项目(右键点击后选择"Add Framework Support")
+将DolphinScheduler源码下载导入Idea开发工具后，首先转为Maven项目(右键点击后选择"Add Framework Support")
* 执行编译命令：
@@ -23,7 +23,7 @@ http://maven.apache.org/install.html
* 查看目录
-正常编译完后，会在当前目录生成 ./target/escheduler-{version}/
+正常编译完后，会在当前目录生成 ./target/dolphinscheduler-{version}/
```
bin
diff --git a/docs/zh-cn/developer_guide/frontend-development.md b/docs/zh-cn/developer_guide/frontend-development.md
index f805f5e..27861c5 100755
--- a/docs/zh-cn/developer_guide/frontend-development.md
+++ b/docs/zh-cn/developer_guide/frontend-development.md
@@ -23,7 +23,7 @@ Node包下载 (注意版本 8.9.4) `https://nodejs.org/download/release/v8.9.4/`
- #### 前端项目构建
-用命令行模式 `cd` 进入 `escheduler-ui`项目目录并执行 `npm install` 拉取项目依赖包
+用命令行模式 `cd` 进入 `dolphinscheduler-ui`项目目录并执行 `npm install` 拉取项目依赖包
> 如果 `npm install` 速度非常慢
@@ -34,7 +34,7 @@ Node包下载 (注意版本 8.9.4) `https://nodejs.org/download/release/v8.9.4/`
- 新建一个`.env`文件，用于跟后端交互的接口
-在`escheduler-ui`目录下新建一个`.env`文件，在文件里添加后端服务的ip地址和端口，用于跟后端交互，`.env`文件内容如下：
+在`dolphinscheduler-ui`目录下新建一个`.env`文件，在文件里添加后端服务的ip地址和端口，用于跟后端交互，`.env`文件内容如下：
```
# 代理的接口地址（自行修改）
API_BASE = http://192.168.xx.xx:12345
@@ -68,7 +68,7 @@ npm install node-sass --unsafe-perm //单独安装node-sass依赖
安装pm2 `npm install -g pm2`
-在项目`escheduler-ui`根目录执行 `pm2 start npm -- run dev` 启动项目
+在项目`dolphinscheduler-ui`根目录执行 `pm2 start npm -- run dev` 启动项目
#### 命令
@@ -82,7 +82,7 @@ npm install node-sass --unsafe-perm //单独安装node-sass依赖
```
-[root@localhost escheduler-ui]# pm2 start npm -- run dev
+[root@localhost dolphinscheduler-ui]# pm2 start npm -- run dev
[PM2] Applying action restartProcessId on app [npm](ids: 0)
[PM2] [npm](0) ✓
[PM2] Process successfully started
@@ -617,7 +617,7 @@ dag 相关接口 `src/js/conf/home/store/dag/actions.js`
name: 'test', // 别名
component: resolve => require(['../pages/test/index'], resolve), // 路由对应组件入口文件
meta: {
- title: `${i18n.$t('test')} - EasyScheduler` // title 显示
+ title: `${i18n.$t('test')} - DolphinScheduler` // title 显示
}
},
```
diff --git a/docs/zh-cn/developer_guide/plugin-development.md b/docs/zh-cn/developer_guide/plugin-development.md
index 5e733b9..ef36b9c 100755
--- a/docs/zh-cn/developer_guide/plugin-development.md
+++ b/docs/zh-cn/developer_guide/plugin-development.md
@@ -6,8 +6,8 @@
#### 基于YARN的计算（参见MapReduceTask）
-- 需要在 **cn.escheduler.server.worker.task** 下的 **TaskManager** 类中创建自定义任务(也需在TaskType注册对应的任务类型)
-- 需要继承**cn.escheduler.server.worker.task** 下的 **AbstractYarnTask**
+- 需要在 **cn.dolphinscheduler.server.worker.task** 下的 **TaskManager** 类中创建自定义任务(也需在TaskType注册对应的任务类型)
+- 需要继承**cn.dolphinscheduler.server.worker.task** 下的 **AbstractYarnTask**
- 构造方法调度 **AbstractYarnTask** 构造方法
- 继承 **AbstractParameters** 自定义任务参数实体
- 重写 **AbstractTask** 的 **init** 方法中解析**自定义任务参数**
@@ -16,9 +16,9 @@
#### 基于非YARN的计算（参见ShellTask）
-- 需要在 **cn.escheduler.server.worker.task** 下的 **TaskManager** 中创建自定义任务
+- 需要在 **cn.dolphinscheduler.server.worker.task** 下的 **TaskManager** 中创建自定义任务
-- 需要继承**cn.escheduler.server.worker.task** 下的 **AbstractTask**
+- 需要继承**cn.dolphinscheduler.server.worker.task** 下的 **AbstractTask**
- 构造方法中实例化 **ShellCommandExecutor**
@@ -46,8 +46,8 @@
### 基于非SHELL的任务（参见SqlTask）
-- 需要在 **cn.escheduler.server.worker.task** 下的 **TaskManager** 中创建自定义任务
-- 需要继承**cn.escheduler.server.worker.task** 下的 **AbstractTask**
+- 需要在 **cn.dolphinscheduler.server.worker.task** 下的 **TaskManager** 中创建自定义任务
+- 需要继承**cn.dolphinscheduler.server.worker.task** 下的 **AbstractTask**
- 继承 **AbstractParameters** 自定义任务参数实体
- 构造方法或者重写 **AbstractTask** 的 **init** 方法中，解析自定义任务参数实体
- 重写 **handle** 方法实现业务逻辑并设置相应的**exitStatusCode**
diff --git a/docs/zh-cn/faq.md b/docs/zh-cn/faq.md
index 5e1aa46..581d94b 100755
--- a/docs/zh-cn/faq.md
+++ b/docs/zh-cn/faq.md
@@ -1,6 +1,6 @@
-## Q：EasyScheduler服务介绍及建议运行内存
+## Q：DolphinScheduler服务介绍及建议运行内存
-A： EasyScheduler由5个服务组成，MasterServer、WorkerServer、ApiServer、AlertServer、LoggerServer和UI。
+A： DolphinScheduler由5个服务组成，MasterServer、WorkerServer、ApiServer、AlertServer、LoggerServer和UI。
| 服务 | 说明 |
| ------------------------- | ------------------------------------------------------------ |
@@ -28,7 +28,7 @@ A：支持绝大多数邮箱，qq、163、126、139、outlook、aliyun等皆支
## Q：常用的系统变量时间参数有哪些，如何使用？
-A：请参考 https://analysys.github.io/easyscheduler_docs_cn/%E7%B3%BB%E7%BB%9F%E4%BD%BF%E7%94%A8%E6%89%8B%E5%86%8C.html#%E7%B3%BB%E7%BB%9F%E5%8F%82%E6%95%B0
+A：请参考 使用手册
---
@@ -50,13 +50,13 @@ A：我们同时 **支持流程和任务的优先级**。优先级我们有 **HI
----
-## Q：escheduler-grpc报错
+## Q：dolphinscheduler-grpc报错
A：在根目录下执行：mvn -U clean package assembly:assembly -Dmaven.test.skip=true ， 然后刷新下整个项目
----
-## Q：EasyScheduler支持windows上运行么
+## Q：DolphinScheduler支持windows上运行么
A： 理论上只有**Worker是需要在Linux上运行的**，其它的服务都是可以在windows上正常运行的。但是还是建议最好能在linux上部署使用
@@ -70,11 +70,11 @@ A：单独安装 **npm install node-sass --unsafe-perm**，之后再 **npm insta
## Q：UI 不能正常登陆访问
-A： 1，如果是node启动的查看escheduler-ui下的.env API_BASE配置是否是Api Server服务地址
+A： 1，如果是node启动的查看dolphinscheduler-ui下的.env API_BASE配置是否是Api Server服务地址
- 2，如果是nginx启动的并且是通过 **install-escheduler-ui.sh** 安装的，查看 **/etc/nginx/conf.d/escheduler.conf** 中的proxy_pass配置是否是Api Server服务地址
+ 2，如果是nginx启动的并且是通过 **install-dolphinscheduler-ui.sh** 安装的，查看 **/etc/nginx/conf.d/dolphinscheduler.conf** 中的proxy_pass配置是否是Api Server服务地址
- 3，如果以上配置都是正确的，那么请查看Api Server服务是否是正常的，curl http://192.168.xx.xx:12345/escheduler/users/get-user-info，查看Api Server日志，如果提示 cn.escheduler.api.interceptor.LoginHandlerInterceptor:[76] - session info is null，则证明Api Server服务是正常的
+ 3，如果以上配置都是正确的，那么请查看Api Server服务是否是正常的，curl http://192.168.xx.xx:12345/dolphinscheduler/users/get-user-info，查看Api Server日志，如果提示 cn.dolphinscheduler.api.interceptor.LoginHandlerInterceptor:[76] - session info is null，则证明Api Server服务是正常的
4，如果以上都没有问题，需要查看一下 **application.properties** 中的 **server.context-path 和 server.port 配置**是否正确
@@ -84,7 +84,7 @@ A： 1，如果是node启动的查看escheduler-ui下的.env API_BASE配置是
A： 1，首先通过**jps 查看MasterServer服务是否存在**，或者从服务监控直接查看zk中是否存在master服务
- 2，如果存在master服务，查看 **命令状态统计** 或者 **t_escheduler_error_command** 中是否增加的新记录，如果增加了，**请查看 message 字段定位启动异常原因**
+ 2，如果存在master服务，查看 **命令状态统计** 或者 **t_ds_error_command** 中是否增加的新记录，如果增加了，**请查看 message 字段定位启动异常原因**
---
@@ -98,23 +98,13 @@ A： 1，首先通过**jps 查看WorkerServer服务是否存在**，或者从服
---
-## Q： 是否提供Docker镜像及Dockerfile
-
-A： 提供Docker镜像及Dockerfile。
-
-Docker镜像地址：https://hub.docker.com/r/escheduler/escheduler_images
-
-Dockerfile地址：https://github.com/qiaozhanwei/escheduler_dockerfile/tree/master/docker_escheduler
-
----
-
## Q ： install.sh 中需要注意问题
A： 1，如果替换变量中包含特殊字符，**请用 \ 转移符进行转移**
- 2，installPath="/data1_1T/escheduler"，**这个目录不能和当前要一键安装的install.sh目录是一样的**
+ 2，installPath="/data1_1T/dolphinscheduler"，**这个目录不能和当前要一键安装的install.sh目录是一样的**
- 3，deployUser="escheduler"，**部署用户必须具有sudo权限**，因为worker是通过sudo -u 租户 sh xxx.command进行执行的
+ 3，deployUser="dolphinscheduler"，**部署用户必须具有sudo权限**，因为worker是通过sudo -u 租户 sh xxx.command进行执行的
4，monitorServerState="false"，服务监控脚本是否启动，默认是不启动服务监控脚本的。**如果启动服务监控脚本，则每5分钟定时来监控master和worker的服务是否down机，如果down机则会自动重启**
@@ -126,7 +116,7 @@ A： 1，如果替换变量中包含特殊字符，**请用 \ 转移符进行
## Q ： 流程定义和流程实例下线异常
-A ： 对于 **1.0.4 以前的版本中**，修改escheduler-api cn.escheduler.api.quartz包下的代码即可
+A ： 对于 **1.0.4 以前的版本中**，修改dolphinscheduler-api cn.dolphinscheduler.api.quartz包下的代码即可
```
public boolean deleteJob(String jobName, String jobGroupName) {
@@ -205,7 +195,7 @@ A： 1，在 **流程定义列表**，点击 **启动** 按钮
## Q ： Python任务设置Python版本
-A： 1，对于1**.0.3之后的版本**只需要修改 conf/env/.escheduler_env.sh中的PYTHON_HOME
+A： 1，对于1**.0.3之后的版本**只需要修改 conf/env/.dolphinscheduler_env.sh中的PYTHON_HOME
```
export PYTHON_HOME=/bin/python
@@ -225,9 +215,9 @@ A： 我们会在1.0.4中增加kill任务同时，kill掉任务产生的各种
-## Q ： EasyScheduler中的队列怎么用，用户队列和租户队列是什么意思
+## Q ： DolphinScheduler中的队列怎么用，用户队列和租户队列是什么意思
-A ： EasyScheduler 中的队列可以在用户或者租户上指定队列，**用户指定的队列优先级是高于租户队列的优先级的。**，例如：对MR任务指定队列，是通过 mapreduce.job.queuename 来指定队列的。
+A ： DolphinScheduler 中的队列可以在用户或者租户上指定队列，**用户指定的队列优先级是高于租户队列的优先级的。**，例如：对MR任务指定队列，是通过 mapreduce.job.queuename 来指定队列的。
注意：MR在用以上方法指定队列的时候，传递参数请使用如下方式：
diff --git a/docs/zh-cn/release/1.0.1-release.md b/docs/zh-cn/release/1.0.1-release.md
index 1902fbb..a771a5f 100755
--- a/docs/zh-cn/release/1.0.1-release.md
+++ b/docs/zh-cn/release/1.0.1-release.md
@@ -1,4 +1,4 @@
-Easy Scheduler Release 1.0.1
+Easy Scheduler Release 1.0.1(Not Apache Release)
===
Easy Scheduler 1.0.2是1.x系列中的第二个版本。更新内容具体如下：
diff --git a/docs/zh-cn/release/1.0.2-release.md b/docs/zh-cn/release/1.0.2-release.md
index c3bacc2..08b8408 100755
--- a/docs/zh-cn/release/1.0.2-release.md
+++ b/docs/zh-cn/release/1.0.2-release.md
@@ -1,4 +1,4 @@
-Easy Scheduler Release 1.0.2
+Easy Scheduler Release 1.0.2(Not Apache Release)
===
Easy Scheduler 1.0.2是1.x系列中的第三个版本。此版本增加了调度开放接口、worker分组(指定任务运行的机器组)、任务流程及服务监控以及对oracle、clickhouse等支持，具体如下：
diff --git a/docs/zh-cn/release/1.0.3-release.md b/docs/zh-cn/release/1.0.3-release.md
index d89e05d..02e5b41 100755
--- a/docs/zh-cn/release/1.0.3-release.md
+++ b/docs/zh-cn/release/1.0.3-release.md
@@ -1,4 +1,4 @@
-Easy Scheduler Release 1.0.3
+Easy Scheduler Release 1.0.3(Not Apache Release)
===
Easy Scheduler 1.0.3是1.x系列中的第四个版本。
diff --git a/docs/zh-cn/release/1.0.4-release.md b/docs/zh-cn/release/1.0.4-release.md
index 5df1027..60a411b 100755
--- a/docs/zh-cn/release/1.0.4-release.md
+++ b/docs/zh-cn/release/1.0.4-release.md
@@ -1,4 +1,4 @@
-Easy Scheduler Release 1.0.4
+Easy Scheduler Release 1.0.4(Not Apache Release)
===
Easy Scheduler 1.0.4是1.x系列中的第五个版本。
diff --git a/docs/zh-cn/release/1.0.5-release.md b/docs/zh-cn/release/1.0.5-release.md
index da86c6b..bddcfab 100755
--- a/docs/zh-cn/release/1.0.5-release.md
+++ b/docs/zh-cn/release/1.0.5-release.md
@@ -1,4 +1,4 @@
-Easy Scheduler Release 1.0.5
+Easy Scheduler Release 1.0.5(Not Apache Release)
===
Easy Scheduler 1.0.5是1.x系列中的第六个版本。
diff --git a/docs/zh-cn/release/1.1.0-release.md b/docs/zh-cn/release/1.1.0-release.md
index b603180..9c12be4 100755
--- a/docs/zh-cn/release/1.1.0-release.md
+++ b/docs/zh-cn/release/1.1.0-release.md
@@ -1,4 +1,4 @@
-Easy Scheduler Release 1.1.0
+Easy Scheduler Release 1.1.0(Not Apache Release)
===
Easy Scheduler 1.1.0是1.1.x系列中的第一个版本。
diff --git a/docs/zh-cn/release/note.md b/docs/zh-cn/release/note.md
index 11d75be..54065e2 100644
--- a/docs/zh-cn/release/note.md
+++ b/docs/zh-cn/release/note.md
@@ -1,3 +1,3 @@
Note
===
-Easy Scheduler 1.1.0及1.1.0之前的版本都不是apache版本
+DolphinScheduler 1.1.0及1.1.0之前的版本都不是Apache版本
diff --git a/docs/zh-cn/release/upgrade.md b/docs/zh-cn/release/upgrade.md
index d7590e8..55a9a64 100755
--- a/docs/zh-cn/release/upgrade.md
+++ b/docs/zh-cn/release/upgrade.md
@@ -1,15 +1,15 @@
-# EasyScheduler升级文档
+# DolphinScheduler升级文档
## 1. 备份上一版本文件和数据库
-## 2. 停止escheduler所有服务
+## 2. 停止dolphinscheduler所有服务
`sh ./script/stop-all.sh`
## 3. 下载新版本的安装包
-- [码云下载](https://gitee.com/easyscheduler/EasyScheduler/attach_files), 下载最新版本的前后端安装包(后端简称escheduler-backend、前端简称escheduler-ui)
+- [github](https://github.com/apache/incubator-dolphinscheduler/releases), 下载最新版本的前后端安装包(dolphinscheduler-backend、dolphinscheduler-ui)
- 以下升级操作都需要在新版本的目录进行
## 4. 数据库升级
diff --git a/docs/zh-cn/user_doc/backend-deployment.md b/docs/zh-cn/user_doc/backend-deployment.md
index 6165ab8..55518e5 100755
--- a/docs/zh-cn/user_doc/backend-deployment.md
+++ b/docs/zh-cn/user_doc/backend-deployment.md
@@ -4,20 +4,20 @@
## 1、准备工作
-请下载最新版本的安装包，下载地址： [github下载](https://github.com/analysys/EasyScheduler/releases) ，下载escheduler-backend-x.x.x.tar.gz(后端简称escheduler-backend),escheduler-ui-x.x.x.tar.gz(前端简称escheduler-ui)
+请下载最新版本的安装包，下载地址： [github下载](https://github.com/apache/incubator-dolphinscheduler/releases)
#### 准备一: 基础软件安装(必装项请自行安装)
- * [Mysql](http://geek.analysys.cn/topic/124) (5.5+) : 必装
+ * Mysql (5.5+) : 必装
* [JDK](https://www.oracle.com/technetwork/java/javase/downloads/index.html) (1.8+) : 必装
- * [ZooKeeper](https://www.jianshu.com/p/de90172ea680)(3.4.6+) ：必装
- * [Hadoop](https://blog.csdn.net/Evankaka/article/details/51612437)(2.6+) ：选装， 如果需要使用到资源上传功能，MapReduce任务提交则需要配置Hadoop(上传的资源文件目前保存在Hdfs上)
+ * ZooKeeper (3.4.6+) ：必装
+ * Hadoop (2.6+) ：选装， 如果需要使用到资源上传功能，MapReduce任务提交则需要配置Hadoop(上传的资源文件目前保存在Hdfs上)
* [Hive](https://staroon.pro/2017/12/09/HiveInstall/)(1.2.1) : 选装，hive任务提交需要安装
- * Spark(1.x,2.x) : 选装，Spark任务提交需要安装
- * PostgreSQL(8.2.15+) : 选装，PostgreSQL PostgreSQL存储过程需要安装
+ * Spark (1.x,2.x) : 选装，Spark任务提交需要安装
+ * PostgreSQL (8.2.15+) : 选装，PostgreSQL PostgreSQL存储过程需要安装
```
- 注意：EasyScheduler本身不依赖Hadoop、Hive、Spark、PostgreSQL,仅是会调用他们的Client，用于对应任务的运行。
+ 注意：DolphinScheduler本身不依赖Hadoop、Hive、Spark、PostgreSQL,仅是会调用他们的Client，用于对应任务的运行。
```
#### 准备二: 创建部署用户
@@ -27,8 +27,8 @@
```部署账号
vi /etc/sudoers
-# 例如部署用户是escheduler账号
-escheduler ALL=(ALL) NOPASSWD: NOPASSWD: ALL
+# 例如部署用户是dolphinscheduler账号
+dolphinscheduler ALL=(ALL) NOPASSWD: NOPASSWD: ALL
# 并且需要注释掉 Default requiretty 一行
#Default requiretty
@@ -37,7 +37,7 @@ escheduler ALL=(ALL) NOPASSWD: NOPASSWD: ALL
#### 准备三: ssh免密配置
在部署机器和其他安装机器上配置ssh免密登录，如果要在部署机上安装调度，需要配置本机免密登录自己
-- [将 **主机器** 和各个其它机器SSH打通](http://geek.analysys.cn/topic/113)
+- 将 **主机器** 和各个其它机器SSH免密打通
#### 准备四：数据库初始化
@@ -47,9 +47,9 @@ escheduler ALL=(ALL) NOPASSWD: NOPASSWD: ALL
执行以下命令创建database和账号
```sql
- CREATE DATABASE escheduler DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;
- GRANT ALL PRIVILEGES ON escheduler.* TO '{user}'@'%' IDENTIFIED BY '{password}';
- GRANT ALL PRIVILEGES ON escheduler.* TO '{user}'@'localhost' IDENTIFIED BY '{password}';
+ CREATE DATABASE dolphinscheduler DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;
+ GRANT ALL PRIVILEGES ON dolphinscheduler.* TO '{user}'@'%' IDENTIFIED BY '{password}';
+ GRANT ALL PRIVILEGES ON dolphinscheduler.* TO '{user}'@'localhost' IDENTIFIED BY '{password}';
flush privileges;
```
@@ -63,12 +63,12 @@ escheduler ALL=(ALL) NOPASSWD: NOPASSWD: ALL
```
执行创建表和导入基础数据脚本
```
- sh ./script/create-escheduler.sh
+ sh ./script/create-dolphinscheduler.sh
```
#### 准备五: 修改部署目录权限及运行参数
- escheduler-backend目录介绍
+ dophinscheduler-backend目录介绍
```
bin : 基础服务启动脚本
@@ -79,11 +79,11 @@ sql : 项目依赖sql文件
install.sh : 一键部署脚本
```
-- 修改权限(请将'deployUser'字段修改为对应部署用户)，使得部署用户对escheduler-backend目录有操作权限
+- 修改权限(请将'deployUser'字段修改为对应部署用户)，使得部署用户对dolphinscheduler-backend目录有操作权限
- `sudo chown -R deployUser:deployUser escheduler-backend`
+ `sudo chown -R deployUser:deployUser dolphinscheduler-backend`
-- 修改conf/env/目录下的 `.escheduler_env.sh` 环境变量
+- 修改conf/env/目录下的 `.dolphinscheduler_env.sh` 环境变量
- 修改部署参数(根据自己服务器及业务情况):
@@ -127,11 +127,11 @@ install.sh : 一键部署脚本
```日志路径
logs/
- ├── escheduler-alert-server.log
- ├── escheduler-master-server.log
- |—— escheduler-worker-server.log
- |—— escheduler-api-server.log
- |—— escheduler-logger-server.log
+ ├── dolphinscheduler-alert-server.log
+ ├── dolphinscheduler-master-server.log
+ |—— dolphinscheduler-worker-server.log
+ |—— dolphinscheduler-api-server.log
+ |—— dolphinscheduler-logger-server.log
```
### 2.2 编译源码来部署
@@ -146,7 +146,7 @@ install.sh : 一键部署脚本
* 查看目录
-正常编译完后，会在当前目录生成 `./target/escheduler-{version}/`
+正常编译完后，会在当前目录生成 `./target/dolphinscheduler-{version}/`
```查看目录
../
@@ -173,38 +173,38 @@ install.sh : 一键部署脚本
* 启停Master
```启动master
-sh ./bin/escheduler-daemon.sh start master-server
-sh ./bin/escheduler-daemon.sh stop master-server
+sh ./bin/dolphinscheduler-daemon.sh start master-server
+sh ./bin/dolphinscheduler-daemon.sh stop master-server
```
* 启停Worker
```
-sh ./bin/escheduler-daemon.sh start worker-server
-sh ./bin/escheduler-daemon.sh stop worker-server
+sh ./bin/dolphinscheduler-daemon.sh start worker-server
+sh ./bin/dolphinscheduler-daemon.sh stop worker-server
```
* 启停Api
```
-sh ./bin/escheduler-daemon.sh start api-server
-sh ./bin/escheduler-daemon.sh stop api-server
+sh ./bin/dolphinscheduler-daemon.sh start api-server
+sh ./bin/dolphinscheduler-daemon.sh stop api-server
```
* 启停Logger
```
-sh ./bin/escheduler-daemon.sh start logger-server
-sh ./bin/escheduler-daemon.sh stop logger-server
+sh ./bin/dolphinscheduler-daemon.sh start logger-server
+sh ./bin/dolphinscheduler-daemon.sh stop logger-server
```
* 启停Alert
```
-sh ./bin/escheduler-daemon.sh start alert-server
-sh ./bin/escheduler-daemon.sh stop alert-server
+sh ./bin/dolphinscheduler-daemon.sh start alert-server
+sh ./bin/dolphinscheduler-daemon.sh stop alert-server
```
## 3、数据库升级
数据库升级是在1.0.2版本增加的功能,执行以下命令即可自动升级数据库
```
-sh ./script/upgrade-escheduler.sh
+sh ./script/upgrade-dolphinscheduler.sh
```
diff --git a/docs/zh-cn/user_doc/frontend-deployment.md b/docs/zh-cn/user_doc/frontend-deployment.md
index dc9cf61..e564e22 100755
--- a/docs/zh-cn/user_doc/frontend-deployment.md
+++ b/docs/zh-cn/user_doc/frontend-deployment.md
@@ -5,9 +5,9 @@
## 1、准备工作
#### 下载安装包
-请下载最新版本的安装包，下载地址： [码云下载](https://gitee.com/easyscheduler/EasyScheduler/attach_files/) 或者 [github下载](https://github.com/analysys/EasyScheduler/releases)
+请下载最新版本的安装包，下载地址： [github下载](https://github.com/analysys/EasyScheduler/releases)
-下载 escheduler-ui-x.x.x.tar.gz 后，解压`tar -zxvf escheduler-ui-x.x.x.tar.gz ./`后，进入`escheduler-ui`目录
+下载 dolphinscheduler-ui-x.x.x.tar.gz 后，解压`tar -zxvf dolphinscheduler-ui-x.x.x.tar.gz ./`后，进入`dolphinscheduler-ui`目录
@@ -16,7 +16,7 @@
以下两种方式任选其一部署即可，推荐自动化部署
### 2.1 自动化部署
-在`escheduler-ui`目录下编辑安装文件`vi install-escheduler-ui.sh`
+在`dolphinscheduler-ui`目录下编辑安装文件`vi install-dolphinscheduler-ui.sh`
更改前端访问端口和后端代理接口地址
@@ -30,7 +30,7 @@ esc_proxy_port="http://192.168.xx.xx:12345"
>前端自动部署基于linux系统`yum`操作，部署之前请先安装更新`yum`
-在该目录下执行`./install-escheduler-ui.sh`
+在该目录下执行`./install-dolphinscheduler-ui.sh`
### 2.2 手动部署
@@ -55,7 +55,7 @@ server {
root /xx/dist; # 上面前端解压的dist目录地址(自行修改)
index index.html index.html;
}
- location /escheduler {
+ location /dolphinscheduler {
proxy_pass http://192.168.xx.xx:12345; # 接口地址(自行修改)
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
diff --git a/docs/zh-cn/user_doc/quick-start.md b/docs/zh-cn/user_doc/quick-start.md
index 966ef88..7aa4f65 100755
--- a/docs/zh-cn/user_doc/quick-start.md
+++ b/docs/zh-cn/user_doc/quick-start.md
@@ -1,7 +1,7 @@
# 快速上手
* 管理员用户登录
- >地址：192.168.xx.xx:8888 用户名密码：admin/escheduler123
+ >地址：192.168.xx.xx:8888 用户名密码：admin/dolphinscheduler123
<p align="center">
<img src="https://analysys.github.io/easyscheduler_docs_cn/images/login.jpg" width="60%" />