Skip to content

Commit c859f2a

Browse files
authored
Remove references to Read the docs (deprecated) (#159)
* Remove references to Read the docs (deprecated) * Fix clickhouse-grafana project links
1 parent 6cfac12 commit c859f2a

File tree

8 files changed

+9
-9
lines changed

8 files changed

+9
-9
lines changed

docs/content/cn/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ go get -u github.com/ContentSquare/chproxy
7777

7878
## 为什么开发了Chproxy
7979

80-
由于各种原因,ClickHouse 的最大执行时间、最大并发语句可能会超过 [max_execution_time](http://clickhouse-docs.readthedocs.io/en/latest/settings/query_complexity.html#max-execution-time)[max_concurrent_queries](https://github.com/yandex/ClickHouse/blob/add13f233eb6d30da4c75c4309542047a1dde033/dbms/src/Server/config.xml#L75) 的限制:
80+
由于各种原因,ClickHouse 的最大执行时间、最大并发语句可能会超过 [max_execution_time](https://clickhouse.com/docs/en/operations/settings/query-complexity/#max-execution-time)[max_concurrent_queries](https://clickhouse.com/docs/en/operations/server-configuration-parameters/settings/#max-concurrent-queries) 的限制:
8181

8282
* `max_execution_time` 可能会因为当前实现的缺陷而被超过。
8383
* `max_concurrent_queries` 只针对每个节点的限制。如果是在集群节点上,是没法限制集群整体的并发查询数量。
@@ -161,7 +161,7 @@ clusters:
161161
162162
### 通过 HTTPS 进行用户密码认证
163163
164-
假如你需要设置用户名称/密码用于在任何地方访问 `ClickHouse` 集群,可能用于在 [ClickHouse-grafana](https://github.com/ContentSquare/ClickHouse-grafana) 或 [Tabix](https://tabix.io/) 创建图形界面管理。通过不信任的网络传输为加密的密码和数据,是一个坏主意。因此在这种情况下,必须通过 HTTPS 访问集群。
164+
假如你需要设置用户名称/密码用于在任何地方访问 `ClickHouse` 集群,可能用于在 [ClickHouse-grafana](https://github.com/Altinity/clickhouse-grafana) 或 [Tabix](https://tabix.io/) 创建图形界面管理。通过不信任的网络传输为加密的密码和数据,是一个坏主意。因此在这种情况下,必须通过 HTTPS 访问集群。
165165

166166
以下的 `chproxy` 配置示例演示了 [HTTPS 配置](https://github.com/ContentSquare/chproxy/blob/master/config/examples/https.yml):
167167

docs/content/en/configuration/security.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ position: 204
66

77
`Chproxy` removes all the query params from input requests (except the user's [params](https://github.com/ContentSquare/chproxy/blob/master/config#param_groups_config) and listed [here](https://github.com/ContentSquare/chproxy/blob/master/scope.go#L292))
88
before proxying them to `ClickHouse` nodes. This prevents from unsafe overriding
9-
of various `ClickHouse` [settings](http://clickhouse-docs.readthedocs.io/en/latest/interfaces/http_interface.html).
9+
of various `ClickHouse` [settings](https://clickhouse.com/docs/en/interfaces/http/).
1010

1111
Be careful when configuring limits, allowed networks, passwords etc.
1212
By default `chproxy` tries detecting the most obvious configuration errors such as `allowed_networks: ["0.0.0.0/0"]` or sending passwords via unencrypted HTTP.

docs/content/en/faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ position: 103
1515
A single `chproxy` instance easily proxies 1Gbps of compressed `INSERT` data
1616
while using less than 20% of a single CPU core in our production setup.
1717

18-
* *Does `chproxy` support [native interface](http://clickhouse-docs.readthedocs.io/en/latest/interfaces/tcp.html) for ClickHouse?*
18+
* *Does `chproxy` support [native interface](https://clickhouse.com/docs/en/interfaces/tcp/) for ClickHouse?*
1919

2020
No. Because currently all our services work with ClickHouse only via HTTP.
2121
Support for `native interface` may be added in the future.

docs/content/en/history.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ position: 401
66

77
## Why it was created
88

9-
`ClickHouse` may exceed [max_execution_time](http://clickhouse-docs.readthedocs.io/en/latest/settings/query_complexity.html#max-execution-time) and [max_concurrent_queries](https://github.com/yandex/ClickHouse/blob/add13f233eb6d30da4c75c4309542047a1dde033/dbms/src/Server/config.xml#L75) limits due to various reasons:
9+
`ClickHouse` may exceed [max_execution_time](https://clickhouse.com/docs/en/operations/settings/query-complexity/#max-execution-time) and [max_concurrent_queries](https://clickhouse.com/docs/en/operations/server-configuration-parameters/settings/#max-concurrent-queries) limits due to various reasons:
1010
- `max_execution_time` may be exceeded due to the current [implementation deficiencies](https://github.com/yandex/ClickHouse/issues/217).
1111
- `max_concurrent_queries` works only on a per-node basis. There is no way to limit the number of concurrent queries on a cluster if queries are spread across cluster nodes.
1212

docs/content/en/use-cases/authorize-users.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ position: 303
66
---
77

88
Suppose you need to access `ClickHouse` cluster from anywhere by username/password.
9-
This may be used for building graphs from [ClickHouse-grafana](https://github.com/ContentSquare/ClickHouse-grafana) or [Tabix](https://tabix.io/).
9+
This may be used for building graphs from [ClickHouse-grafana](https://github.com/Altinity/clickhouse-grafana) or [Tabix](https://tabix.io/).
1010
It is bad idea to transfer unencrypted password and data over untrusted networks.
1111
So HTTPS must be used for accessing the cluster in such cases.
1212
The following `chproxy` config may be used for [this use case](https://github.com/ContentSquare/chproxy/blob/master/config/examples/https.yml):

docs/content/en/use-cases/spread-insert.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ position: 301
77

88
Usually `INSERT`s are sent from app servers located in a limited number of subnetworks. `INSERT`s from other subnetworks must be denied.
99

10-
All the `INSERT`s may be routed to a [distributed table](http://clickhouse-docs.readthedocs.io/en/latest/table_engines/distributed.html) on a single node. But this increases resource usage (CPU and network) on the node comparing to other nodes, since it must parse each row to be inserted and route it to the corresponding node (shard).
10+
All the `INSERT`s may be routed to a [distributed table](https://clickhouse.com/docs/en/engines/table-engines/special/distributed/) on a single node. But this increases resource usage (CPU and network) on the node comparing to other nodes, since it must parse each row to be inserted and route it to the corresponding node (shard).
1111

1212
It would be better to spread `INSERT`s among available shards and to route them directly to per-shard tables instead of distributed tables. The routing logic may be embedded either directly into applications generating `INSERT`s or may be moved to a proxy. Proxy approach is better since it allows re-configuring `ClickHouse` cluster without modification of application configs and without application downtime. Multiple identical proxies may be started on distinct servers for scalability and availability purposes.
1313

docs/content/en/use-cases/spread-select.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ The load generated by such `SELECT`s on `ClickHouse` cluster may vary depending
1010
on the number of online customers and on the generated report types. It is obvious
1111
that the load must be limited in order to prevent cluster overload.
1212

13-
All the `SELECT`s may be routed to a [distributed table](http://clickhouse-docs.readthedocs.io/en/latest/table_engines/distributed.html) on a single node. But this increases resource usage (RAM, CPU and network) on the node comparing to other nodes, since it must do final aggregation, sorting and filtering for the data obtained from cluster nodes (shards).
13+
All the `SELECT`s may be routed to a [distributed table](https://clickhouse.com/docs/en/engines/table-engines/special/distributed/) on a single node. But this increases resource usage (RAM, CPU and network) on the node comparing to other nodes, since it must do final aggregation, sorting and filtering for the data obtained from cluster nodes (shards).
1414

1515
It would be better to create identical distributed tables on each shard and spread `SELECT`s among all the available shards.
1616

scope.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ func (s *scope) killQuery() error {
293293
}
294294

295295
// allowedParams contains query args allowed to be proxied.
296-
// See http://clickhouse-docs.readthedocs.io/en/latest/settings/
296+
// See https://clickhouse.com/docs/en/operations/settings/
297297
//
298298
// All the other params passed via query args are stripped before
299299
// proxying the request. This is for the sake of security.

0 commit comments

Comments
 (0)