Skip to content

Commit f9f10a1

Browse files
BlargianBlargian
authored
Merge branch 'ClickHouse:main' into changelog_june27
2 parents 8acebf6 + 2f990c6 commit f9f10a1

File tree

23 files changed

+121
-203
lines changed

23 files changed

+121
-203
lines changed

‎docs/cloud/manage/upgrades.md

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,16 @@ You will not be charged for the time that the service is under maintenance. _Mai
3939

4040
## Release channels (upgrade schedule) {#release-channels-upgrade-schedule}
4141

42-
You are able to specify the upgrade schedule for your ClickHouse Cloud service by subscribing to a specific release channel.
42+
Users are able to specify the upgrade schedule for their ClickHouse Cloud service by subscribing to a specific release channel. There are three release channels, and the user has the ability to configure the day and time of the week for upgrades with the **scheduled upgrades** feature.
43+
44+
The three release channels are:
45+
- The [**fast release channel**](#fast-release-channel-early-upgrades) for early access to upgrades.
46+
- The [**regular release channel**](#regular-release-channel) is the default, and upgrades on this channel start two weeks after the fast release channel upgrades. If your service on the Scale and Enterprise tier does not have a release channel set, it is on the regular release channel by default.
47+
- The [**slow release channel**](#slow-release-channel-deferred-upgrades) is for deferred release. Upgrades on this channel occur two weeks after the regular release channel upgrades.
48+
49+
:::note
50+
Basic tier services are automatically enlisted to the fast release channel
51+
:::
4352

4453
### Fast release channel (early upgrades) {#fast-release-channel-early-upgrades}
4554

@@ -76,6 +85,18 @@ Upgrades to the regular release channel are typically performed two weeks after
7685
Basic tier services are upgraded soon after the Fast release channel.
7786
:::
7887

88+
### Slow release channel (deferred upgrades) {#slow-release-channel-deferred-upgrades}
89+
90+
<EnterprisePlanFeatureBadge feature="The slow release channel"/>
91+
92+
We offer a **Slow release** channel if you would like your services to receive upgrades after the regular release schedule.
93+
94+
Specifically, services will:
95+
96+
- Be upgraded after the Fast and Regular release channels roll-outs are complete
97+
- Receive ClickHouse releases ~ 2 weeks after the regular release
98+
- Be meant for customers that want additional time to test ClickHouse releases on their non-production environments before the production upgrade. Non-production environments can either get upgrades on the Fast or the Regular release channel for testing and validation.
99+
79100
## Scheduled upgrades {#scheduled-upgrades}
80101

81102
<EnterprisePlanFeatureBadge feature="Scheduled upgrades" linking_verb_are="true"/>

‎docs/deployment-guides/parallel-replicas.mdx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,7 @@ the label `comp-parallel-replicas`.
312312
| Complex queries | Currently parallel replica works fairly well for simple queries. Complexity layers like CTEs, subqueries, JOINs, non-flat query, etc. can have a negative impact on query performance. |
313313
| Small queries | If you are executing a query that does not process a lot of rows, executing it on multiple replicas might not yield a better performance time given that the network time for the coordination between replicas can lead to additional cycles in the query execution. You can limit these issues by using the setting: [`parallel_replicas_min_number_of_rows_per_replica`](/docs/operations/settings/settings#parallel_replicas_min_number_of_rows_per_replica). |
314314
| Parallel replicas are disabled with FINAL | |
315+
| Projections are not used together with Parallel replicas | |
315316
| High Cardinality data and complex aggregation | High cardinality aggregation that needs to send much data can significantly slow down your queries. |
316317
| Compatibility with the new analyzer | The new analyzer might significantly slow down or speed up query execution in specific scenarios. |
317318

@@ -504,4 +505,4 @@ SETTINGS allow_experimental_parallel_reading_from_replicas=2
504505
FORMAT TSV;
505506
```
506507

507-
<Image img={image_9} size="lg" alt="EXPLAIN with parallel_replica"/>
508+
<Image img={image_9} size="lg" alt="EXPLAIN with parallel_replica"/>

‎docs/guides/sre/keeper/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ The main ClickHouse Keeper configuration tag is `<keeper_server>` and has the fo
5252
| `create_snapshot_on_exit` | Create a snapshot during shutdown | - |
5353
| `hostname_checks_enabled` | Enable sanity hostname checks for cluster configuration (e.g. if localhost is used with remote endpoints) | `True` |
5454
| `four_letter_word_white_list` | White list of 4lw commands. | `conf, cons, crst, envi, ruok, srst, srvr, stat, wchs, dirs, mntr, isro, rcvr, apiv, csnp, lgif, rqld, ydld` |
55-
55+
|`enable_ipv6`| Enable IPv6 | `True`|
5656

5757
Other common parameters are inherited from the ClickHouse server config (`listen_host`, `logger`, and so on).
5858

‎docs/integrations/data-ingestion/clickpipes/aws-privatelink.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -236,13 +236,10 @@ You can manage existing reverse private endpoints in the ClickHouse Cloud servic
236236

237237
## Supported AWS regions {#aws-privatelink-regions}
238238

239-
The following AWS regions are supported for AWS PrivateLink:
239+
AWS PrivateLink support is limited to specific AWS regions for ClickPipes.
240+
Please refer to the [ClickPipes regions list](/integrations/clickpipes#list-of-static-ips) to see the available regions.
240241

241-
- `us-east-1` - for ClickHouse services running in `us-east-1` region
242-
- `eu-central-1` for ClickHouse services running in EU regions
243-
- `us-east-2` - for ClickHouse services running everywhere else
244-
245-
This restriction does not apply to PrivateLink VPC endpoint service type since it supports cross-region connectivity.
242+
This restriction does not apply to PrivateLink VPC endpoint service with a cross-region connectivity enabled.
246243

247244
## Limitations {#limitations}
248245

‎docs/integrations/data-ingestion/clickpipes/index.md

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,24 @@ More connectors will get added to ClickPipes, you can find out more by [contacti
5454

5555
## List of Static IPs {#list-of-static-ips}
5656

57-
The following are the static NAT IPs (separated by region) that ClickPipes uses to connect to your external services.
58-
Add your related instance region IPs to your IP allow list to allow traffic.
59-
If your instance region is not listed here, it will fall to the default region:
60-
61-
- **eu-central-1** for EU regions
62-
- **us-east-1** for instances in `us-east-1`
63-
- **us-east-2** for other all regions
64-
65-
| ClickHouse Cloud region | IP Addresses |
66-
|-------------------------|--------------|
67-
| **eu-central-1** | `18.195.233.217`, `3.127.86.90`, `35.157.23.2`, `18.197.167.47`, `3.122.25.29`, `52.28.148.40` |
68-
| **us-east-2** | `3.131.130.196`, `3.23.172.68`, `3.20.208.150`, `3.132.20.192`, `18.119.76.110`, `3.134.185.180` |
69-
| **us-east-1** | `54.82.38.199`, `3.90.133.29`, `52.5.177.8`, `3.227.227.145`, `3.216.6.184`, `54.84.202.92`, `3.131.130.196`, `3.23.172.68`, `3.20.208.150` |
57+
The following are the static NAT IPs (separated by region) that ClickPipes uses to connect to your external services. Add your related instance region IPs to your IP allow list to allow traffic.
58+
59+
For all services, ClickPipes traffic will originate from a default region based on your service's location:
60+
- **eu-central-1**: For all services in EU regions. (this includes GCP and Azure EU regions)
61+
- **us-east-1**: For all services in AWS `us-east-1`.
62+
- **ap-south-1**: For services in AWS `ap-south-1` created on or after 25 Jun 2025 (services created before this date use `us-east-2` IPs).
63+
- **ap-southeast-2**: For services in AWS `ap-southeast-2` created on or after 25 Jun 2025 (services created before this date use `us-east-2` IPs).
64+
- **us-west-2**: For services in AWS `us-west-2` created on or after 24 Jun 2025 (services created before this date use `us-east-2` IPs).
65+
- **us-east-2**: For all other regions not explicitly listed. (this includes GCP and Azure US regions)
66+
67+
| AWS region | IP Addresses |
68+
|---------------------------------------| ------------------------------------------------------------------------------------------------------------------------------------------------ |
69+
| **eu-central-1** | `18.195.233.217`, `3.127.86.90`, `35.157.23.2`, `18.197.167.47`, `3.122.25.29`, `52.28.148.40` |
70+
| **us-east-1** | `54.82.38.199`, `3.90.133.29`, `52.5.177.8`, `3.227.227.145`, `3.216.6.184`, `54.84.202.92`, `3.131.130.196`, `3.23.172.68`, `3.20.208.150` |
71+
| **us-east-2** | `3.131.130.196`, `3.23.172.68`, `3.20.208.150`, `3.132.20.192`, `18.119.76.110`, `3.134.185.180` |
72+
| **ap-south-1** (from 25 Jun 2025) | `13.203.140.189`, `13.232.213.12`, `13.235.145.208`, `35.154.167.40`, `65.0.39.245`, `65.1.225.89` |
73+
| **ap-southeast-2** (from 25 Jun 2025) | `3.106.48.103`, `52.62.168.142`, `13.55.113.162`, `3.24.61.148`, `54.206.77.184`, `54.79.253.17` |
74+
| **us-west-2** (from 24 Jun 2025) | `52.42.100.5`, `44.242.47.162`, `52.40.44.52`, `44.227.206.163`, `44.246.241.23`, `35.83.230.19` |
7075

7176
## Adjusting ClickHouse settings {#adjusting-clickhouse-settings}
7277
ClickHouse Cloud provides sensible defaults for most of the use cases. However, if you need to adjust some ClickHouse settings for the ClickPipes destination tables, a dedicated role for ClickPipes is the most flexible solution.

‎docs/integrations/data-ingestion/google-dataflow/templates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Google Dataflow templates provide a convenient way to execute prebuilt, ready-to
2222

2323
## How to Run Dataflow Templates {#how-to-run-dataflow-templates}
2424

25-
As of today, the ClickHouse official template is available via the Google Cloud CLI or Dataflow REST API.
25+
As of today, the ClickHouse official template is available via the Google Cloud Console, CLI or Dataflow REST API.
2626
For detailed step-by-step instructions, refer to the [Google Dataflow Run Pipeline From a Template Guide](https://cloud.google.com/dataflow/docs/templates/provided-templates).
2727

2828

0 commit comments

Comments
 (0)