Skip to content

Commit 3af28b3

Browse files
authored
Merge branch 'main' into add-dataflow-docs
2 parents f41d9df + 595e274 commit 3af28b3

Some content is hidden

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

61 files changed

+1400
-8892
lines changed

.github/workflows/build-search.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ 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:
@@ -32,7 +31,7 @@ jobs:
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

.gitignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@ active_links.txt
3737
active_links.json
3838

3939
# Files used by scripts to autogenerate settings and do spellcheck
40-
FormatFactorySettingsDeclaration.h
41-
FormatFactorySettings.h
42-
Settings.cpp
40+
scripts/settings/tmp
4341

4442
# Files whose content gets autogenerated
4543
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/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/reference/byoc.md

Lines changed: 63 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -62,44 +62,88 @@ After creating the CloudFormation stack, you will be prompted to set up the infr
6262

6363
### Optional: Setup VPC Peering
6464

65-
To create or delete VPC peering for ClickHouse BYOC, submit a ticket with the following details:
65+
To create or delete VPC peering for ClickHouse BYOC, follow the steps:
6666

67-
- ClickHouse BYOC name for the VPC peering request.
68-
- VPC ID (`vpc-xxxxxx`) to peer with the BYOC VPC.
69-
- CIDR range of the VPC.
70-
- AWS account owning the peering VPC.
71-
- AWS region of the VPC.
67+
#### Step 1 Create a peering connection
68+
1. Navigate to the VPC Dashboard in ClickHouse BYOC account.
69+
2. Select Peering Connections.
70+
3. Click Create Peering Connection
71+
4. Set the VPC Requester to the ClickHouse VPC ID.
72+
5. Set the VPC Acceptor to the target VPC ID. (Select another account if applicable)
73+
6. Click Create Peering Connection.
7274

73-
Once the support ticket is received and processed, you will need to complete a few steps in your AWS account to finalize the peering setup:
75+
<br />
76+
77+
<img src={require('./images/byoc-vpcpeering-1.png').default}
78+
alt='BYOC Create Peering Connection'
79+
class='image'
80+
style={{width: '800px'}}
81+
/>
82+
83+
<br />
84+
85+
#### Step 2 Accept the peering connection request
86+
Go to the peering account, in the (VPC -> Peering connections -> Actions -> Accept request) page customer can approve this VPC peering request.
87+
88+
<br />
89+
90+
<img src={require('./images/byoc-vpcpeering-2.png').default}
91+
alt='BYOC Accept Peering Connection'
92+
class='image'
93+
style={{width: '800px'}}
94+
/>
7495

75-
1. Accept the VPC peering request in the AWS account of the peered VPC.
76-
- Navigate to **VPC -> Peering connections -> Actions -> Accept request**.
96+
<br />
7797

78-
2. Adjust the route table for the peered VPC:
79-
- Locate the subnet in the peered VPC that needs to connect to the ClickHouse instance.
80-
- Edit the subnet's route table and add a route with the following configuration:
81-
- **Destination**: ClickHouse BYOC VPC CIDR (e.g., `10.0.0.0/16`)
82-
- **Target**: Peering Connection (`pcx-12345678`, the actual ID will appear in the dropdown list)
98+
#### Step 3 Add destination to ClickHouse VPC route tables
99+
In ClickHouse BYOC account,
100+
1. Select Route Tables in the VPC Dashboard.
101+
2. Search for the ClickHouse VPC ID. Edit each route table attached to the private subnets.
102+
3. Click the Edit button under the Routes tab.
103+
4. Click Add another route.
104+
5. Enter the CIDR range of the target VPC for the Destination.
105+
6. Select “Peering Connection” and the ID of the peering connection for the Target.
83106

84107
<br />
85108

86-
<img src={require('./images/byoc-2.png').default}
87-
alt='BYOC network configuration'
109+
<img src={require('./images/byoc-vpcpeering-3.png').default}
110+
alt='BYOC Add route table'
88111
class='image'
89-
style={{width: '600px'}}
112+
style={{width: '800px'}}
90113
/>
91114

92115
<br />
93116

94-
3. Check existing security groups and ensure no rules block access to the BYOC VPC.
117+
#### Step 4 Add destination to the target VPC route tables
118+
In the peering AWS account,
119+
1. Select Route Tables in the VPC Dashboard.
120+
2. Search for the target VPC ID.
121+
3. Click the Edit button under the Routes tab.
122+
4. Click Add another route.
123+
5. Enter the CIDR range of the ClickHouse VPC for the Destination.
124+
6. Select “Peering Connection” and the ID of the peering connection for the Target.
95125

126+
<br />
127+
128+
<img src={require('./images/byoc-vpcpeering-4.png').default}
129+
alt='BYOC Add route table'
130+
class='image'
131+
style={{width: '800px'}}
132+
/>
133+
134+
<br />
135+
136+
#### Step 5 Enable Private Load Balancer for ClickHouse BYOC
137+
Contact ClickHouse support to enable Private Load Balancer.
138+
139+
---
96140
The ClickHouse service should now be accessible from the peered VPC.
97141

98142
To access ClickHouse privately, a private load balancer and endpoint are provisioned for secure connectivity from the user's peered VPC. The private endpoint follows the public endpoint format with a `-private` suffix. For example:
99143
- **Public endpoint**: `h5ju65kv87.mhp0y4dmph.us-west-2.aws.byoc.clickhouse.cloud`
100144
- **Private endpoint**: `h5ju65kv87-private.mhp0y4dmph.us-west-2.aws.byoc.clickhouse.cloud`
101145

102-
4. (Optional) After verifying that peering is working, you can request the removal of the public load balancer for ClickHouse BYOC.
146+
Optional, after verifying that peering is working, you can request the removal of the public load balancer for ClickHouse BYOC.
103147

104148
## Upgrade Process
105149

-59.8 KB
Binary file not shown.
183 KB
Loading
50.3 KB
Loading
23.2 KB
Loading

0 commit comments

Comments
 (0)