Skip to content

Commit f19e500

Browse files
authored
Merge branch 'main' into add_query_condition_cache_to_sidebar
2 parents 8d5c245 + eec5b08 commit f19e500

File tree

9 files changed

+40
-18
lines changed

9 files changed

+40
-18
lines changed

.github/workflows/build-search.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
node-version: '20'
2929

3030
- name: Run Prep from Master
31-
run: yarn copy-clickhouse-repo-docs
31+
run: yarn copy-clickhouse-repo-docs -f
3232

3333
- name: Run Auto Generate Settings
3434
run: yarn autogenerate-settings

docs/cloud/manage/billing/payment-thresholds.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ This payment threshold does not apply to customers who have a committed spend co
1616

1717
If your organization reaches 90% of the payment threshold and is on-track to exceed the payment threshold mid-period, the billing email associated with the organization will receive an email notification. You will also receive an email notification as well as an invoice when you exceed the payment threshold.
1818

19-
These payment thresholds can be adjusted. If you have any questions, please contact [email protected] for more details.
19+
These payment thresholds can be adjusted below $10,000 as requested by customers or by the ClickHouse Finance team. If you have any questions, please contact [email protected] for more details.

docs/cloud/manage/notifications.md

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,36 +19,30 @@ ClickHouse Cloud sends notifications about critical events related to your servi
1919

2020
## Receiving Notifications {#receiving-notifications}
2121

22-
Notifications can be received via various channels. For now, ClickHouse Cloud supports receiving notifications through email and ClickHouse Cloud UI. You can click on the bell icon in the top left menu to view current notifications, which opens a flyout. Clicking the button **View All** the bottom of the flyout will take you to a page that shows an activity log of all notifications.
23-
24-
<br />
22+
Notifications can be received via various channels. For now, ClickHouse Cloud supports receiving notifications through email, ClickHouse Cloud UI, and Slack. You can click on the bell icon in the top left menu to view current notifications, which opens a flyout. Clicking the button **View All** the bottom of the flyout will take you to a page that shows an activity log of all notifications.
2523

2624
<Image img={notifications_1} size="md" alt="ClickHouse Cloud notifications flyout" border/>
2725

28-
<br />
2926

3027
<Image img={notifications_2} size="md" alt="ClickHouse Cloud notifications activity log" border/>
3128

29+
3230
## Customizing Notifications {#customizing-notifications}
3331

3432
For each notification, you can customize how you receive the notification. You can access the settings screen from the notifications flyout or from the second tab on the notifications activity log.
3533

36-
To configure delivery for a specific notification, click on the pencil icon to modify the notification delivery channels.
34+
Cloud users can customize notifications delivered via the Cloud UI, and these customizations are reflected for each individual user. Cloud users can also customize notifications delivered to their own emails, but only users with admin permissions can customize notifications delivered to custom emails and notifications delivered to Slack channels.
3735

38-
<br />
36+
To configure delivery for a specific notification, click on the pencil icon to modify the notification delivery channels.
3937

4038
<Image img={notifications_3} size="md" alt="ClickHouse Cloud notifications settings screen" border/>
4139

42-
<br />
43-
4440
<Image img={notifications_4} size="md" alt="ClickHouse Cloud notification delivery settings" border/>
4541

46-
<br />
47-
4842
:::note
4943
Certain **required** notifications such as **Payment failed** are not configurable.
5044
:::
5145

5246
## Supported Notifications {#supported-notifications}
5347

54-
Currently, we send out notifications related to billing (payment failure, usage exceeded ascertain threshold, etc.) as well as notifications related to scaling events (scaling completed, scaling blocked etc.). In future, we will add notifications for backups, ClickPipes, and other relevant categories.
48+
Currently, we send out notifications related to billing (payment failure, usage exceeded ascertain threshold, etc.) as well as notifications related to scaling events (scaling completed, scaling blocked etc.).

docs/cloud/reference/warehouses.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,8 @@ settings distributed_ddl_task_timeout=0
140140

