Skip to content

Commit 9635eb4

Browse files
author
Ryan Sickles
committed
Merge branch 'ryans_patch' of https://github.com/ClickHouse/clickhouse-docs into ryans_patch
2 parents 982a9cf + 84d75aa commit 9635eb4

File tree

137 files changed

+5669
-10183
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+5669
-10183
lines changed

.github/workflows/build-search.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,23 @@ env:
1515

1616
jobs:
1717
update-search:
18-
if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'update search') && github.event.pull_request.base.ref == 'main'
19-
#if: contains(github.event.pull_request.labels.*.name, 'update search') # Updated to trigger directly on PRs with the label
18+
if: github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' || (github.event_name == 'pull_request' && github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'update search') && github.event.pull_request.base.ref == 'main')
2019
runs-on: ubuntu-latest
2120

2221
steps:
2322
- name: Checkout Repository
24-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2524

2625
- name: Set up Node.js
27-
uses: actions/setup-node@v3
26+
uses: actions/setup-node@v4
2827
with:
2928
node-version: '20'
3029

3130
- name: Run Prep from Master
3231
run: yarn copy-clickhouse-repo-docs
3332

3433
- name: Run Auto Generate Settings
35-
run: yarn auto-generate-settings
34+
run: yarn autogenerate-settings
3635

3736
- name: Run Indexer
3837
run: yarn run-indexer

.github/workflows/check-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
# Step 1: Check out the repository
2020
- name: Check out repository
21-
uses: actions/checkout@v3
21+
uses: actions/checkout@v4
2222

2323
# Step 2: Set up environment if required (e.g., installing Aspell)
2424
- name: Install Aspell
@@ -33,7 +33,7 @@ jobs:
3333

3434
# Step 4: Setup Python and dependencies for KB checker
3535
- name: Set up Python
36-
uses: actions/setup-python@v3
36+
uses: actions/setup-python@v5
3737
with:
3838
python-version: '3.x'
3939

.github/workflows/table_of_contents.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ jobs:
2323

2424
# Step 1 - Check out the repository
2525
- name: Check out repository
26-
uses: actions/checkout@v3
26+
uses: actions/checkout@v4
2727

2828
# Step 2 - Pull changes
2929
- name: Pull remote Changes
3030
run: git pull
3131

3232
# Step 3 - Setup python
3333
- name: Set up python
34-
uses: actions/setup-python@v3
34+
uses: actions/setup-python@v5
3535
with:
3636
python-version: '3.x'
3737

.gitignore

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ clickhouse-docs.code-workspace
2828
yarn.lock
2929
yarn.error-log
3030
.comments
31+
yarn-error.log
3132

3233
# Output files used by scripts to verify links
3334
sidebar_links.txt
@@ -36,9 +37,7 @@ active_links.txt
3637
active_links.json
3738

3839
# Files used by scripts to autogenerate settings and do spellcheck
39-
FormatFactorySettingsDeclaration.h
40-
FormatFactorySettings.h
41-
Settings.cpp
40+
scripts/settings/tmp
4241

4342
# Files whose content gets autogenerated
4443
docs/en/cloud/manage/api/invitations-api-reference.md

