Skip to content

Commit ad92b7b

Browse files
committed
Merge branch 'main' of https://github.com/ClickHouse/clickhouse-docs into otel-collector-advanced-config
2 parents 5de91b9 + 690b9c3 commit ad92b7b

File tree

17 files changed

+190
-31
lines changed

17 files changed

+190
-31
lines changed

.github/workflows/badges-notify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
steps:
1515
- name: Checkout repository
16-
uses: actions/checkout@v4
16+
uses: actions/checkout@v5
1717

1818
- name: Make script executable
1919
run: chmod +x scripts/badger.sh

.github/workflows/build-search.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020

2121
steps:
2222
- name: Checkout Repository
23-
uses: actions/checkout@v4
23+
uses: actions/checkout@v5
2424

2525
- name: Set up Node.js
26-
uses: actions/setup-node@v4
26+
uses: actions/setup-node@v6
2727
with:
2828
node-version: '20'
2929

.github/workflows/check-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
check_type: [spellcheck, kbcheck, md-lint, glossary-check]
2020
steps:
2121
# Add setup steps per check here
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v5
2323
- name: Install Aspell
2424
if: matrix.check_type == 'spellcheck'
2525
run: sudo apt-get update && sudo apt-get install -y aspell aspell-en
@@ -31,7 +31,7 @@ jobs:
3131
uv python install 3.12 --verbose
3232
- name: Setup md-lint environment
3333
if: matrix.check_type == 'md-lint'
34-
uses: actions/setup-node@v3
34+
uses: actions/setup-node@v6
3535
with:
3636
node-version: 20
3737
- name: Install markdownlint-cli2

.github/workflows/pull-request.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: Checkout repository
24-
uses: actions/checkout@v3
24+
uses: actions/checkout@v5
2525

2626
- name: Set up Node.js
27-
uses: actions/setup-node@v3
27+
uses: actions/setup-node@v6
2828
with:
2929
node-version: '20' # Adjust Node.js version as needed
3030
cache: 'yarn' # Cache yarn dependencies

.github/workflows/trademark-cla-approval.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ jobs:
170170
171171
- name: Check out repository
172172
if: success() && steps.process-comment.outputs.pr_number != ''
173-
uses: actions/checkout@v4
173+
uses: actions/checkout@v5
174174
with:
175175
fetch-depth: 0
176176
# For forked PRs, we need to fetch from the fork and checkout the SHA

.github/workflows/trademark-cla-notice.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
private-key: "${{ secrets.WORKFLOW_AUTH_PUBLIC_PRIVATE_KEY }}"
2626

2727
- name: Check out code
28-
uses: actions/checkout@v4
28+
uses: actions/checkout@v5
2929
with:
3030
fetch-depth: 0
3131
# Use the GitHub App token if available, otherwise fallback to GITHUB_TOKEN

.github/workflows/vale-linter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
timeout-minutes: 10
2121
steps:
2222
- name: Checkout repository
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v5
2424
with:
2525
fetch-depth: 0
2626
path: .

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,14 +181,14 @@ Best for: large scale, mission critical deployments that have stringent security
181181

182182
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.
183183

184-
### Where can I find legacy pricing? {#find-legacy-pricing}
185-
186-
Legacy pricing information can be found [here](https://clickhouse.com/pricing?legacy=true).
187-
188184
:::note
189185
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.
190186
:::
191187

188+
### Where can I find legacy pricing? {#find-legacy-pricing}
189+
190+
Legacy pricing information can be found [here](https://clickhouse.com/pricing?legacy=true).
191+
192192
### How is compute metered? {#how-is-compute-metered}
193193

194194
ClickHouse Cloud meters compute on a per-minute basis, in 8G RAM increments.

docs/cloud/reference/03_billing/index.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ This section of the documentation covers topics related to billing, and contains
1010

1111
| Page | Description |
1212
|---------------------------------------|----------------------------------------------------------------------|
13-
| [Overview](/cloud/marketplace/marketplace-billing) | Overview and FAQ pages for marketplace billing. |
13+
| [Overview](/cloud/manage/billing/overview) | Pricing examples and FAQs for billing. |
1414
| [Payment Thresholds](/cloud/billing/payment-thresholds) | Learn more about how payment thresholds work and how to adjust them. |
1515
| [Troubleshooting Billing Issues](/manage/clickhouse-cloud-billing-compliance) | Troubleshoot common billing issues. |
1616
| [Marketplace](/cloud/manage/marketplace/) | Landing page for further marketplace related topics. |
17+
18+
https://clickhouse.com/docs/cloud/

docs/integrations/data-ingestion/clickpipes/object-storage/02_reference.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,9 @@ https://datasets-documentation.s3.eu-west-3.amazonaws.com/http/{documents-01,doc
7575
## Continuous Ingest {#continuous-ingest}
7676
ClickPipes supports continuous ingestion from S3, GCS, Azure Blob Storage, and DigitalOcean Spaces. When enabled, ClickPipes continuously ingests data from the specified path, and polls for new files at a rate of once every 30 seconds. However, new files must be lexically greater than the last ingested file. This means that they must be named in a way that defines the ingestion order. For instance, files named `file1`, `file2`, `file3`, etc., will be ingested sequentially. If a new file is added with a name like `file0`, ClickPipes will not ingest it because it is not lexically greater than the last ingested file.
7777

78-
## Archive table {#archive-table}
79-
ClickPipes will create a table next to your destination table with the postfix `s3_clickpipe_<clickpipe_id>_archive`. This table will contain a list of all the files that have been ingested by the ClickPipe. This table is used to track files during ingestion and can be used to verify files have been ingested. The archive table has a [TTL](/engines/table-engines/mergetree-family/mergetree#table_engine-mergetree-ttl) of 7 days.
78+
## Tracking ingested files {#tracking-ingested-files}
8079

81-
:::note
82-
These tables will not be visible using ClickHouse Cloud SQL Console, you will need to connect via an external client either using HTTPS or Native connection to read them.
83-
:::
80+
To track which files have been ingested include the `_file` [virtual column](/sql-reference/table-functions/s3#virtual-columns) in the field mappings. The `_file` virtual column contains the filename of the source object, making it easy to query and identify which files have been processed.
8481

8582
## Authentication {#authentication}
8683

0 commit comments

Comments
 (0)