You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by he...@apache.org on 2021/12/28 06:21:06 UTC

[incubator-inlong-website] branch master updated: [INLONG-2043] update the deployment guide for DataProxy (#241)

This is an automated email from the ASF dual-hosted git repository.

healchow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong-website.git


The following commit(s) were added to refs/heads/master by this push:
     new a4a8078  [INLONG-2043] update the deployment guide for DataProxy (#241)
a4a8078 is described below

commit a4a8078d913c9bec3c2adb651d935cc56617fdae
Author: dockerzhang <do...@apache.org>
AuthorDate: Tue Dec 28 14:20:58 2021 +0800

    [INLONG-2043] update the deployment guide for DataProxy (#241)
---
 docs/modules/dataproxy/quick_start.md                        | 12 +++++++-----
 .../current/modules/dataproxy/quick_start.md                 | 11 ++++++-----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/docs/modules/dataproxy/quick_start.md b/docs/modules/dataproxy/quick_start.md
index 297111e..5bc0def 100644
--- a/docs/modules/dataproxy/quick_start.md
+++ b/docs/modules/dataproxy/quick_start.md
@@ -5,13 +5,15 @@ title: Deployment
 All deploying files at `inlong-dataproxy` directory.
 ## Configuration
 
-### Configure TubeMQ
+### Configure Message Queue
 
-`tubemq_master_list` is the rpc address of TubeMQ Master.
+- If you use InLong TubeMQ, `tubemq_master_list` is the rpc address of TubeMQ Master.
 ```
 $ sed -i 's/TUBE_LIST/tubemq_master_list/g' conf/flume.conf
 ```
 
+- If you use Apache Pulsar, replace `pulsar_server_url_list` in `conf/flume-mulit-pulsar-demo.conf` and overwrite `conf/flume.conf`.
+
 notice that conf/flume.conf FLUME_HOME is proxy the directory for proxy inner data
 
 ### Environment Preparation
@@ -31,7 +33,7 @@ manager_hosts=ip:port
 ## run
 
 ```
-sh bin/start.sh
+sh bin/dataproxy-start.sh
 ```
 	
 
@@ -52,7 +54,7 @@ The insert SQL statement is:
 -- name is the name of the DataProxy, which can be customized
 -- address is the IP of the DataProxy service is located
 -- port is the port of the DataProxy service, default is 46801
-insert into data_proxy_cluster (name, address, port, status, is_deleted, create_time, modify_time)
-values ("data_proxy_name", "data_proxy_ip", 46801, 0, 0, now(), now());
+insert into data_proxy_cluster (name, address, port, status, is_deleted, creator, create_time, modify_time)
+values ("data_proxy_name", "data_proxy_ip", 46801, 0, 0, "admin", now(), now());
 ```
 
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/current/modules/dataproxy/quick_start.md b/i18n/zh-CN/docusaurus-plugin-content-docs/current/modules/dataproxy/quick_start.md
index 2bfb4db..f6e1e56 100644
--- a/i18n/zh-CN/docusaurus-plugin-content-docs/current/modules/dataproxy/quick_start.md
+++ b/i18n/zh-CN/docusaurus-plugin-content-docs/current/modules/dataproxy/quick_start.md
@@ -6,12 +6,13 @@ title: 安装部署
 
 ## 配置
 
-### 配置TubeMQ 地址和端口号
+### 配置消息队列
 
-`tubemq_master_list`是TubeMQ master rpc地址,多个逗号分隔。
+- 如果使用InLong TubeMQ, 按以下配置即可。`tubemq_master_list`是TubeMQ master rpc地址,多个逗号分隔。
 ```
 $ sed -i 's/TUBE_LIST/tubemq_master_list/g' conf/flume.conf
 ```
+- 如果使用Apache Pulsar, 替换`conf/flume-mulit-pulsar-demo.conf`中`pulsar_server_url_list`并覆盖`conf/flume.conf`。
 
 注意conf/flume.conf中FLUME_HOME为proxy的中间数据文件存放地址
 
@@ -32,7 +33,7 @@ manager_hosts=ip:port
 ## 启动
 
 ```
-sh bin/start.sh
+sh bin/dataproxy-start.sh
 ```
 
 ## 检查
@@ -53,7 +54,7 @@ InLong-Manager 的后台数据库地址,请参考 InLong-Manager 模块的部
 -- name 为 DataProxy 的名称,可自定义
 -- address 为 DataProxy 服务所在主机的 IP
 -- port 为 DataProxy 服务所在的端口号,默认是 46801
-insert into data_proxy_cluster (name, address, port, status, is_deleted, create_time, modify_time)
-values ("data_proxy_name", "data_proxy_ip", 46801, 0, 0, now(), now());
+insert into data_proxy_cluster (name, address, port, status, is_deleted, creator, create_time, modify_time)
+values ("data_proxy_name", "data_proxy_ip", 46801, 0, 0, "admin", now(), now());
 ```