diff --git a/README.md b/README.md index 0d12beb3..e73f235c 100644 --- a/README.md +++ b/README.md @@ -72,4 +72,9 @@ If you desire immediate response, please kindly raise issues to us or scan the b ![](images/en_US/ch1/ContractUs.png) ## License -**Linkis is under the Apache 2.0 license. See the [LICENSE](/LICENSE) file for details.** \ No newline at end of file +**Linkis is under the Apache 2.0 license. See the [LICENSE](/LICENSE) file for details.** + +## Tips +Because the front-end code of Qualitis is FES, a front-end framework developed by WeBank, but the FES framework is not currently open source, so the front-end code of Qualitis is not open source for the time being. We will promote Qualitis's front-end open source as soon as possible. We are very sorry about this. + +You can download the source code and unzip web/app/src/main/resources/static/static.zip to get the compiled front-end code, or use it directly by downloading the release. \ No newline at end of file diff --git a/docs/en_US/ch1/QuickDeploy.md b/docs/en_US/ch1/QuickDeploy.md index 54c013b7..d94eaebe 100644 --- a/docs/en_US/ch1/QuickDeploy.md +++ b/docs/en_US/ch1/QuickDeploy.md @@ -8,7 +8,7 @@ Hadoop (2.7.2) Hive (1.2.1) Zookeeper (3.4.9) Linkis (0.9.1), Spark engine required.[How to install Linkis?](https://github.com/WeBankFinTech/Linkis) -DataSphereStudio (0.6.0) Optional. If you want to use workflow, it it required. [How to install DataSphereStudio?](https://github.com/WeBankFinTech/DataSphereStudio) +DataSphereStudio (0.6.0) Optional. If you want to use workflow, it it required. [How to install DataSphereStudio?](https://github.com/WeBankFinTech/DataSphereStudio) ## 2. Download [Download](https://github.com/WeBankFinTech/Qualitis/releases) @@ -54,10 +54,6 @@ task.persistence.address= ## zookeeper address zk.address= - -## HiveServer2 username and password -hive.username= -hive.password= ``` ### 4.4 Start Service @@ -79,9 +75,7 @@ Click on "Configuration" -> "Cluster Configuration" to add cluster. ![系统配置](../../../images/en_US/ch1/NewCluster.png) Type in the configuration information below: Cluster name(The name of Hadoop cluster) -Cluster type -HiveMetaStore address -HiveServer2 address +Cluster type Linkis address Linkis Token(How to get Linkis Token:[Linkis Access Guide](Linkis Access Guide.md)) @@ -90,7 +84,14 @@ Here is an example: --- -Tips: +Tips: + +Qualitis will save the abnormal data in the database. The saved database name can be configured in the system settings, as shown in the following figure: +![](../../../images/en_US/ch1/AbnormalDataSavedDatabaseConfiguration.png) +As shown in the figure, Qualitis provides $ {USERNAME} as an expression for user name replacement. The abnormal data ran by different users are stored in their respective databases. + +--- + Workflow is default supported. You need to install [DataSphereStudio](https://github.com/WeBankFinTech/DataSphereStudio) to use workflow. Enabling workflow does not affect the normal use of Qualitis. diff --git a/docs/zh_CN/ch1/README.md b/docs/zh_CN/ch1/README.md index 392a2a89..e9af5048 100644 --- a/docs/zh_CN/ch1/README.md +++ b/docs/zh_CN/ch1/README.md @@ -42,7 +42,6 @@ Qualitis基于Spring Boot,依赖于Linkis进行数据计算,提供数据质 [用户手册](用户手册.md) [架构设计文档](架构设计文档.md)
-**更多文档,请[点我访问](https://github.com/WeBankFinTech/Qualitis/wiki)** ## Architecture ![](../../../images/zh_CN/ch1/总体架构设计.png) @@ -74,4 +73,9 @@ Qualitis基于Spring Boot,依赖于Linkis进行数据计算,提供数据质 ![](../../../images/en_US/ch1/ContractUs.png) ## License -**Linkis is under the Apache 2.0 license. See the [LICENSE](/LICENSE) file for details.** \ No newline at end of file +**Linkis is under the Apache 2.0 license. See the [LICENSE](/LICENSE) file for details.** + +## Tips +由于Qualitis的前端代码是采用WeBank自研的前端框架FES,但是FES框架目前没有开源,所以Qualitis的前端代码暂不开源。我们会尽快推进Qualitis的前端开源。对此我们感到非常抱歉。 + +你可以通过源码下载,并解压web/app/src/main/resources/static/static.zip来获取编译后的前端代码,或者通过下载release直接使用。 \ No newline at end of file diff --git "a/docs/zh_CN/ch1/\345\215\207\347\272\247\346\214\207\345\215\227.md" "b/docs/zh_CN/ch1/\345\215\207\347\272\247\346\214\207\345\215\227.md" index 7c1b8b4d..d0b31997 100644 --- "a/docs/zh_CN/ch1/\345\215\207\347\272\247\346\214\207\345\215\227.md" +++ "b/docs/zh_CN/ch1/\345\215\207\347\272\247\346\214\207\345\215\227.md" @@ -4,7 +4,16 @@ 下载0.6.0版本代码,并解压。 执行以下数据库脚本: - ``` - mysql -u {USERNAME} -p {PASSWORD} -h {IP} --default-character-set=utf8 - source conf/database/update/update_0.5.0-0.6.0.sql - ``` \ No newline at end of file +``` +mysql -u {USERNAME} -p {PASSWORD} -h {IP} --default-character-set=utf8 +source conf/database/update/update_0.5.0-0.6.0.sql +``` + +## 0.6.0 升级 0.7.0 +下载0.6.0版本代码,并解压。 + +执行以下数据库脚本: +``` +mysql -u {USERNAME} -p {PASSWORD} -h {IP} --default-character-set=utf8 +source conf/database/update/update_0.6.0-0.7.0.sql +``` \ No newline at end of file diff --git "a/docs/zh_CN/ch1/\345\277\253\351\200\237\346\220\255\345\273\272\346\211\213\345\206\214.md" "b/docs/zh_CN/ch1/\345\277\253\351\200\237\346\220\255\345\273\272\346\211\213\345\206\214.md" index c4c11243..37a7c70b 100644 --- "a/docs/zh_CN/ch1/\345\277\253\351\200\237\346\220\255\345\273\272\346\211\213\345\206\214.md" +++ "b/docs/zh_CN/ch1/\345\277\253\351\200\237\346\220\255\345\273\272\346\211\213\345\206\214.md" @@ -8,7 +8,7 @@ Hadoop (2.7.2) Hive (1.2.1) Zookeeper (3.4.9) Linkis(0.9.1), 必装Spark引擎。[如何安装Linkis](https://github.com/WeBankFinTech/Linkis) -DataSphereStudio (0.6.0) 可选. 如果你想使用工作流,必装DataSphereStudio [如何安装DataSphereStudio?](https://github.com/WeBankFinTech/DataSphereStudio) +DataSphereStudio (0.6.0) 可选. 如果你想使用工作流,必装DataSphereStudio [如何安装DataSphereStudio?](https://github.com/WeBankFinTech/DataSphereStudio) ## 二、安装包下载 [下载](https://github.com/WeBankFinTech/Qualitis/releases) @@ -54,10 +54,6 @@ task.persistence.address= ## Zookeeper地址 zk.address= - -## HiveServer2 连接用户名密码 -hive.username= -hive.password= ``` ### 4.4 启动系统 @@ -79,9 +75,7 @@ sh bin/start.sh ![系统配置](../../../images/zh_CN/ch1/系统配置.png) 填入以下配置信息: 集群名称(Hadoop集群名称) -集群类型 -HiveMetaStore地址 -HiveServer2地址 +集群类型 Linkis地址 Linkis Token(Linkis Token配置方式请查看文档:[接入Linkis文档](接入Linkis文档.md)) @@ -90,7 +84,14 @@ Linkis Token(Linkis Token配置方式请查看文档:[接入Linkis文档](接 --- -Tips: +Tips: + +Qualitis会将异常数据保存在数据库当中,保存的数据库名称可以在系统设置中配置,如下图所示: +![](../../../images/zh_CN/ch1/异常数据数据库配置.png) +如图所示,Qualitis提供${USERNAME}来作为用户名替换的表达式,不同的用户跑出来的异常数据,保存在各自的数据库中。 + +--- + 工作流已默认开启,工作流需要安装[DataSphereStudio](https://github.com/WeBankFinTech/DataSphereStudio)。 开启工作流不影响Qualitis正常使用。 如需关闭,可修改配置文件 diff --git "a/docs/zh_CN/ch1/\346\216\245\345\205\245Linkis\346\226\207\346\241\243.md" "b/docs/zh_CN/ch1/\346\216\245\345\205\245Linkis\346\226\207\346\241\243.md" index 69582479..ec58f865 100644 --- "a/docs/zh_CN/ch1/\346\216\245\345\205\245Linkis\346\226\207\346\241\243.md" +++ "b/docs/zh_CN/ch1/\346\216\245\345\205\245Linkis\346\226\207\346\241\243.md" @@ -19,7 +19,7 @@ QUALITIS-AUTH=* ### 加入MySQL依赖包 ``` -cd $LINKIS_HOME/linkis-ujes-spark-enginemanager/lib +cd $SPARK_HOME/jars ``` 并加入mysql依赖包 diff --git a/images/en_US/ch1/AbnormalDataSavedDatabaseConfiguration.png b/images/en_US/ch1/AbnormalDataSavedDatabaseConfiguration.png new file mode 100644 index 00000000..63d48458 Binary files /dev/null and b/images/en_US/ch1/AbnormalDataSavedDatabaseConfiguration.png differ diff --git a/images/en_US/ch1/ClusterConfigurationDemo.png b/images/en_US/ch1/ClusterConfigurationDemo.png index 5e6bc0e9..8f5caba4 100644 Binary files a/images/en_US/ch1/ClusterConfigurationDemo.png and b/images/en_US/ch1/ClusterConfigurationDemo.png differ diff --git "a/images/zh_CN/ch1/\345\274\202\345\270\270\346\225\260\346\215\256\346\225\260\346\215\256\345\272\223\351\205\215\347\275\256.png" "b/images/zh_CN/ch1/\345\274\202\345\270\270\346\225\260\346\215\256\346\225\260\346\215\256\345\272\223\351\205\215\347\275\256.png" new file mode 100644 index 00000000..fa15ce72 Binary files /dev/null and "b/images/zh_CN/ch1/\345\274\202\345\270\270\346\225\260\346\215\256\346\225\260\346\215\256\345\272\223\351\205\215\347\275\256.png" differ diff --git "a/images/zh_CN/ch1/\350\247\204\345\210\231\351\205\215\347\275\256\346\240\267\344\276\213.png" "b/images/zh_CN/ch1/\350\247\204\345\210\231\351\205\215\347\275\256\346\240\267\344\276\213.png" index ede080ca..89ff149d 100644 Binary files "a/images/zh_CN/ch1/\350\247\204\345\210\231\351\205\215\347\275\256\346\240\267\344\276\213.png" and "b/images/zh_CN/ch1/\350\247\204\345\210\231\351\205\215\347\275\256\346\240\267\344\276\213.png" differ