141141
6. **In very rare cases, secondary services that are idled or stopped for a long time (days) without waking/starting up can cause performance degradation to other services in the same warehouse.** This issue will be resolved soon and is connected to mutations running in the background. If you think you are experiencing this issue, please contact ClickHouse [Support](https://clickhouse.com/support/program).
142142

143+
7. **Currently there is a soft limit of 5 services per warehouse.** Contact the support team if you need more than 5 services in a single warehouse.
144+
143145

144146
## Pricing {#pricing}
145147

docs/whats-new/security-changelog.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,18 @@ description: 'Security changelog detailing security related updates and changes'
88

99
# Security Changelog
1010

11+
## Fixed in ClickHouse v25.1.5.5, 2025-01-05 {#fixed-in-clickhouse-release-2025-01-05}
12+
13+
### [CVE-2025-1385](https://github.com/ClickHouse/ClickHouse/security/advisories/GHSA-5phv-x8x4-83x5) {#CVE-2025-1385}
14+
15+
When the library bridge feature is enabled, the clickhouse-library-bridge exposes an HTTP API on localhost. This allows clickhouse-server to dynamically load a library from a specified path and execute it in an isolated process. Combined with the ClickHouse table engine functionality that permits file uploads to specific directories, a misconfigured server can be exploited by an attacker with privileges to access both table engines, allowing them to execute arbitrary code on the ClickHouse server.
16+
17+
Fix has been pushed to the following open-source versions: v24.3.18.6, v24.8.14.27, v24.11.5.34, v24.12.5.65, v25.1.5.5
18+
19+
ClickHouse Cloud is unaffected by this vulnerability.
20+
21+
Credits: [Arseniy Dugin](https://github.com/ZerLes)
22+
1123
## Fixed in ClickHouse v24.5, 2024-08-01 {#fixed-in-clickhouse-release-2024-08-01}
1224

1325
### [CVE-2024-6873](https://github.com/ClickHouse/ClickHouse/security/advisories/GHSA-432f-r822-j66f) {#CVE-2024-6873}

plugins/floating-pages-exceptions.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@
99
/docs/index.md
1010
integrations/language-clients/java/client-v1
1111
integrations/language-clients/java/jdbc-v1
12+
operations/userspace-page-cache

scripts/copy-clickhouse-repo-docs.sh

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,32 @@
11
#!/bin/bash
22

33
function parse_args() {
4+
force_pull=false
45

5-
while getopts "hl:" opt; do
6+
while getopts "hl:f" opt; do
67
case "$opt" in
78
h)
89
# Display the usage information and exit when -h is provided
9-
echo "Usage: $0 [-l path_to_local_clickhouse_repo]"
10+
echo "Usage: $0 [-l path_to_local_clickhouse_repo] [-f]"
1011
echo ""
1112
echo "Options:"
1213
echo " -l Path to a local copy of the ClickHouse repository."
14+
echo " -f Force pull from GitHub even in CI environment."
1315
echo " -h Display this help message."
1416
exit 0
1517
;;
1618
l)
1719
local_path="$OPTARG"
1820
;;
21+
f)
22+
force_pull=true
23+
;;
1924
\?)
2025
echo "Invalid option: -$OPTARG" >&2
2126
exit 1
2227
;;
2328
esac
2429
done
25-
26-
echo "$local_path"
2730
}
2831

2932
# Copy files/folders using rsync (or fallback to cp)
@@ -100,10 +103,14 @@ main() {
100103

101104
if [[ -z "$local_path" ]]; then
102105

103-
if [[ "$CI" == "true" ]]; then
106+
# Check if in CI environment and force_pull is not set
107+
if [[ "$CI" == "true" && "$force_pull" == "false" ]]; then
104108
echo "CI environment detected, expecting /ClickHouse without having to pull the repo"
105109
copy_docs_locally "/ClickHouse"
106110
else
111+
if [[ "$force_pull" == "true" && "$CI" == "true" ]]; then
112+
echo "Force pull enabled, ignoring CI environment and pulling from GitHub"
113+
fi
107114
git clone --depth 1 --branch master https://github.com/ClickHouse/ClickHouse
108115
# Copy docs from cloned repository
109116
copy_docs_locally "$(pwd)/ClickHouse"

sidebars.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1110,6 +1110,7 @@ const sidebars = {
11101110
"operations/optimizing-performance/sampling-query-profiler",
11111111
"operations/query-cache",
11121112
"operations/query-condition-cache",
1113+
"operations/userspace-page-cache",
11131114
"operations/performance-test",
11141115
]
11151116
}

vercel.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3231,6 +3231,11 @@
32313231
"destination": "/docs/sql-reference/data-types/float#bfloat16",
32323232
"permanent": true
32333233
},
3234+
{
3235+
"source": "/docs/introduction/distinctive-features",
3236+
"destination": "/docs/about-us/distinctive-features",
3237+
"permanent": true
3238+
},
32343239
{
32353240
"source": "/docs/en/:path*",
32363241
"destination": "/docs/:path*"

0 commit comments

Comments
 (0)