Merge pull request #162 from YenchangChan/main

2.2.0 release
housepower · Nov 1, 2021 · 445fca9 · 445fca9
2 parents 4e049cb + 9c6719c
commit 445fca9
Show file tree

Hide file tree

Showing 69 changed files with 1,296 additions and 897 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,5 +13,6 @@ exporter
 purger
 rebalancer
 schemer
+migrate
 pkged.go
 resources/eoi_public_key.pub
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,11 @@
-# v.2.1.3
+# v2.2.0
+- user config
+- prometheus address with each cluster
+- support posisitent cluster config to mysql
+- interface beauty
+- fix schema and replica issue
+
+# v2.1.3
 - disabled text_log
 - rename `macros.xml` to `host.xml`
 - fix check error when upgrade and config

diff --git a/controller/clickhouse.go b/controller/clickhouse.go
@@ -578,7 +578,7 @@ func (ck *ClickHouseController) DescTable(c *gin.Context) {
 func (ck *ClickHouseController) QueryInfo(c *gin.Context) {
 	clusterName := c.Param(ClickHouseClusterPath)
 	query := c.Query("query")
-	if !strings.Contains(strings.ToLower(query), " limit ") {
+	if !strings.Contains(strings.ToLower(query), " limit ") && strings.HasPrefix(strings.ToLower(strings.TrimSpace(query)), "select") {
 		query = fmt.Sprintf("%s LIMIT 10000", strings.TrimRight(query, ";"))
 	}
 

diff --git a/docs/guide/deploy.md b/docs/guide/deploy.md
@@ -3,6 +3,7 @@
 - `node_exporter`(非必需)
 - `nacos`(>`1.4`)(非必需)
 - `zookeeper`(>`3.6.0`, 推荐 )
+- `mysql` (当持久化策略设置为`mysql`时必需)
 
 # 监控配置(可选，不影响ckman核心功能)
 

diff --git a/docs/guide/img/image-20211101094807411.png b/docs/guide/img/image-20211101094807411.png
diff --git a/docs/guide/img/image-20211101095551270.png b/docs/guide/img/image-20211101095551270.png
diff --git a/docs/guide/img/image-20211101095655532.png b/docs/guide/img/image-20211101095655532.png
diff --git a/docs/guide/img/image-20211101095957377.png b/docs/guide/img/image-20211101095957377.png
diff --git a/docs/guide/img/image-20211101100554946.png b/docs/guide/img/image-20211101100554946.png
diff --git a/docs/guide/img/image-20211101100759792.png b/docs/guide/img/image-20211101100759792.png
diff --git a/docs/guide/img/image-20211101101119902.png b/docs/guide/img/image-20211101101119902.png
diff --git a/docs/guide/img/image-20211101101254302.png b/docs/guide/img/image-20211101101254302.png
diff --git a/docs/guide/img/image-20211101101329817.png b/docs/guide/img/image-20211101101329817.png
diff --git a/docs/guide/img/image-20211101101532872.png b/docs/guide/img/image-20211101101532872.png
diff --git a/docs/guide/img/image-20211101101843962.png b/docs/guide/img/image-20211101101843962.png
diff --git a/docs/guide/img/image-20211101102020536.png b/docs/guide/img/image-20211101102020536.png
diff --git a/docs/guide/img/image-20211101102717607.png b/docs/guide/img/image-20211101102717607.png
diff --git a/docs/guide/img/image-20211101102848390.png b/docs/guide/img/image-20211101102848390.png
diff --git a/docs/guide/img/image-20211101132253397.png b/docs/guide/img/image-20211101132253397.png
diff --git a/docs/guide/img/image-20211101132333153.png b/docs/guide/img/image-20211101132333153.png