Skip to content

Commit e47002d

Browse files
committed
Merge branch 'main' of https://github.com/ClickHouse/clickhouse-docs into exclude_ga_tag_vercel
2 parents dcae3cf + affe771 commit e47002d

File tree

5 files changed

+54
-63
lines changed

5 files changed

+54
-63
lines changed

docs/cloud/reference/03_billing/01_billing_overview.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,10 @@ Best for: large scale, mission critical deployments that have stringent security
180180

181181
A ClickHouse Credit is a unit of credit toward Customer's usage of ClickHouse Cloud equal to one (1) US dollar, to be applied based on ClickHouse's then-current published price list.
182182

183+
### Where can I find legacy pricing? {#find-legacy-pricing}
184+
185+
Legacy pricing information can be found [here](https://clickhouse.com/pricing?legacy=true).
186+
183187
:::note
184188
If you are being billed through Stripe then you will see that 1 CHC is equal to \$0.01 USD on your Stripe invoice. This is to allow accurate billing on Stripe due to their limitation on not being able to bill fractional quantities of our standard SKU of 1 CHC = \$1 USD.
185189
:::

docs/integrations/data-ingestion/clickpipes/secure-kinesis.md

Lines changed: 46 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ sidebar_label: 'Kinesis Role-Based Access'
44
title: 'Kinesis Role-Based Access'
55
description: 'This article demonstrates how ClickPipes customers can leverage role-based access to authenticate with Amazon Kinesis and access their data streams securely.'
66
doc_type: 'guide'
7+
keywords: ['Amazon Kinesis']
78
---
89

910
import secure_kinesis from '@site/static/images/integrations/data-ingestion/clickpipes/securekinesis.jpg';
@@ -12,6 +13,12 @@ import Image from '@theme/IdealImage';
1213

1314
This article demonstrates how ClickPipes customers can leverage role-based access to authenticate with Amazon Kinesis and access their data streams securely.
1415

16+
## Prerequisites {#prerequisite}
17+
18+
To follow this guide, you will need:
19+
- An active ClickHouse Cloud service
20+
- An AWS account
21+
1522
## Introduction {#introduction}
1623

1724
Before diving into the setup for secure Kinesis access, it's important to understand the mechanism. Here's an overview of how ClickPipes can access Amazon Kinesis streams by assuming a role within customers' AWS accounts.
@@ -22,92 +29,70 @@ Using this approach, customers can manage all access to their Kinesis data strea
2229

2330
## Setup {#setup}
2431

25-
### Obtaining the ClickHouse service IAM role Arn {#obtaining-the-clickhouse-service-iam-role-arn}
26-
27-
1 - Login to your ClickHouse cloud account.
32+
<VerticalStepper headerLevel="h3"/>
2833

29-
2 - Select the ClickHouse service you want to create the integration
30-
31-
3 - Select the **Settings** tab
32-
33-
4 - Scroll down to the **Network security information** section at the bottom of the page
34+
### Obtaining the ClickHouse service IAM role Arn {#obtaining-the-clickhouse-service-iam-role-arn}
3435

35-
5 - Copy the **Service role ID (IAM)** value belong to the service as shown below.
36+
- 1. Login to your ClickHouse cloud account.
37+
- 2. Select the ClickHouse service you want to create the integration
38+
- 3. Select the **Settings** tab
39+
- 4. Scroll down to the **Network security information** section at the bottom of the page
40+
- 5. Copy the **Service role ID (IAM)** value belong to the service as shown below.
3641

3742
<Image img={secures3_arn} alt="Secure S3 ARN" size="lg" border/>
3843

3944
### Setting up IAM assume role {#setting-up-iam-assume-role}
4045

4146
#### Manually create IAM role. {#manually-create-iam-role}
4247

43-
1 - Login to your AWS Account in the web browser with an IAM user that has permission to create & manage IAM role.
44-
45-
2 - Browse to IAM Service Console
48+
- 1. Login to your AWS Account in the web browser with an IAM user that has permission to create & manage IAM role.
49+
- 2. Browse to IAM Service Console
50+
- 3. Create a new IAM role with Trusted Entity Type of `AWS account`. Note that the name of the IAM role **must start with** `ClickHouseAccessRole-` for this to work.
4651

47-
3 - Create a new IAM role with the following IAM & Trust policy. Note that the name of the IAM role **must start with** `ClickHouseAccessRole-` for this to work.
48-
49-
Trust policy (Please replace `{ClickHouse_IAM_ARN}` with the IAM Role arn belong to your ClickHouse instance):
52+
For the trust policy, please replace `{ClickHouse_IAM_ARN}` with the IAM Role arn belong to your ClickHouse instance.
53+
For the IAM policy, please replace `{STREAM_NAME}` with your Kinesis stream name.
5054

5155
```json
5256
{
5357
"Version": "2012-10-17",
5458
"Statement": [
5559
{
60+
"Sid": "Statement1",
5661
"Effect": "Allow",
5762
"Principal": {
5863
"AWS": "{ClickHouse_IAM_ARN}"
5964
},
6065
"Action": "sts:AssumeRole"
66+
},
67+
{
68+
"Action": [
69+
"kinesis:DescribeStream",
70+
"kinesis:GetShardIterator",
71+
"kinesis:GetRecords",
72+
"kinesis:ListShards",
73+
"kinesis:SubscribeToShard",
74+
"kinesis:DescribeStreamConsumer",
75+
"kinesis:RegisterStreamConsumer",
76+
"kinesis:DeregisterStreamConsumer",
77+
"kinesis:ListStreamConsumers"
78+
],
79+
"Resource": [
80+
"arn:aws:kinesis:region:account-id:stream/{STREAM_NAME}/*"
81+
],
82+
"Effect": "Allow"
83+
},
84+
{
85+
"Action": [
86+
"kinesis:ListStreams"
87+
],
88+
"Resource": "*",
89+
"Effect": "Allow"
6190
}
6291
]
6392
}
64-
```
6593

66-
IAM policy (Please replace `{STREAM_NAME}` with your Kinesis stream name):
94+
</VerticalStepper>
6795

68-
```json
69-
{
70-
"Version": "2012-10-17",
71-
"Statement": [
72-
{
73-
"Action": [
74-
"kinesis:DescribeStream",
75-
"kinesis:GetShardIterator",
76-
"kinesis:GetRecords",
77-
"kinesis:ListShards",
78-
"kinesis:SubscribeToShard",
79-
"kinesis:DescribeStreamConsumer",
80-
"kinesis:RegisterStreamConsumer",
81-
"kinesis:DeregisterStreamConsumer",
82-
"kinesis:ListStreamConsumers"
83-
],
84-
"Resource": [
85-
"arn:aws:kinesis:region:account-id:stream/{STREAM_NAME}"
86-
],
87-
"Effect": "Allow"
88-
},
89-
{
90-
"Action": [
91-
"kinesis:SubscribeToShard",
92-
"kinesis:DescribeStreamConsumer",
93-
"kinesis:RegisterStreamConsumer",
94-
"kinesis:DeregisterStreamConsumer"
95-
],
96-
"Resource": [
97-
"arn:aws:kinesis:region:account-id:stream/{STREAM_NAME}/*"
98-
],
99-
"Effect": "Allow"
100-
},
101-
{
102-
"Action": [
103-
"kinesis:ListStreams"
104-
],
105-
"Resource": "*",
106-
"Effect": "Allow"
107-
}
108-
]
109-
110-
}
11196
```
11297

113-
4 - Copy the new **IAM Role Arn** after creation. This is what needed to access your Kinesis stream.
98+
- 4. Copy the new **IAM Role Arn** after creation. This is what is needed to access your Kinesis stream.

docs/integrations/sql-clients/dbvisualizer.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ To connect a database with DbVisualizer, you must first create and setup a Datab
5050
8. If the result from Ping Server shows that the server can be reached, click **Connect** to connect to the database server.
5151

5252
:::tip
53-
See [Fixing Connection Issues](https://confluence.dbvis.com/display/UG231/Fixing+Connection+Issues) for some tips if you have problems connecting to the database.
53+
See [Fixing Connection Issues](https://www.dbvis.com/docs/ug/troubleshooting/fixing-connection-issues/) for some tips if you have problems connecting to the database.
5454

5555
## Learn more {#learn-more}
5656

57-
Find more information about DbVisualizer visit the [DbVisualizer documentation](https://confluence.dbvis.com/display/UG231/Users+Guide).
57+
Find more information about DbVisualizer visit the [DbVisualizer documentation](https://www.dbvis.com/docs/ug/).

scripts/sed_links.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
1515
sed -i '' 's|(/sql-reference/statements/select#replace)|(/sql-reference/statements/select)|g' docs/guides/developer/dynamic-column-selection.md
1616
sed -i '' 's|(/sql-reference/statements/select#except)|(/sql-reference/statements/select)|g' docs/guides/developer/dynamic-column-selection.md
1717
sed -i '' 's|(/cloud/reference/cloud-compatibility.md)|(/whats-new/cloud-compatibility)|g' docs/sql-reference/dictionaries/_snippet_dictionary_in_cloud.md
18+
sed -i '' 's|<auxiliary_zookeepers>|`<auxiliary_zookeepers>`|g' docs/operations/server-configuration-parameters/settings.md
1819
else
1920
# Linux
2021
sed -i 's|(../../quick-start\.mdx)|(/get-started/quick-start)|g' docs/operations/utilities/clickhouse-local.md
@@ -23,4 +24,5 @@ else
2324
sed -i 's|(/sql-reference/statements/select#replace)|(/sql-reference/statements/select)|g' docs/guides/developer/dynamic-column-selection.md
2425
sed -i 's|(/sql-reference/statements/select#except)|(/sql-reference/statements/select)|g' docs/guides/developer/dynamic-column-selection.md
2526
sed -i 's|(/cloud/reference/cloud-compatibility.md)|(/whats-new/cloud-compatibility)|g' docs/sql-reference/dictionaries/_snippet_dictionary_in_cloud.md
27+
sed -i 's|<auxiliary_zookeepers>|`<auxiliary_zookeepers>`|g' docs/operations/server-configuration-parameters/settings.md
2628
fi
83.8 KB
Loading

0 commit comments

Comments
 (0)