README.md

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -69,28 +69,22 @@ You can run a copy of this website locally within a few steps. Some folks find t
6969
# ✨ Done in 6.44s.
7070
```
7171

72-
1. Use Yarn to grab the latest documentation changes from the `clickhouse/clickhouse` repository:
72+
1. Use Yarn to grab the latest documentation changes from the `ClickHouse/ClickHouse` repository:
7373

7474
```shell
75-
yarn prep-from-master
75+
yarn copy-clickhouse-repo-docs
7676
77-
# yarn run v1.22.19
78-
# Cloning into '/tmp/ch_temp_14714'...
77+
# Cloning into 'ClickHouse'...
7978
# ...
80-
# Prep completed
81-
# ✨ Done in 16.44s
79+
# Copying docs from ClickHouse ...
80+
# Successfully executed copy from master
81+
# ✨ Done in 18.56s.
8282
```
8383

84-
Alternatively, you can use a local copy of the `clickhouse/clickhouse` if you already have that repository cloned locally.
84+
Alternatively, you can use a local copy of `ClickHouse/ClickHouse` if you already have that repository cloned locally with `-l`.
8585

8686
```shell
87-
yarn prep-from-local "/Users/johnny/clickhouse/"
88-
89-
# yarn run v1.22.19
90-
# $ bash -c 'array_root=($npm ...
91-
# ...
92-
# Prep completed
93-
✨ Done in 0.47s.
87+
yarn copy-clickhouse-repo-docs -l "/Users/johnny/clickhouse/"
9488
```
9589

9690
1. Start the local web-server:

copyClickhouseRepoDocs.sh

Lines changed: 0 additions & 54 deletions
This file was deleted.

docs/en/cloud/bestpractices/usagelimits.md

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,26 @@ sidebar_label: Usage Limits
44
title: Usage Limits
55
---
66

7-
8-
## Database Limits
9-
Clickhouse is very fast and reliable, but any database has its limits. For example, having too many tables or databases could negatively affect performance. To avoid that, Clickhouse Cloud has guardrails for several types of items.
7+
While ClickHouse is known for its speed and reliability, optimal performance is achieved within certain operating parameters. For example, having too many tables, databases or parts could negatively impact performance. To avoid this, Clickhouse Cloud has guardrails set up for several types of items. You can find details of these guardrails below.
108

119
:::tip
12-
If you've reached one of those limits, it may mean that you are implementing your use case in an unoptimized way. You can contact our support so we can help you refine your use case to avoid going through the limits or to increase the limits in a guided way.
10+
If you've run up against one of these guardrails, it's possible that you are implementing your use case in an unoptimized way. Contact our support team and we will gladly help you refine your use case to avoid exceeding the guardrails or look together at how we can increase them in a controlled manner.
1311
:::
1412

15-
# Partitions
16-
Clickhouse Cloud have a limit of **50000** [partitions](https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/custom-partitioning-key) per instance
17-
18-
# Parts
19-
Clickhouse Cloud have a limit of **100000** [parts](https://clickhouse.com/docs/en/operations/system-tables/parts) per instance
13+
- **Databases**: 1000
14+
- **Tables**: 5000-10k
15+
- **Columns**: ∼1000 (wide format is preferred to compact)
16+
- **Partitions**: 50k
17+
- **Parts**: 100k across the entire instance
18+
- **Part size**: 150gb
19+
- **Services**: 20 (soft)
20+
- **Low cardinality**: 10k or less
21+
- **Primary keys in a table**: 4-5 that sufficiently filter down the data
22+
- **Concurrency**: default 100, can be increased to 1000 per node
23+
- **Batch ingest**: anything > 1M will be split by the system in 1M row blocks
2024

2125
:::note
22-
For Single Replica Services, the maximum number of Databases is restricted to 100, and the maximum number of Tables is restricted to 500. In addition, Storage for Basic Tier Services is limited to 1 TB.
26+
For Single Replica Services, the maximum number of databases is restricted to 100, and the maximum number of tables is restricted to 500. In addition, storage for Basic Tier Services is limited to 1 TB.
2327
:::
2428

2529

docs/en/cloud/get-started/query-endpoints.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,8 @@ description: Easily spin up REST API endpoints from your saved queries
55
keywords: [api, query api endpoints, query endpoints, query rest api]
66
---
77

8-
import BetaBadge from '@theme/badges/BetaBadge';
9-
108
# Query API Endpoints
119

12-
<BetaBadge />
13-
1410
The **Query API Endpoints** feature allows you to create an API endpoint directly from any saved SQL query in the ClickHouse Cloud console. You'll be able to access API endpoints via HTTP to execute your saved queries without needing to connect to your ClickHouse Cloud service via a native driver.
1511

1612
## Quick-start Guide

docs/en/cloud/manage/backups/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Your service will be backed up based on the set schedule, whether it is the defa
3737

3838
## Understanding backup cost
3939

40-
ClickHouse Cloud includes two backups for free, but choosing a schedule that requires retaining more data, or causes more frequent backups can cause additional storage charges for backups. If you do not change the default settings, you will not incur any backup cost.
40+
Per the default policy, ClickHouse Cloud mandates a backup every day, with a 24 hour retention. Choosing a schedule that requires retaining more data, or causes more frequent backups can cause additional storage charges for backups.
4141

4242
To understand the backup cost, you can view the backup cost per service from the usage screen (as shown below). Once you have backups running for a few days with a customized schedule, you can get an idea of the cost and extrapolate to get the monthly cost for backups.
4343

docs/en/cloud/manage/scaling.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ However, these services can be scaled vertically by contacting support.
7373

7474
You can use ClickHouse Cloud [public APIs](https://clickhouse.com/docs/en/cloud/manage/api/swagger#/paths/~1v1~1organizations~1:organizationId~1services~1:serviceId~1scaling/patch) to scale your service by updating the scaling settings for the service or adjust the number of replicas from the cloud console.
7575

76-
A **Scale** or **Enterprise** ClickHouse service must have a minimum of `2` replicas.
76+
**Scale** and **Enterprise** tiers do support single-replica services. However, a service in these tiers that starts with multiple replicas, or scales out to multiples replicas can only be scaled back in to a minimum of `2` replicas.
7777

7878
:::note
7979
Services can scale horizontally to a maximum of 20 replicas. If you need additional replicas, please contact our support team.

0 commit comments

Comments
 (0)