This is an automated email from the ASF dual-hosted git repository.
xxyu pushed a commit to branch doc5.0
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 830a52f0b258a9163782e8dda5258cea7e5d4cd7
Author: Mukvin <boyboys...@163.com>
AuthorDate: Wed Aug 17 10:22:43 2022 +0800
KYLIN-5221 minor fix conflict
---
website/docs/deployment/On-Cloud/intro.md | 9 --
website/docs/deployment/intro.md | 16 ++-
website/docs/deployment/on-cloud/intro.md | 20 ++++
.../deploy_mode/cluster_deployment.md | 0
.../deploy_mode/images/cluster_20191231.png | Bin
.../deploy_mode/intro.md | 0
.../deploy_mode/rw_separation.md | 0
.../deploy_mode/service_discovery.md | 0
.../{On-Premises => on-premises}/images/jdk.en.png | Bin
website/docs/deployment/on-premises/intro.md | 17 +++
.../network_port_requirements.md | 0
.../{On-Premises => on-premises}/prerequisite.md | 0
.../images/install_initialize_postgresql.png | Bin
.../images/installation_create_postgresqldb.jpg | Bin
.../rdbms_metastore/intro.md | 0
.../rdbms_metastore/mysql/install_mysql.md | 0
.../rdbms_metastore/mysql/intro.md | 0
.../rdbms_metastore/mysql/mysql_metastore.md | 0
.../postgresql/default_metastore.md | 0
.../postgresql/install_postgresql.md | 0
.../rdbms_metastore/postgresql/intro.md | 0
website/docs/development/intro.md | 10 +-
..._managment_api.md => segment_management_api.md} | 0
website/sidebars.js | 132 +++++++++++++--------
24 files changed, 137 insertions(+), 67 deletions(-)
diff --git a/website/docs/deployment/On-Cloud/intro.md
b/website/docs/deployment/On-Cloud/intro.md
deleted file mode 100644
index 77c7bb5692..0000000000
--- a/website/docs/deployment/On-Cloud/intro.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-sidebar_position: 1
----
-
-# Kylin on K8S
-
-- K8S https://aws.amazon.com/eks/
-- RDBMS https://aws.amazon.com/rds/
-- Docker Image and K8s Template
diff --git a/website/docs/deployment/intro.md b/website/docs/deployment/intro.md
index 025c8078cf..5b40a92f23 100644
--- a/website/docs/deployment/intro.md
+++ b/website/docs/deployment/intro.md
@@ -1,7 +1,17 @@
---
-sidebar_position: 1
+title: Intro
+language: en
+sidebar_label: Intro
+pagination_label: Intro
+toc_min_heading_level: 2
+toc_max_heading_level: 6
+pagination_prev: null
+pagination_next: null
+keywords:
+ - Intro
+draft: false
+last_update:
+ date: 08/17/2022
---
-# Intro
-
Kylin 5.0 support deploy on Hadoop or K8S.
diff --git a/website/docs/deployment/on-cloud/intro.md
b/website/docs/deployment/on-cloud/intro.md
new file mode 100644
index 0000000000..27ad17423e
--- /dev/null
+++ b/website/docs/deployment/on-cloud/intro.md
@@ -0,0 +1,20 @@
+---
+title: Kylin on K8S
+language: en
+sidebar_label: Kylin on K8S
+pagination_label: Kylin on K8S
+toc_min_heading_level: 2
+toc_max_heading_level: 6
+pagination_prev: null
+pagination_next: null
+keywords:
+ - kylin on k8s
+ - k8s
+draft: false
+last_update:
+ date: 08/17/2022
+---
+
+- K8S https://aws.amazon.com/eks/
+- RDBMS https://aws.amazon.com/rds/
+- Docker Image and K8s Template
diff --git
a/website/docs/deployment/On-Premises/deploy_mode/cluster_deployment.md
b/website/docs/deployment/on-premises/deploy_mode/cluster_deployment.md
similarity index 100%
rename from
website/docs/deployment/On-Premises/deploy_mode/cluster_deployment.md
rename to website/docs/deployment/on-premises/deploy_mode/cluster_deployment.md
diff --git
a/website/docs/deployment/On-Premises/deploy_mode/images/cluster_20191231.png
b/website/docs/deployment/on-premises/deploy_mode/images/cluster_20191231.png
similarity index 100%
rename from
website/docs/deployment/On-Premises/deploy_mode/images/cluster_20191231.png
rename to
website/docs/deployment/on-premises/deploy_mode/images/cluster_20191231.png
diff --git a/website/docs/deployment/On-Premises/deploy_mode/intro.md
b/website/docs/deployment/on-premises/deploy_mode/intro.md
similarity index 100%
rename from website/docs/deployment/On-Premises/deploy_mode/intro.md
rename to website/docs/deployment/on-premises/deploy_mode/intro.md
diff --git a/website/docs/deployment/On-Premises/deploy_mode/rw_separation.md
b/website/docs/deployment/on-premises/deploy_mode/rw_separation.md
similarity index 100%
rename from website/docs/deployment/On-Premises/deploy_mode/rw_separation.md
rename to website/docs/deployment/on-premises/deploy_mode/rw_separation.md
diff --git
a/website/docs/deployment/On-Premises/deploy_mode/service_discovery.md
b/website/docs/deployment/on-premises/deploy_mode/service_discovery.md
similarity index 100%
rename from website/docs/deployment/On-Premises/deploy_mode/service_discovery.md
rename to website/docs/deployment/on-premises/deploy_mode/service_discovery.md
diff --git a/website/docs/deployment/On-Premises/images/jdk.en.png
b/website/docs/deployment/on-premises/images/jdk.en.png
similarity index 100%
rename from website/docs/deployment/On-Premises/images/jdk.en.png
rename to website/docs/deployment/on-premises/images/jdk.en.png
diff --git a/website/docs/deployment/on-premises/intro.md
b/website/docs/deployment/on-premises/intro.md
new file mode 100644
index 0000000000..e5c88e8783
--- /dev/null
+++ b/website/docs/deployment/on-premises/intro.md
@@ -0,0 +1,17 @@
+---
+title: Kylin On Hadoop
+language: en
+sidebar_label: Kylin On Hadoop
+pagination_label: Kylin On Hadoop
+toc_min_heading_level: 2
+toc_max_heading_level: 6
+pagination_prev: null
+pagination_next: null
+keywords:
+ - Kylin On Hadoop
+draft: false
+last_update:
+ date: 08/17/2022
+---
+
+Kylin 5.0 support deploy on Hadoop.
diff --git a/website/docs/deployment/On-Premises/network_port_requirements.md
b/website/docs/deployment/on-premises/network_port_requirements.md
similarity index 100%
rename from website/docs/deployment/On-Premises/network_port_requirements.md
rename to website/docs/deployment/on-premises/network_port_requirements.md
diff --git a/website/docs/deployment/On-Premises/prerequisite.md
b/website/docs/deployment/on-premises/prerequisite.md
similarity index 100%
rename from website/docs/deployment/On-Premises/prerequisite.md
rename to website/docs/deployment/on-premises/prerequisite.md
diff --git
a/website/docs/deployment/On-Premises/rdbms_metastore/images/install_initialize_postgresql.png
b/website/docs/deployment/on-premises/rdbms_metastore/images/install_initialize_postgresql.png
similarity index 100%
rename from
website/docs/deployment/On-Premises/rdbms_metastore/images/install_initialize_postgresql.png
rename to
website/docs/deployment/on-premises/rdbms_metastore/images/install_initialize_postgresql.png
diff --git
a/website/docs/deployment/On-Premises/rdbms_metastore/images/installation_create_postgresqldb.jpg
b/website/docs/deployment/on-premises/rdbms_metastore/images/installation_create_postgresqldb.jpg
similarity index 100%
rename from
website/docs/deployment/On-Premises/rdbms_metastore/images/installation_create_postgresqldb.jpg
rename to
website/docs/deployment/on-premises/rdbms_metastore/images/installation_create_postgresqldb.jpg
diff --git a/website/docs/deployment/On-Premises/rdbms_metastore/intro.md
b/website/docs/deployment/on-premises/rdbms_metastore/intro.md
similarity index 100%
rename from website/docs/deployment/On-Premises/rdbms_metastore/intro.md
rename to website/docs/deployment/on-premises/rdbms_metastore/intro.md
diff --git
a/website/docs/deployment/On-Premises/rdbms_metastore/mysql/install_mysql.md
b/website/docs/deployment/on-premises/rdbms_metastore/mysql/install_mysql.md
similarity index 100%
rename from
website/docs/deployment/On-Premises/rdbms_metastore/mysql/install_mysql.md
rename to
website/docs/deployment/on-premises/rdbms_metastore/mysql/install_mysql.md
diff --git a/website/docs/deployment/On-Premises/rdbms_metastore/mysql/intro.md
b/website/docs/deployment/on-premises/rdbms_metastore/mysql/intro.md
similarity index 100%
rename from website/docs/deployment/On-Premises/rdbms_metastore/mysql/intro.md
rename to website/docs/deployment/on-premises/rdbms_metastore/mysql/intro.md
diff --git
a/website/docs/deployment/On-Premises/rdbms_metastore/mysql/mysql_metastore.md
b/website/docs/deployment/on-premises/rdbms_metastore/mysql/mysql_metastore.md
similarity index 100%
rename from
website/docs/deployment/On-Premises/rdbms_metastore/mysql/mysql_metastore.md
rename to
website/docs/deployment/on-premises/rdbms_metastore/mysql/mysql_metastore.md
diff --git
a/website/docs/deployment/On-Premises/rdbms_metastore/postgresql/default_metastore.md
b/website/docs/deployment/on-premises/rdbms_metastore/postgresql/default_metastore.md
similarity index 100%
rename from
website/docs/deployment/On-Premises/rdbms_metastore/postgresql/default_metastore.md
rename to
website/docs/deployment/on-premises/rdbms_metastore/postgresql/default_metastore.md
diff --git
a/website/docs/deployment/On-Premises/rdbms_metastore/postgresql/install_postgresql.md
b/website/docs/deployment/on-premises/rdbms_metastore/postgresql/install_postgresql.md
similarity index 100%
rename from
website/docs/deployment/On-Premises/rdbms_metastore/postgresql/install_postgresql.md
rename to
website/docs/deployment/on-premises/rdbms_metastore/postgresql/install_postgresql.md
diff --git
a/website/docs/deployment/On-Premises/rdbms_metastore/postgresql/intro.md
b/website/docs/deployment/on-premises/rdbms_metastore/postgresql/intro.md
similarity index 100%
rename from
website/docs/deployment/On-Premises/rdbms_metastore/postgresql/intro.md
rename to
website/docs/deployment/on-premises/rdbms_metastore/postgresql/intro.md
diff --git a/website/docs/development/intro.md
b/website/docs/development/intro.md
index e3f236c1ed..5795165ed6 100644
--- a/website/docs/development/intro.md
+++ b/website/docs/development/intro.md
@@ -1,16 +1,16 @@
---
-title: Deployment Mode
+title: Guide of developer
language: en
-sidebar_label: Deployment Mode
-pagination_label: Deployment Mode
+sidebar_label: Guide of developer
+pagination_label: Guide of developer
toc_min_heading_level: 2
toc_max_heading_level: 6
pagination_prev: null
pagination_next: null
keywords:
- - deployment mode
+ - guide
+ - developer
draft: false
last_update:
date: 08/12/2022
---
-# Guide of developer
diff --git a/website/docs/restapi/segment_managment_api.md
b/website/docs/restapi/segment_management_api.md
similarity index 100%
rename from website/docs/restapi/segment_managment_api.md
rename to website/docs/restapi/segment_management_api.md
diff --git a/website/sidebars.js b/website/sidebars.js
index ec86ae733f..7afe31a706 100644
--- a/website/sidebars.js
+++ b/website/sidebars.js
@@ -52,97 +52,121 @@ const sidebars = {
{
type: 'category',
label: 'Deployment',
+ link: {
+ type: 'doc',
+ id: 'deployment/intro',
+ },
items: [
- {
- type: 'doc',
- id: 'deployment/intro'
- },
- {
- type: 'doc',
- id: 'deployment/prerequisite'
- },
- {
- type: 'doc',
- id: 'deployment/network_port_requirements'
- },
- // TODO: add Installation part
- // {
- // type: 'category',
- // label: 'Installation',
- // items:[
- // {
- //
- // },
- // ],
- // },
{
type: 'category',
- label: 'Use RDBMS as Metastore',
+ label: 'On Premises',
link: {
type: 'doc',
- id: 'deployment/rdbms_metastore/intro',
+ id: 'deployment/on-premises/intro'
},
items: [
+ {
+ type: 'doc',
+ id: 'deployment/on-premises/prerequisite',
+ },
+ {
+ type: 'doc',
+ id:
'deployment/on-premises/network_port_requirements',
+ },
{
type: 'category',
- label: 'MySQL',
+ label: 'Use RDBMS as Metastore',
link: {
type: 'doc',
- id: 'deployment/rdbms_metastore/mysql/intro',
+ id:
'deployment/on-premises/rdbms_metastore/intro',
},
items: [
{
- type: 'doc',
- id:
'deployment/rdbms_metastore/mysql/install_mysql'
+ type: 'category',
+ label: 'MySQL',
+ link: {
+ type: 'doc',
+ id:
'deployment/on-premises/rdbms_metastore/mysql/intro',
+ },
+ items: [
+ {
+ type: 'doc',
+ id:
'deployment/on-premises/rdbms_metastore/mysql/install_mysql'
+ },
+ {
+ type: 'doc',
+ id:
'deployment/on-premises/rdbms_metastore/mysql/mysql_metastore'
+ },
+ ],
},
{
- type: 'doc',
- id:
'deployment/rdbms_metastore/mysql/mysql_metastore'
+ type: 'category',
+ label: 'PostgreSQL',
+ link: {
+ type: 'doc',
+ id:
'deployment/on-premises/rdbms_metastore/postgresql/intro',
+ },
+ items: [
+ {
+ type: 'doc',
+ id:
'deployment/on-premises/rdbms_metastore/postgresql/install_postgresql'
+ },
+ {
+ type: 'doc',
+ id:
'deployment/on-premises/rdbms_metastore/postgresql/default_metastore'
+ },
+ ],
},
- ],
+ ]
},
{
type: 'category',
- label: 'PostgreSQL',
+ label: 'Deploy Mode',
link: {
type: 'doc',
- id:
'deployment/rdbms_metastore/postgresql/intro',
+ id: 'deployment/on-premises/deploy_mode/intro',
},
items: [
{
type: 'doc',
- id:
'deployment/rdbms_metastore/postgresql/install_postgresql'
+ id:
'deployment/on-premises/deploy_mode/cluster_deployment'
},
{
type: 'doc',
- id:
'deployment/rdbms_metastore/postgresql/default_metastore'
+ id:
'deployment/on-premises/deploy_mode/service_discovery'
},
- ],
+ {
+ type: 'doc',
+ id:
'deployment/on-premises/deploy_mode/rw_separation'
+ },
+ ]
},
- ]
+ ],
},
{
type: 'category',
- label: 'Deployment Mode',
+ label: 'On Cloud',
link: {
type: 'doc',
- id: 'deployment/deploy_mode/intro',
+ id: 'deployment/on-cloud/intro',
},
items: [
{
type: 'doc',
- id: 'deployment/deploy_mode/cluster_deployment'
- },
- {
- type: 'doc',
- id: 'deployment/deploy_mode/service_discovery'
- },
- {
- type: 'doc',
- id: 'deployment/deploy_mode/rw_separation'
+ id: 'deployment/on-cloud/intro'
},
]
},
+ // TODO: add Installation part
+ // {
+ // type: 'category',
+ // label: 'Installation',
+ // items:[
+ // {
+ //
+ // },
+ // ],
+ // },
{
type: 'category',
label: 'System Configuration',
@@ -455,7 +479,7 @@ const sidebars = {
},
{
type: 'doc',
- id: 'restapi/segment_managment_api'
+ id: 'restapi/segment_management_api'
},
{
type: 'doc',
@@ -533,6 +557,10 @@ const sidebars = {
{
type: 'category',
label: 'Development Guide',
+ link: {
+ type: 'doc',
+ id: 'development/intro',
+ },
items: [
{
type: 'doc',
@@ -544,7 +572,11 @@ const sidebars = {
},
{
type: 'doc',
- id: 'development/how_to_develop'
+ id: 'development/how_to_test'
+ },
+ {
+ type: 'doc',
+ id: 'development/how_to_debug'
},
{
type: 'doc',
