Skip to content

Commit 6714b01

Browse files
authored
Merge branch 'main' into cloud-disaster-recovery
2 parents e87c78e + 4055410 commit 6714b01

File tree

28 files changed

+347
-104
lines changed

28 files changed

+347
-104
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Image from '@theme/IdealImage';
22
import cloud_service_action_menu from '@site/static/images/_snippets/cloud-service-actions-menu.png';
33

4-
Select your service, followed by `Data souces` -> `Predefined sample data`.
4+
Select your service, followed by `Data sources` -> `Predefined sample data`.
55

66
<Image size="md" img={cloud_service_action_menu} alt="ClickHouse Cloud service Actions menu showing Data sources and Predefined sample data options" border />

docs/best-practices/partitioning_keys.mdx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ For example, consider the following UK price paid dataset table with a partition
2323
```sql
2424
CREATE TABLE uk.uk_price_paid_simple_partitioned
2525
(
26-
date Date,
27-
town LowCardinality(String),
28-
street LowCardinality(String),
29-
price UInt32
26+
date Date,
27+
town LowCardinality(String),
28+
street LowCardinality(String),
29+
price UInt32
3030
)
3131
ENGINE = MergeTree
3232
ORDER BY (town, street)

docs/chdb/index.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ chDB has the following language bindings:
3737
## How do I get started? {#how-do-i-get-started}
3838

3939
* If you're using [Go](install/go.md), [Rust](install/rust.md), [NodeJS](install/nodejs.md), [Bun](install/bun.md) or [C and C++](install/c.md), take a look at the corresponding language pages.
40-
* If you're using Python, see the [getting started developer guide](getting-started.md). There are also guides showing how to do common tasks like:
40+
* If you're using Python, see the [getting started developer guide](getting-started.md) or the [chDB on-demand course](https://learn.clickhouse.com/user_catalog_class/show/1901178). There are also guides showing how to do common tasks like:
4141
* [JupySQL](guides/jupysql.md)
4242
* [Querying Pandas](guides/querying-pandas.md)
4343
* [Querying Apache Arrow](guides/querying-apache-arrow.md)
@@ -68,6 +68,7 @@ chDB delivers exceptional performance across different scenarios:
6868

6969
- Read the full story about the birth of the chDB project on [blog](https://clickhouse.com/blog/chdb-embedded-clickhouse-rocket-engine-on-a-bicycle)
7070
- Read about chDB and its use cases on the [Blog](https://clickhouse.com/blog/welcome-chdb-to-clickhouse)
71+
- Take the [chDB on-demand course](https://learn.clickhouse.com/user_catalog_class/show/1901178)
7172
- Discover chDB in your browser using [codapi examples](https://antonz.org/trying-chdb/)
7273
- More examples see (https://github.com/chdb-io/chdb/tree/main/examples)
7374

docs/cloud/features/04_infrastructure/byoc.md

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,7 @@ Contact support to schedule maintenance windows. Please expect a minimum of a we
357357
## Observability {#observability}
358358

359359
### Built-in monitoring tools {#built-in-monitoring-tools}
360+
ClickHouse BYOC provides several approaches for various use cases.
360361

361362
#### Observability dashboard {#observability-dashboard}
362363

@@ -378,8 +379,20 @@ You can customize a dashboard using metrics from system tables like `system.metr
378379

379380
<br />
380381

382+
#### Access the BYOC Prometheus stack {#prometheus-access}
383+
ClickHouse BYOC deploys a Prometheus stack on your Kubernetes cluster. You may access and scrape the metrics from there and integrate them with your own monitoring stack.
384+
385+
Contact ClickHouse support to enable the Private Load balancer and ask for the URL. Please note that this URL is only accessible via private network and does not support authentication
386+
387+
**Sample URL**
388+
```bash
389+
https://prometheus-internal.<subdomain>.<region>.aws.clickhouse-byoc.com/query
390+
```
391+
381392
#### Prometheus Integration {#prometheus-integration}
382393

394+
**DEPRECATED: ** Please use the Prometheus stack integration in the above section instead. Besides the ClickHouse Server metrics, it provides more metrics including the K8S metrics and metrics from other services.
395+
383396
ClickHouse Cloud provides a Prometheus endpoint that you can use to scrape metrics for monitoring. This allows for integration with tools like Grafana and Datadog for visualization.
384397

