You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by ca...@apache.org on 2022/08/13 06:36:00 UTC
[incubator-linkis-website] branch dev updated: document repair (#480)
This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-linkis-website.git
The following commit(s) were added to refs/heads/dev by this push:
new 20ff1d91fd document repair (#480)
20ff1d91fd is described below
commit 20ff1d91fdcc7d2c6641b806d98ab747a8dc17f6
Author: aiceflower <ki...@sina.com>
AuthorDate: Sat Aug 13 14:35:56 2022 +0800
document repair (#480)
* ES document repair
* Presto document repair
* Remove documents not supported in 1.1.3
---
docs/engine-usage/elasticsearch.md | 76 +++++-----
docs/engine-usage/presto.md | 34 ++---
.../current/engine-usage/elasticsearch.md | 3 +-
.../version-1.1.3/engine-usage/elasticsearch.md | 144 ------------------
.../version-1.1.3/engine-usage/presto.md | 164 ---------------------
5 files changed, 60 insertions(+), 361 deletions(-)
diff --git a/docs/engine-usage/elasticsearch.md b/docs/engine-usage/elasticsearch.md
index 05199011de..0f7fc26b70 100644
--- a/docs/engine-usage/elasticsearch.md
+++ b/docs/engine-usage/elasticsearch.md
@@ -18,7 +18,7 @@ Note: The Linkis project needs to be fully compiled before ElasticSearch EngineC
The published installation and deployment packages do not contain the engine plugin by default.
-You can click [Linkis engine installation guide] (https://linkis.apache.org/zh-CN/blog/2022/04/15/how-to-download-engineconn-plugin) to deployment installation, or according to the following process, Manual compilation and deployment
+You can click [Linkis engine installation guide](https://linkis.apache.org/zh-CN/blog/2022/04/15/how-to-download-engineconn-plugin) to deployment installation, or according to the following process, Manual compilation and deployment
Compile ElasticSearch engine separately
@@ -52,32 +52,40 @@ linkis_ps_configuration_key_engine_relation:Association between configuration it
```
```sql
-
-SET @ELASTICSEARCHENG_LABEL="elasticsearch-7.6.2";
-SET @ELASTICSEARCHENG_ALL=CONCAT('*-*,',@ELASTICSEARCHENG_LABEL);
-SET @ELASTICSEARCHENG_IDE=CONCAT('*-IDE,',@ELASTICSEARCHENG_LABEL);
-
-insert into `linkis_cg_manager_label` (`label_key`, `label_value`, `label_feature`, `label_value_size`, `update_time`, `create_time`) VALUES ('combined_userCreator_engineType',@ELASTICSEARCHENG_ALL, 'OPTIONAL', 2, now(), now());
-insert into `linkis_cg_manager_label` (`label_key`, `label_value`, `label_feature`, `label_value_size`, `update_time`, `create_time`) VALUES ('combined_userCreator_engineType',@ELASTICSEARCHENG_IDE, 'OPTIONAL', 2, now(), now());
-
-select @label_id := id from linkis_cg_manager_label where `label_value` = @ELASTICSEARCHENG_IDE;
-insert into linkis_ps_configuration_category (`label_id`, `level`) VALUES (@label_id, 2);
-
-
-INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `engine_conn_type`, `is_hidden`, `is_advanced`, `level`, `treeName`) VALUES ('linkis.elasticsearcheng.url', 'such as:http://127.0.0.1:8080', 'conn address', 'http://127.0.0.1:8080', 'Regex', '^\\s*http://([^:]+)(:\\d+)(/[^\\?]+)?(\\?\\S*)?$', 'elasticsearcheng', 0, 0, 1, 'data source conf');
-INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `engine_conn_type`, `is_hidden`, `is_advanced`, `level`, `treeName`) VALUES ('linkis.elasticsearcheng.catalog', 'catalog', 'catalog', 'system', 'None', '', 'elasticsearcheng', 0, 0, 1, 'data source conf');
-INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `engine_conn_type`, `is_hidden`, `is_advanced`, `level`, `treeName`) VALUES ('linkis.elasticsearcheng.source', 'source', 'source', 'global', 'None', '', 'elasticsearcheng', 0, 0, 1, 'data source conf');
-
-
--- elasticsearcheng-*
+-- set variable
+SET @ENGINE_LABEL="elasticsearch-7.6.2";
+SET @ENGINE_IDE=CONCAT('*-IDE,',@ENGINE_LABEL);
+SET @ENGINE_NAME="elasticsearch";
+
+-- add es engine to IDE
+insert into `linkis_cg_manager_label` (`label_key`, `label_value`, `label_feature`, `label_value_size`, `update_time`, `create_time`) VALUES ('combined_userCreator_engineType', @ENGINE_IDE, 'OPTIONAL', 2, now(), now());
+select @label_id := id from `linkis_cg_manager_label` where label_value = @ENGINE_IDE;
+insert into `linkis_ps_configuration_category` (`label_id`, `level`) VALUES (@label_id, 2);
+
+-- insert configuration key
+INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `engine_conn_type`, `is_hidden`, `is_advanced`, `level`, `treeName`) VALUES ('linkis.es.cluster', 'eg:http://127.0.0.1:9200', 'connection address', 'http://127.0.0.1:9200', 'Regex', '^\\s*http://([^:]+)(:\\d+)(/[^\\?]+)?(\\?\\S*)?$', @ENGINE_NAME, 0, 0, 1, 'datasource configuration');
+INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `engine_conn_type`, `is_hidden`, `is_advanced`, `level`, `treeName`) VALUES ('linkis.datasource', 'datasource', 'datasource', 'hadoop', 'None', '', @ENGINE_NAME, 0, 0, 1, 'datasource configuration');
+INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `engine_conn_type`, `is_hidden`, `is_advanced`, `level`, `treeName`) VALUES ('linkis.es.username', 'username', 'ES cluster username', 'None', 'None', '', @ENGINE_NAME, 0, 0, 1, 'datasource configuration');
+INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `engine_conn_type`, `is_hidden`, `is_advanced`, `level`, `treeName`) VALUES ('linkis.es.password', 'password', 'ES cluster password', 'None', 'None', '', @ENGINE_NAME, 0, 0, 1, 'datasource configuration');
+INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `engine_conn_type`, `is_hidden`, `is_advanced`, `level`, `treeName`) VALUES ('linkis.es.auth.cache', 'Whether the client is cache authenticated', 'Whether the client is cache authenticated', 'false', 'None', '', @ENGINE_NAME, 0, 0, 1, 'datasource configuration');
+INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `engine_conn_type`, `is_hidden`, `is_advanced`, `level`, `treeName`) VALUES ('linkis.es.sniffer.enable', 'Whether Sniffer is enabled on the client', 'Whether Sniffer is enabled on the client', 'false', 'None', '', @ENGINE_NAME, 0, 0, 1, 'datasource configuration');
+INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `engine_conn_type`, `is_hidden`, `is_advanced`, `level`, `treeName`) VALUES ('linkis.es.http.method', 'Request Method', 'HTTP Request Method', 'GET', 'None', '', @ENGINE_NAME, 0, 0, 1, 'datasource configuration');
+INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `engine_conn_type`, `is_hidden`, `is_advanced`, `level`, `treeName`) VALUES ('linkis.es.http.endpoint', '/_search', 'The Endpoint of th JSON script', '/_search', 'None', '', @ENGINE_NAME, 0, 0, 1, 'datasource configuration');
+INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `engine_conn_type`, `is_hidden`, `is_advanced`, `level`, `treeName`) VALUES ('linkis.es.sql.endpoint', '/_sql', 'The Endpoint of th SQL script', '/_sql', 'None', '', @ENGINE_NAME, 0, 0, 1, 'datasource configuration');
+INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `engine_conn_type`, `is_hidden`, `is_advanced`, `level`, `treeName`) VALUES ('linkis.es.sql.format', 'SQL script call template, %s replaced with SQL as the body of the request request Es cluster', 'request body', '{"query":"%s"}', 'None', '', @ENGINE_NAME, 0, 0, 1, 'datasource configuration');
+INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `engine_conn_type`, `is_hidden`, `is_advanced`, `level`, `treeName`) VALUES ('linkis.es.headers.*', 'client headers configuration', 'client headers configuration', 'None', 'None', '', @ENGINE_NAME, 0, 0, 1, 'datasource configuration');
+INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `engine_conn_type`, `is_hidden`, `is_advanced`, `level`, `treeName`) VALUES ('linkis.engineconn.concurrent.limit', 'the maximum engine concurrency', 'the maximum engine concurrency', '100', 'None', '', @ENGINE_NAME, 0, 0, 1, 'datasource configuration');
+
+
+-- elasticsearch engine -*
insert into `linkis_ps_configuration_key_engine_relation` (`config_key_id`, `engine_type_label_id`)
-(select config.id as `config_key_id`, label.id AS `engine_type_label_id` FROM linkis_ps_configuration_config_key config
-INNER JOIN linkis_cg_manager_label label ON config.engine_conn_type = 'elasticsearcheng' and label_value = @ELASTICSEARCHENG_ALL);
+(select config.id as config_key_id, label.id AS engine_type_label_id FROM `linkis_ps_configuration_config_key` config
+INNER JOIN `linkis_cg_manager_label` label ON config.engine_conn_type = @ENGINE_NAME and label_value = @ENGINE_IDE);
--- elasticsearcheng default configuration
+-- elasticsearch engine default configuration
insert into `linkis_ps_configuration_config_value` (`config_key_id`, `config_value`, `config_label_id`)
-(select `relation`.`config_key_id` AS `config_key_id`, '' AS `config_value`, `relation`.`engine_type_label_id` AS `config_label_id` FROM linkis_ps_configuration_key_engine_relation relation
-INNER JOIN linkis_cg_manager_label label ON relation.engine_type_label_id = label.id AND label.label_value = @ELASTICSEARCHENG_ALL);
+(select relation.config_key_id AS config_key_id, '' AS config_value, relation.engine_type_label_id AS config_label_id FROM `linkis_ps_configuration_key_engine_relation` relation
+INNER JOIN `linkis_cg_manager_label` label ON relation.engine_type_label_id = label.id AND label.label_value = @ENGINE_IDE);
```
@@ -86,6 +94,7 @@ INNER JOIN linkis_cg_manager_label label ON relation.engine_type_label_id = labe
| configurations | default | is necessary |description |
| ------------------------ | ------------------- | ---|---------------------------------------- |
| linkis.es.cluster | 127.0.0.1:9200 | yes |ElasticSearch cluster，separate multiple nodes using commas |
+| linkis.datasource | hadoop |yes | ElasticSearch datasource |
| linkis.es.username | None |no | ElasticSearch cluster username |
| linkis.es.password | None |no | ElasticSearch cluster password |
| linkis.es.auth.cache | false |no | Whether the client is cache authenticated |
@@ -114,7 +123,7 @@ linkis.es.password
### 3.2 How to use Linkis SDK
-Linkis provides a client method to call ElasticSearch tasks. The call method is through the SDK provided by LinkisClient. We provide java and scala two ways to call, the specific usage can refer to [JAVA SDK Manual](/user-guide/linkiscli-manual.md).
+Linkis provides a client method to call ElasticSearch tasks. The call method is through the SDK provided by LinkisClient. We provide java and scala two ways to call, the specific usage can refer to [JAVA SDK Manual](../user-guide/linkiscli-manual.md).
For the ElasticSearch task, you only need to change the EngineConnType and CodeType parameters in the Demo.
@@ -127,26 +136,25 @@ For the ElasticSearch task, you only need to change the EngineConnType and CodeT
### 3.2 How to use Linkis-cli
**-codeType parameter description**
-- sql/essql：Execute ES engine tasks through SQL script
-- json/esjson：Execute ES engine tasks using JSON script
+- essql：Execute ES engine tasks through SQL scripts
+- esjson：Execute ES engine tasks using JSON scripts
**Using the sample**
After Linkis 1.0, you can submit tasks through cli. We only need to specify the corresponding EngineConn and CodeType tag types. The use of ElasticSearch is as follows.
-**Example using mode sql/essql**
+**Example using mode essql**
-**注意：** 使用这种形式，ElasticSearch服务必须安装SQL插件，安装方式参考：https://github.com/NLPchina/elasticsearch-sql#elasticsearch-762
+**Note：** To use the SQL script, you must install the SQL plugin for ElasticSearch service：https://github.com/NLPchina/elasticsearch-sql#elasticsearch-762
```shell
- sh ./bin/linkis-cli -submitUser hadoop -engineType elasticsearch-7.6.2 -codeType sql -code '{"sql": "select * from kibana_sample_data_ecommerce limit 10' -runtimeMap linkis.es.http.method=GET -runtimeMap linkis.es.http.endpoint=/_sql
+ sh ./bin/linkis-cli -submitUser hadoop -engineType elasticsearch-7.6.2 -codeType essql -code '{"sql": "select * from kibana_sample_data_ecommerce limit 10' -runtimeMap linkis.es.http.method=GET -runtimeMap linkis.es.http.endpoint=/_sql -runtimeMap linkis.datasource=hadoop -runtimeMap linkis.es.cluster=127.0.0.1:9200
```
-**Example using mode json/esjson**
-
+**Example using mode esjson**
```shell
-sh ./bin/linkis-cli -submitUser hadoop -engineType elasticsearch-7.6.2 -codeType json -code '{"query": {"match": {"order_id": "584677"}}}' -runtimeMap linkis.es.http.method=GET -runtimeMap linkis.es.http.endpoint=/kibana_sample_data_ecommerce/_search
+sh ./bin/linkis-cli -submitUser hadoop -engineType elasticsearch-7.6.2 -codeType esjson -code '{"query": {"match": {"order_id": "584677"}}}' -runtimeMap linkis.es.http.method=GET -runtimeMap linkis.es.http.endpoint=/kibana_sample_data_ecommerce/_search -runtimeMap linkis.datasource=hadoop -runtimeMap linkis.es.cluster=127.0.0.1:9200
```
-Specific use can refer to： [Linkis CLI Manual](../user_guide/linkiscli-manual.md).
+Specific use can refer to： [Linkis CLI Manual](../user-guide/linkiscli-manual.md).
## 4. ElasticSearch EngineConn user settings
diff --git a/docs/engine-usage/presto.md b/docs/engine-usage/presto.md
index c4414fd24b..9525651e1c 100644
--- a/docs/engine-usage/presto.md
+++ b/docs/engine-usage/presto.md
@@ -51,36 +51,34 @@ select * from linkis_cg_engine_conn_plugin_bml_resources
Linkis1.X is done through tags, so we need to insert data into our database, and the insertion method is as follows.
-```bash
-SET @PRESTO_LABEL="presto-x";
+```sql
+-- set variable
+SET @PRESTO_LABEL="presto-0.234";
SET @PRESTO_ALL=CONCAT('*-*,',@PRESTO_LABEL);
SET @PRESTO_IDE=CONCAT('*-IDE,',@PRESTO_LABEL);
SET @PRESTO_NAME="presto";
-insert into `linkis_cg_manager_label` (`label_key`, `label_value`, `label_feature`, `label_value_size`, `update_time`, `create_time`) VALUES ('combined_userCreator_engineType',@PRESTO_ALL, 'OPTIONAL', 2, now(), now ());
-insert into `linkis_cg_manager_label` (`label_key`, `label_value`, `label_feature`, `label_value_size`, `update_time`, `create_time`) VALUES ('combined_userCreator_engineType',@PRESTO_IDE, 'OPTIONAL', 2, now(), now ());
-
-select @label_id := id from linkis_cg_manager_label where `label_value` = @PRESTO_IDE;
-insert into linkis_ps_configuration_category (`label_id`, `level`) VALUES (@label_id, 2);
-
-
-INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `engine_conn_type`, `is_hidden`, `is_advanced`, `level`, `treeName`) VALUES ('wds.linkis.presto.url','Presto cluster connection','presto connection address','http://127.0.0.1:8080','None',null,'presto',0,0, 1,'Data source configuration');
-INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `engine_conn_type`, `is_hidden`, `is_advanced`, `level`, `treeName`) VALUES ('wds.linkis.presto.catalog','Query's Catalog','presto-connected catalog','hive','None',null,'presto',0,0,1,'Data source configuration) ;
-INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `engine_conn_type`, `is_hidden`, `is_advanced`, `level`, `treeName`) VALUES ('wds.linkis.presto.schema','Query Schema','Database connection schema','','None',null,'presto',0,0,1,'Data source configuration);
-INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `engine_conn_type`, `is_hidden`, `is_advanced`, `level`, `treeName`) VALUES ('wds.linkis.presto.source','source used for query','database connection source','','None',null,'presto',0,0,1,'data source configuration') ;
+insert into `linkis_cg_manager_label` (`label_key`, `label_value`, `label_feature`, `label_value_size`, `update_time`, `create_time`) VALUES ('combined_userCreator_engineType',@PRESTO_ALL, 'OPTIONAL', 2, now(), now());
+insert into `linkis_cg_manager_label` (`label_key`, `label_value`, `label_feature`, `label_value_size`, `update_time`, `create_time`) VALUES ('combined_userCreator_engineType',@PRESTO_IDE, 'OPTIONAL', 2, now(), now());
+select @label_id := id from `linkis_cg_manager_label` where `label_value` = @PRESTO_IDE;
+insert into `linkis_ps_configuration_category` (`label_id`, `level`) VALUES (@label_id, 2);
+INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `engine_conn_type`, `is_hidden`, `is_advanced`, `level`, `treeName`) VALUES ('wds.linkis.presto.url','Presto cluster connection','presto connection address','http://127.0.0.1:8080','None',null,@PRESTO_NAME,0,0, 1,'Data source configuration');
+INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `engine_conn_type`, `is_hidden`, `is_advanced`, `level`, `treeName`) VALUES ('wds.linkis.presto.catalog','Querys Catalog','presto-connected catalog','hive','None',null,@PRESTO_NAME,0,0,1,'Data source configuration');
+INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `engine_conn_type`, `is_hidden`, `is_advanced`, `level`, `treeName`) VALUES ('wds.linkis.presto.schema','Query Schema','Database connection schema','','None',null,@PRESTO_NAME,0,0,1,'Data source configuration');
+INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `engine_conn_type`, `is_hidden`, `is_advanced`, `level`, `treeName`) VALUES ('wds.linkis.presto.source','source used for query','database connection source','','None',null,@PRESTO_NAME,0,0,1,'data source configuration') ;
---engine -*
+-- engine -*
insert into `linkis_ps_configuration_key_engine_relation` (`config_key_id`, `engine_type_label_id`)
(select config.id as `config_key_id`, label.id AS `engine_type_label_id` FROM linkis_ps_configuration_config_key config
-INNER JOIN linkis_cg_manager_label label ON config.engine_conn_type = @PRESTO_NAME and label_value = @PRESTO_ALL);
+INNER JOIN linkis_cg_manager_label label ON config.engine_conn_type = @PRESTO_NAME and label_value = @PRESTO_IDE);
---engine default configuration
+-- engine default configuration
insert into `linkis_ps_configuration_config_value` (`config_key_id`, `config_value`, `config_label_id`)
(select `relation`.`config_key_id` AS `config_key_id`, '' AS `config_value`, `relation`.`engine_type_label_id` AS `config_label_id` FROM linkis_ps_configuration_key_engine_relation relation
-INNER JOIN linkis_cg_manager_label label ON relation.engine_type_label_id = label.id AND label.label_value = @PRESTO_ALL);
+INNER JOIN linkis_cg_manager_label label ON relation.engine_type_label_id = label.id AND label.label_value = @PRESTO_IDE);
````
### 2.2 Presto engine related configuration
@@ -153,7 +151,7 @@ If the management console, task interface, and configuration file are not config
sh ./bin/linkis-cli -engineType presto-0.234 -codeType tsql -code 'show tables;' -runtimeMap wds.linkis.presto.url=http://172.22.32.11:50070 -runtimeMap wds.linkis.presto. catalog=hive -runtimeMap wds.linkis.presto.schema=default -runtimeMap wds.linkis.presto.catalog=hive -submitUser hadoop -proxyUser hadoop
````
-For specific usage, please refer to: [Linkis CLI Manual](/user-guide/linkiscli-manual.md).
+For specific usage, please refer to: [Linkis CLI Manual](..//user-guide/linkiscli-manual.md).
### 3.3 Using via Scriptis
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/current/engine-usage/elasticsearch.md b/i18n/zh-CN/docusaurus-plugin-content-docs/current/engine-usage/elasticsearch.md
index f062851f62..09f1c067a8 100644
--- a/i18n/zh-CN/docusaurus-plugin-content-docs/current/engine-usage/elasticsearch.md
+++ b/i18n/zh-CN/docusaurus-plugin-content-docs/current/engine-usage/elasticsearch.md
@@ -87,6 +87,7 @@ INNER JOIN linkis_cg_manager_label label ON relation.engine_type_label_id = labe
| 配置 | 默认值 |是否必须 | 说明 |
| ------------------------ | ------------------- | ---|---------------------------------------- |
| linkis.es.cluster | 127.0.0.1:9200 |是 | ElasticSearch 集群，多个节点使用逗号分隔 |
+| linkis.datasource | hadoop |是 | ElasticSearch datasource |
| linkis.es.username | 无 |否 | ElasticSearch 集群用户名 |
| linkis.es.password | 无 |否 | ElasticSearch 集群密码 |
| linkis.es.auth.cache | false |否 | 客户端是否缓存认证 |
@@ -134,7 +135,7 @@ Linkis 1.0后提供了cli的方式提交任务，我们只需要指定对应的E
sh ./bin/linkis-cli -submitUser hadoop -engineType elasticsearch-7.6.2 -codeType json -code '{"query": {"match": {"order_id": "584677"}}}' -runtimeMap linkis.es.http.method=GET -runtimeMap linkis.es.http.endpoint=/kibana_sample_data_ecommerce/_search
```
-具体使用可以参考： [Linkis CLI Manual](../user_guide/linkiscli-manual.md).
+具体使用可以参考： [Linkis CLI Manual](../user-guide/linkiscli-manual.md).
## 4. ElasticSearch引擎的用户设置
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.1.3/engine-usage/elasticsearch.md b/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.1.3/engine-usage/elasticsearch.md
deleted file mode 100644
index 6d663937bd..0000000000
--- a/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.1.3/engine-usage/elasticsearch.md
+++ /dev/null
@@ -1,144 +0,0 @@
----
-title: ElasticSearch 引擎
-sidebar_position: 11
----
-
-本文主要介绍在 Linkis1.X 中，ElasticSearch 引擎的配置、部署和使用。
-
-## 1. 环境准备
-
-如果您希望在您的服务器上使用 ElasticSearch 引擎，您需要准备 ElasticSearch 服务并提供连接信息，如 ElasticSearch 集群的连接地址、用户名和密码等
-
-## 2. 部署和配置
-
-### 2.1 版本的选择和编译
-注意: 编译 ElasticSearch 引擎之前需要进行 Linkis 项目全量编译
-发布的安装部署包中默认不包含此引擎插件，
-你可以按[Linkis引擎安装指引](https://linkis.apache.org/zh-CN/blog/2022/04/15/how-to-download-engineconn-plugin)部署安装 ，或者按以下流程，手动编译部署
-
-单独编译 ElasticSearch 引擎
-
-```
-${linkis_code_dir}/linkis-enginepconn-lugins/engineconn-plugins/elasticsearch/
-mvn clean install
-```
-
-### 2.2 物料的部署和加载
-
-将 2.1 步编译出来的引擎包,位于
-```bash
-${linkis_code_dir}/linkis-engineconn-plugins/jdbc/target/out/elasticsearch
-```
-上传到服务器的引擎目录下
-```bash
-${LINKIS_HOME}/lib/linkis-engineplugins
-```
-并重启linkis-engineplugin（或者通过引擎接口进行刷新）
-```bash
-cd ${LINKIS_HOME}/sbin
-sh linkis-daemon.sh restart cg-engineplugin
-```
-### 2.3 引擎的标签
-
-Linkis1.X是通过标签来进行的，所以需要在我们数据库中插入数据，插入的方式如下文所示。
-
-管理台的配置是按照引擎标签来进行管理的，如果新增的引擎，有配置参数需要配置的话，需要修改对应的表的元数据
-
-```
-linkis_ps_configuration_config_key: 插入引擎的配置参数的key和默认values
-linkis_cg_manager_label：插入引擎label如：hive-2.3.3
-linkis_ps_configuration_category： 插入引擎的目录关联关系
-linkis_ps_configuration_config_value： 插入引擎需要展示的配置
-linkis_ps_configuration_key_engine_relation:配置项和引擎的关联关系
-```
-
-```sql
-
-SET @ELASTICSEARCHENG_LABEL="elasticsearch-7.6.2";
-SET @ELASTICSEARCHENG_ALL=CONCAT('*-*,',@ELASTICSEARCHENG_LABEL);
-SET @ELASTICSEARCHENG_IDE=CONCAT('*-IDE,',@ELASTICSEARCHENG_LABEL);
-
-insert into `linkis_cg_manager_label` (`label_key`, `label_value`, `label_feature`, `label_value_size`, `update_time`, `create_time`) VALUES ('combined_userCreator_engineType',@ELASTICSEARCHENG_ALL, 'OPTIONAL', 2, now(), now());
-insert into `linkis_cg_manager_label` (`label_key`, `label_value`, `label_feature`, `label_value_size`, `update_time`, `create_time`) VALUES ('combined_userCreator_engineType',@ELASTICSEARCHENG_IDE, 'OPTIONAL', 2, now(), now());
-
-select @label_id := id from linkis_cg_manager_label where `label_value` = @ELASTICSEARCHENG_IDE;
-insert into linkis_ps_configuration_category (`label_id`, `level`) VALUES (@label_id, 2);
-
-
-INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `engine_conn_type`, `is_hidden`, `is_advanced`, `level`, `treeName`) VALUES ('linkis.elasticsearcheng.url', 'such as:http://127.0.0.1:8080', 'conn address', 'http://127.0.0.1:8080', 'Regex', '^\\s*http://([^:]+)(:\\d+)(/[^\\?]+)?(\\?\\S*)?$', 'elasticsearcheng', 0, 0, 1, '数据源配置');
-INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `engine_conn_type`, `is_hidden`, `is_advanced`, `level`, `treeName`) VALUES ('linkis.elasticsearcheng.catalog', 'catalog', 'catalog', 'system', 'None', '', 'elasticsearcheng', 0, 0, 1, '数据源配置');
-INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `engine_conn_type`, `is_hidden`, `is_advanced`, `level`, `treeName`) VALUES ('linkis.elasticsearcheng.source', 'source', 'source', 'global', 'None', '', 'elasticsearcheng', 0, 0, 1, '数据源配置');
-
-
--- elasticsearcheng-*
-insert into `linkis_ps_configuration_key_engine_relation` (`config_key_id`, `engine_type_label_id`)
-(select config.id as `config_key_id`, label.id AS `engine_type_label_id` FROM linkis_ps_configuration_config_key config
-INNER JOIN linkis_cg_manager_label label ON config.engine_conn_type = 'elasticsearcheng' and label_value = @ELASTICSEARCHENG_ALL);
-
--- elasticsearcheng default configuration
-insert into `linkis_ps_configuration_config_value` (`config_key_id`, `config_value`, `config_label_id`)
-(select `relation`.`config_key_id` AS `config_key_id`, '' AS `config_value`, `relation`.`engine_type_label_id` AS `config_label_id` FROM linkis_ps_configuration_key_engine_relation relation
-INNER JOIN linkis_cg_manager_label label ON relation.engine_type_label_id = label.id AND label.label_value = @ELASTICSEARCHENG_ALL);
-
-```
-
-### 2.4 ElasticSearch 引擎相关配置
-
-| 配置 | 默认值 |是否必须 | 说明 |
-| ------------------------ | ------------------- | ---|---------------------------------------- |
-| linkis.es.cluster | 127.0.0.1:9200 |是 | ElasticSearch 集群，多个节点使用逗号分隔 |
-| linkis.es.username | 无 |否 | ElasticSearch 集群用户名 |
-| linkis.es.password | 无 |否 | ElasticSearch 集群密码 |
-| linkis.es.auth.cache | false |否 | 客户端是否缓存认证 |
-| linkis.es.sniffer.enable | false |否 | 客户端是否开启 sniffer |
-| linkis.es.http.method | GET |否 | 调用方式 |
-| linkis.es.http.endpoint | /_search |否 | JSON 脚本调用的 Endpoint |
-| linkis.es.sql.endpoint | /_sql |否 | SQL 脚本调用的 Endpoint |
-| linkis.es.sql.format | {"query":"%s"} |否| SQL 脚本调用的模板，%s 替换成 SQL 作为请求体请求Es 集群 |
-| linkis.es.headers.* | 无 |否| 客户端 Headers 配置 |
-| linkis.engineconn.concurrent.limit | 100|否 | 引擎最大并发 |
-
-## 3. ElasticSearch引擎使用
-### 3.1 准备操作
-您需要配置ElasticSearch的连接信息，包括连接地址信息或用户名密码(如果启用)等信息。
-
-
-
-图3-1 ElasticSearch配置信息
-
-您也可以再提交任务接口中的params.configuration.runtime进行修改即可
-```shell
-linkis.es.cluster
-linkis.es.username |
-linkis.es.password
-```
-
-### 3.2 通过Linkis SDK进行使用
-
-Linkis提供了Java和Scala 的SDK向Linkis服务端提交任务. 具体可以参考 [JAVA SDK Manual](../user-guide/sdk-manual.md).
-对于ElasticSearch任务您只需要修改Demo中的EngineConnType和CodeType参数即可:
-
-```java
- Map<String, Object> labels = new HashMap<String, Object>();
- labels.put(LabelKeyConstant.ENGINE_TYPE_KEY, "elasticsearch-7.6.2"); // required engineType Label
- labels.put(LabelKeyConstant.USER_CREATOR_TYPE_KEY, "hadoop-IDE");// required execute user and creator
- labels.put(LabelKeyConstant.CODE_TYPE_KEY, "elasticsearch"); // required codeType
-```
-
-### 3.2 通过Linkis-cli进行任务提交
-**-codeType参数说明**
-- sql/essql：
-- json/esjson：设置请求参数通过json格式的方式提交任务
-
-**使用示例**
-
-Linkis 1.0后提供了cli的方式提交任务，我们只需要指定对应的EngineConn和CodeType标签类型即可，ElasticSearch的使用如下：
-```shell
-sh ./bin/linkis-cli -submitUser hadoop -engineType elasticsearch-7.6.2 -codeType json -code '{"query": {"match": {"order_id": "584677"}}}' -runtimeMap linkis.es.http.method=GET -runtimeMap linkis.es.http.endpoint=/kibana_sample_data_ecommerce/_search
-```
-具体使用可以参考： [Linkis CLI Manual](../user-guide/linkiscli-manual.md).
-
-
-## 4. ElasticSearch引擎的用户设置
-
-ElasticSearch的用户设置主要是设置ElasticSearch的连接信息，但是建议用户将此密码等信息进行加密管理。
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.1.3/engine-usage/presto.md b/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.1.3/engine-usage/presto.md
deleted file mode 100644
index aa9ad90102..0000000000
--- a/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.1.3/engine-usage/presto.md
+++ /dev/null
@@ -1,164 +0,0 @@
----
-title: Presto 引擎
-sidebar_position: 11
----
-
-本文主要介绍在 Linkis1.X 中，Presto 引擎的配置、部署和使用。
-
-## 1. 环境准备
-
-如果您希望在您的服务器上使用 Presto 引擎，您需要准备 Presto 连接信息，如 Presto 集群的连接地址、用户名和密码等
-
-## 2. 部署和配置
-
-### 2.1 版本的选择和编译
-注意: 编译 Presto 引擎之前需要进行 Linkis 项目全量编译发布的安装部署包中默认不包含此引擎插件， 你可以按此指引部署安装
-https://linkis.apache.org/zh-CN/blog/2022/04/15/how-to-download-engineconn-plugin
-或者按以下流程，手动编译部署
-
-
-单独编译 Presto 引擎
-
-```
-${linkis_code_dir}/linkis-enginepconn-lugins/engineconn-plugins/presto/
-mvn clean install
-```
-
-### 2.2 物料的部署和加载
-
-将 2.1 步编译出来的引擎包,位于
-```bash
-${linkis_code_dir}/linkis-engineconn-plugins/jdbc/target/out/presto
-```
-上传到服务器的引擎目录下
-```bash
-${LINKIS_HOME}/lib/linkis-engineplugins
-```
-并重启linkis-engineplugin（或则通过引擎接口进行刷新）
-```bash
-cd ${LINKIS_HOME}/sbin
-sh linkis-daemon.sh restart cg-engineplugin
-```
-
-检查引擎是否刷新成功：可以查看数据库中的linkis_engine_conn_plugin_bml_resources这张表的last_update_time是否为触发刷新的时间。
-
-```sql
-#登陆到linkis的数据库
-select * from linkis_cg_engine_conn_plugin_bml_resources
-```
-
-### 2.3 引擎的标签
-
-Linkis1.X是通过标签来进行的，所以需要在我们数据库中插入数据，插入的方式如下文所示。
-
-```bash
-SET @PRESTO_LABEL="presto-x";
-SET @PRESTO_ALL=CONCAT('*-*,',@PRESTO_LABEL);
-SET @PRESTO_IDE=CONCAT('*-IDE,',@PRESTO_LABEL);
-
-SET @PRESTO_NAME="presto";
-
-insert into `linkis_cg_manager_label` (`label_key`, `label_value`, `label_feature`, `label_value_size`, `update_time`, `create_time`) VALUES ('combined_userCreator_engineType',@PRESTO_ALL, 'OPTIONAL', 2, now(), now());
-insert into `linkis_cg_manager_label` (`label_key`, `label_value`, `label_feature`, `label_value_size`, `update_time`, `create_time`) VALUES ('combined_userCreator_engineType',@PRESTO_IDE, 'OPTIONAL', 2, now(), now());
-
-select @label_id := id from linkis_cg_manager_label where `label_value` = @PRESTO_IDE;
-insert into linkis_ps_configuration_category (`label_id`, `level`) VALUES (@label_id, 2);
-
-
-INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `engine_conn_type`, `is_hidden`, `is_advanced`, `level`, `treeName`) VALUES ('wds.linkis.presto.url','Presto 集群连接','presto连接地址','http://127.0.0.1:8080','None',null,'presto',0,0,1,'数据源配置');
-INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `engine_conn_type`, `is_hidden`, `is_advanced`, `level`, `treeName`) VALUES ('wds.linkis.presto.catalog','查询的 Catalog ','presto连接的catalog','hive','None',null,'presto',0,0,1,'数据源配置);
-INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `engine_conn_type`, `is_hidden`, `is_advanced`, `level`, `treeName`) VALUES ('wds.linkis.presto.schema',' 查询的 Schema ','数据库连接schema','','None',null,'presto',0,0,1,'数据源配置);
-INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `engine_conn_type`, `is_hidden`, `is_advanced`, `level`, `treeName`) VALUES ('wds.linkis.presto.source','查询使用的 source ','数据库连接source','','None',null,'presto',0,0,1,'数据源配置');
-
-
-
--- engine -*
-insert into `linkis_ps_configuration_key_engine_relation` (`config_key_id`, `engine_type_label_id`)
-(select config.id as `config_key_id`, label.id AS `engine_type_label_id` FROM linkis_ps_configuration_config_key config
-INNER JOIN linkis_cg_manager_label label ON config.engine_conn_type = @PRESTO_NAME and label_value = @PRESTO_ALL);
-
--- engine default configuration
-insert into `linkis_ps_configuration_config_value` (`config_key_id`, `config_value`, `config_label_id`)
-(select `relation`.`config_key_id` AS `config_key_id`, '' AS `config_value`, `relation`.`engine_type_label_id` AS `config_label_id` FROM linkis_ps_configuration_key_engine_relation relation
-INNER JOIN linkis_cg_manager_label label ON relation.engine_type_label_id = label.id AND label.label_value = @PRESTO_ALL);
-```
-
-### 2.2 Presto 引擎相关配置
-
-| 配置 | 默认值 | 说明 | 是否必须 |
-| -------------------------------------- | --------------------- | ------------------------------------------- | -------- |
-| wds.linkis.presto.url | http://127.0.0.1:8080 | Presto 集群连接 | true |
-| wds.linkis.presto.username | default | Presto 集群用户名 | false |
-| wds.linkis.presto.password | 无 | Presto 集群密码 | false |
-| wds.linkis.presto.catalog | system | 查询的 Catalog | true |
-| wds.linkis.presto.schema | 无 | 查询的 Schema | true |
-| wds.linkis.presto.source | global | 查询使用的 source | false |
-| presto.session.query_max_total_memory | 8GB | 查询使用最大的内存 | false |
-| wds.linkis.presto.http.connectTimeout | 60 | Presto 客户端的 connect timeout（单位：秒） | false |
-| wds.linkis.presto.http.readTimeout | 60 | Presto 客户端的 read timeout（单位：秒） | false |
-| wds.linkis.engineconn.concurrent.limit | 100 | Presto 引擎最大并发数 | false |
-
-## 3 引擎的使用
-
-### 3.1 准备操作
-
-如果默认参数不满足时，有三种方式可以进行一些基础参数配置。
-
-#### 3.1.1 管理台配置
-
-
-
-#### 3.1.2 任务接口配置
-提交任务接口，通过参数params.configuration.runtime进行配置
-
-```shell
-http 请求参数示例
-{
- "executionContent": {"code": "show teblas;", "runType": "psql"},
- "params": {
- "variable": {},
- "configuration": {
- "runtime": {
- "wds.linkis.presto.url":"http://127.0.0.1:9090",
- "wds.linkis.presto.catalog ":"hive",
- "wds.linkis.presto.schema ":"default",
- "wds.linkis.presto.source ":""
- }
- }
- },
- "source": {"scriptPath": "file:///mnt/bdp/hadoop/1.sql"},
- "labels": {
- "engineType": "presto-0.234",
- "userCreator": "hadoop-IDE"
- }
-}
-```
-
-#### 3.1.3 文件配置
-通过修改目录 install path/lib/linkis-engineconn-plugins/presto/dist/v0.234/conf/ 中的linkis-engineconn.properties 文件进行配置，如下图：
-
-
-
-### 3.2 通过Linkis-cli进行任务提交
-
-通过linkis-cli的方式提交任务，需要指定对应的EngineConn和CodeType标签类型，presto的使用如下：
-
-- 注意 `engineType presto-0.234` 引擎版本设置是有前缀的 如 `presto` 版本为`0.234` 则设置为 ` presto-0.234`
-
-```shell
- sh ./bin/linkis-cli -engineType presto-0.234 -codeType psql -code 'show tables;' -submitUser hadoop -proxyUser hadoop
-```
-
-如果管理台，任务接口，配置文件，均未配置时可在 cli 客户端中通过`-runtimeMap`属性进行配置
-
-```shell
-sh ./bin/linkis-cli -engineType presto-0.234 -codeType tsql -code 'show tables;' -runtimeMap wds.linkis.presto.url=http://172.22.32.11:50070 -runtimeMap wds.linkis.presto.catalog=hive -runtimeMap wds.linkis.presto.schema=default -runtimeMap wds.linkis.presto.catalog=hive -submitUser hadoop -proxyUser hadoop
-```
-
-具体使用可以参考： [Linkis CLI Manual](docs/user-guide/linkiscli-manual.md).
-
-### 3.3 通过 Scriptis 使用
-
-工作空间模块右键选择新建一个类型为`psql`的脚本
-
-
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org