385398
**Sample request via https endpoint /metrics_all**
@@ -419,8 +432,22 @@ ClickHouse_CustomMetric_TotalNumberOfErrors{hostname="c-jet-ax-16-server-43d5baj
419432
A ClickHouse username and password pair can be used for authentication. We recommend creating a dedicated user with minimal permissions for scraping metrics. At minimum, a `READ` permission is required on the `system.custom_metrics` table across replicas. For example:
420433

421434
```sql
422-
GRANT REMOTE ON *.* TO scraping_user
423-
GRANT SELECT ON system.custom_metrics TO scraping_user
435+
GRANT REMOTE ON *.* TO scrapping_user;
436+
GRANT SELECT ON system._custom_metrics_dictionary_custom_metrics_tables TO scrapping_user;
437+
GRANT SELECT ON system._custom_metrics_dictionary_database_replicated_recovery_time TO scrapping_user;
438+
GRANT SELECT ON system._custom_metrics_dictionary_failed_mutations TO scrapping_user;
439+
GRANT SELECT ON system._custom_metrics_dictionary_group TO scrapping_user;
440+
GRANT SELECT ON system._custom_metrics_dictionary_shared_catalog_recovery_time TO scrapping_user;
441+
GRANT SELECT ON system._custom_metrics_dictionary_table_read_only_duration_seconds TO scrapping_user;
442+
GRANT SELECT ON system._custom_metrics_view_error_metrics TO scrapping_user;
443+
GRANT SELECT ON system._custom_metrics_view_histograms TO scrapping_user;
444+
GRANT SELECT ON system._custom_metrics_view_metrics_and_events TO scrapping_user;
445+
GRANT SELECT(description, metric, value) ON system.asynchronous_metrics TO scrapping_user;
446+
GRANT SELECT ON system.custom_metrics TO scrapping_user;
447+
GRANT SELECT(name, value) ON system.errors TO scrapping_user;
448+
GRANT SELECT(description, event, value) ON system.events TO scrapping_user;
449+
GRANT SELECT(description, labels, metric, value) ON system.histogram_metrics TO scrapping_user;
450+
GRANT SELECT(description, metric, value) ON system.metrics TO scrapping_user;
424451
```
425452

426453
**Configuring Prometheus**

docs/cloud/features/05_admin_features/upgrades.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ When you create a service, the [`compatibility`](/operations/settings/settings#c
3030

3131
The `compatibility` setting allows you to use default values of settings from previous versions. When your service is upgraded to a new version, the version specified for the `compatibility` setting does not change. This means that default values for settings that existed when you first created your service will not change (unless you have already overridden those default values, in which case they will persist after the upgrade).
3232

33-
You cannot manage the `compatibility` setting for your service. You must [contact support](https://clickhouse.com/support/program) if you would like to change the version set for your `compatibility` setting.
33+
You cannot manage the service-level default `compatibility` setting for your service. You must [contact support](https://clickhouse.com/support/program) if you would like to change the version set for your service's default `compatibility` setting. However, you can override the `compatibility` setting at the user, role, profile, query, or session level using standard ClickHouse setting mechanisms such as `SET compatibility = '22.3'` in a session or `SETTINGS compatibility = '22.3'` in a query.
3434

3535
## Maintenance mode {#maintenance-mode}
3636

docs/cloud/guides/security/cloud_access_management/saml-sso-setup.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ We recommend setting up a **direct link to your organization** in addition to yo
3939

4040
1. Sign in to your [ClickHouse Cloud](https://console.clickhouse.cloud) organization.
4141

42-
<Image img={samlOrgId} size="md" alt="Organization ID" />
42+
<Image img={samlOrgId} size="md" alt="Organization ID" force/>
4343
4444
3. In the lower left corner, click on your organization name under **Organization**.
4545

@@ -197,7 +197,7 @@ You will configure two App Integrations in Okta for each ClickHouse organization
197197

198198
12. On the **Sign On** tab for your new app, click the **View SAML setup instructions** button.
199199

200-
<Image img={samlOktaSetup} size="md" alt="Okta SAML Setup Instructions" />
200+
<Image img={samlOktaSetup} size="md" alt="Okta SAML Setup Instructions" force/>
201201

202202
13. Gather these three items and go to Submit a Support Case above to complete the process.
203203
- Identity Provider Single Sign-On URL
@@ -215,7 +215,7 @@ You will configure one SAML app in Google for each organization and must provide
215215

216216
1. Go to your Google Admin console (admin.google.com).
217217

218-
<Image img={samlGoogleApp} size="md" alt="Google SAML App" />
218+
<Image img={samlGoogleApp} size="md" alt="Google SAML App" force/>
219219

220220
2. Click **Apps**, then **Web and mobile apps** on the left.
221221

@@ -272,7 +272,7 @@ Azure (Microsoft) SAML may also be referred to as Azure Active Directory (AD) or
272272

273273
5. Enter a name and select **Integrate any other application you don't find in the gallery (Non-gallery)**, then click **Create**.
274274

275-
<Image img={samlAzureApp} size="md" alt="Azure Non-Gallery App" />
275+
<Image img={samlAzureApp} size="md" alt="Azure Non-Gallery App" force/>
276276

277277
6. Click **Users and groups** on the left and assign users.
278278

@@ -298,7 +298,7 @@ Azure (Microsoft) SAML may also be referred to as Azure Active Directory (AD) or
298298
| (A) email | Basic | user.mail |
299299
| (U) /identity/claims/name | Omitted | user.mail |
300300

301-
<Image img={samlAzureClaims} size="md" alt="Attributes and Claims" />
301+
<Image img={samlAzureClaims} size="md" alt="Attributes and Claims" force/>
302302

303303
12. Gather these two items and go to Submit a Support Case above to complete the process:
304304
- Login URL
@@ -366,4 +366,3 @@ Security is our top priority when it comes to authentication. For this reason, w
366366
- **All users assigned to your app via your IdP must have the same email domain.** If you have vendors, contractors or consultants you would like to have access to your ClickHouse account, they must have an email address with the same domain (e.g. user@domain.com) as your employees.
367367

368368
- **We do not automatically link SSO and non-SSO accounts.** You may see multiple accounts for your users in your ClickHouse user list even if they are using the same email address.
369-

docs/deployment-guides/replication-sharding-examples/01_1_shard_2_replicas.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ for i in {01..02}; do
6666
done
6767
```
6868

69-
Add the following `docker-compose.yml` file to the `clickhouse-cluster` directory:
69+
Add the following `docker-compose.yml` file to the `cluster_1S_2R` directory:
7070

7171
```yaml title="docker-compose.yml"
7272
version: '3.8'

docs/dictionary/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ LIMIT 5
208208
FORMAT PrettyCompactMonoBlock
209209

210210
┌───────Id─┬─Title─────────────────────────────────────────────────────────┬─Location──────────────┐
211-
52296928Comparision between two Strings in ClickHouse │ Spain │
211+
52296928Comparison between two Strings in ClickHouse │ Spain │
212212
52345137 │ How to use a file to migrate data from mysql to a clickhouse? │ 中国江苏省Nanjing Shi │
213213
61452077 │ How to change PARTITION in clickhouse │ Guangzhou, 广东省中国 │
214214
55608325 │ Clickhouse select last record without max() on all table │ Moscow, Russia │

docs/getting-started/example-datasets/dbpedia.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ LIMIT 20
116116
```
117117

118118
Note down the query latency so that we can compare it with the query latency of ANN (using vector index).
119-
Also record the query latency with cold OS file cache and with `max_theads=1` to recognize the real compute
119+
Also record the query latency with cold OS file cache and with `max_threads=1` to recognize the real compute
120120
usage and storage bandwidth usage (extrapolate it to a production dataset with millions of vectors!)
121121

122122
## Build a vector similarity index {#build-vector-similarity-index}

docs/getting-started/example-datasets/laion.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ data = data[['url', 'caption', 'NSFW', 'similarity', "image_embedding", "text_em
5353
data['image_embedding'] = data['image_embedding'].apply(lambda x: x.tolist())
5454
data['text_embedding'] = data['text_embedding'].apply(lambda x: x.tolist())
5555

56-
# this small hack is needed becase caption sometimes contains all kind of quotes
56+
# this small hack is needed because caption sometimes contains all kind of quotes
5757
data['caption'] = data['caption'].apply(lambda x: x.replace("'", " ").replace('"', " "))
5858

5959
# export data as CSV file
@@ -132,7 +132,7 @@ For now, we can run the embedding of a random LEGO set picture as `target`.
132132
10 rows in set. Elapsed: 4.605 sec. Processed 100.38 million rows, 309.98 GB (21.80 million rows/s., 67.31 GB/s.)
133133
```
134134

135-
## Run an approximate vector similarity search with a vector simialrity index {#run-an-approximate-vector-similarity-search-with-a-vector-similarity-index}
135+
## Run an approximate vector similarity search with a vector similarity index {#run-an-approximate-vector-similarity-search-with-a-vector-similarity-index}
136136

137137
Let's now define two vector similarity indexes on the table.
138138

0 commit comments

Comments
 (0)