Skip to content

Commit c2b69f1

Browse files
committed
Merge branch 'main' of https://github.com/ClickHouse/clickhouse-docs into demo_days_clickstack_v2
2 parents 35aacbb + 5e80165 commit c2b69f1

104 files changed

Lines changed: 16643 additions & 9196 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/badges-notify.yml

Lines changed: 0 additions & 57 deletions
This file was deleted.

docs/about-us/beta-and-experimental-features.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -72,24 +72,6 @@ Please note: no additional experimental features are allowed to be enabled in Cl
7272

7373
| Name | Default |
7474
|------|--------|
75-
| [allow_commit_order_projection](/operations/settings/merge-tree-settings#allow_commit_order_projection) | `0` |
76-
| [allow_experimental_replacing_merge_with_cleanup](/operations/settings/merge-tree-settings#allow_experimental_replacing_merge_with_cleanup) | `0` |
77-
| [allow_experimental_reverse_key](/operations/settings/merge-tree-settings#allow_experimental_reverse_key) | `0` |
78-
| [allow_remote_fs_zero_copy_replication](/operations/settings/merge-tree-settings#allow_remote_fs_zero_copy_replication) | `0` |
79-
| [distributed_index_analysis_min_indexes_bytes_to_activate](/operations/settings/merge-tree-settings#distributed_index_analysis_min_indexes_bytes_to_activate) | `1073741824` |
80-
| [distributed_index_analysis_min_parts_to_activate](/operations/settings/merge-tree-settings#distributed_index_analysis_min_parts_to_activate) | `10` |
81-
| [enable_replacing_merge_with_cleanup_for_min_age_to_force_merge](/operations/settings/merge-tree-settings#enable_replacing_merge_with_cleanup_for_min_age_to_force_merge) | `0` |
82-
| [force_read_through_cache_for_merges](/operations/settings/merge-tree-settings#force_read_through_cache_for_merges) | `0` |
83-
| [merge_selector_algorithm](/operations/settings/merge-tree-settings#merge_selector_algorithm) | `Simple` |
84-
| [merge_selector_enable_heuristic_to_lower_max_parts_to_merge_at_once](/operations/settings/merge-tree-settings#merge_selector_enable_heuristic_to_lower_max_parts_to_merge_at_once) | `0` |
85-
| [merge_selector_heuristic_to_lower_max_parts_to_merge_at_once_exponent](/operations/settings/merge-tree-settings#merge_selector_heuristic_to_lower_max_parts_to_merge_at_once_exponent) | `5` |
86-
| [notify_newest_block_number](/operations/settings/merge-tree-settings#notify_newest_block_number) | `0` |
87-
| [part_moves_between_shards_delay_seconds](/operations/settings/merge-tree-settings#part_moves_between_shards_delay_seconds) | `30` |
88-
| [part_moves_between_shards_enable](/operations/settings/merge-tree-settings#part_moves_between_shards_enable) | `0` |
89-
| [remote_fs_zero_copy_path_compatible_mode](/operations/settings/merge-tree-settings#remote_fs_zero_copy_path_compatible_mode) | `0` |
90-
| [remote_fs_zero_copy_zookeeper_path](/operations/settings/merge-tree-settings#remote_fs_zero_copy_zookeeper_path) | `/clickhouse/zero_copy` |
91-
| [remove_rolled_back_parts_immediately](/operations/settings/merge-tree-settings#remove_rolled_back_parts_immediately) | `1` |
92-
| [shared_merge_tree_virtual_parts_discovery_batch](/operations/settings/merge-tree-settings#shared_merge_tree_virtual_parts_discovery_batch) | `1` |
9375
| [query_plan_optimize_join_order_randomize](/operations/settings/settings#query_plan_optimize_join_order_randomize) | `0` |
9476
| [enable_join_transitive_predicates](/operations/settings/settings#enable_join_transitive_predicates) | `0` |
9577
| [ast_fuzzer_runs](/operations/settings/settings#ast_fuzzer_runs) | `0` |
@@ -165,4 +147,22 @@ Please note: no additional experimental features are allowed to be enabled in Cl
165147
| [webassembly_udf_max_memory](/operations/settings/settings#webassembly_udf_max_memory) | `134217728` |
166148
| [webassembly_udf_max_input_block_size](/operations/settings/settings#webassembly_udf_max_input_block_size) | `0` |
167149
| [webassembly_udf_max_instances](/operations/settings/settings#webassembly_udf_max_instances) | `32` |
150+
| [allow_commit_order_projection](/operations/settings/merge-tree-settings#allow_commit_order_projection) | `0` |
151+
| [allow_experimental_replacing_merge_with_cleanup](/operations/settings/merge-tree-settings#allow_experimental_replacing_merge_with_cleanup) | `0` |
152+
| [allow_experimental_reverse_key](/operations/settings/merge-tree-settings#allow_experimental_reverse_key) | `0` |
153+
| [allow_remote_fs_zero_copy_replication](/operations/settings/merge-tree-settings#allow_remote_fs_zero_copy_replication) | `0` |
154+
| [distributed_index_analysis_min_indexes_bytes_to_activate](/operations/settings/merge-tree-settings#distributed_index_analysis_min_indexes_bytes_to_activate) | `1073741824` |
155+
| [distributed_index_analysis_min_parts_to_activate](/operations/settings/merge-tree-settings#distributed_index_analysis_min_parts_to_activate) | `10` |
156+
| [enable_replacing_merge_with_cleanup_for_min_age_to_force_merge](/operations/settings/merge-tree-settings#enable_replacing_merge_with_cleanup_for_min_age_to_force_merge) | `0` |
157+
| [force_read_through_cache_for_merges](/operations/settings/merge-tree-settings#force_read_through_cache_for_merges) | `0` |
158+
| [merge_selector_algorithm](/operations/settings/merge-tree-settings#merge_selector_algorithm) | `Simple` |
159+
| [merge_selector_enable_heuristic_to_lower_max_parts_to_merge_at_once](/operations/settings/merge-tree-settings#merge_selector_enable_heuristic_to_lower_max_parts_to_merge_at_once) | `0` |
160+
| [merge_selector_heuristic_to_lower_max_parts_to_merge_at_once_exponent](/operations/settings/merge-tree-settings#merge_selector_heuristic_to_lower_max_parts_to_merge_at_once_exponent) | `5` |
161+
| [notify_newest_block_number](/operations/settings/merge-tree-settings#notify_newest_block_number) | `0` |
162+
| [part_moves_between_shards_delay_seconds](/operations/settings/merge-tree-settings#part_moves_between_shards_delay_seconds) | `30` |
163+
| [part_moves_between_shards_enable](/operations/settings/merge-tree-settings#part_moves_between_shards_enable) | `0` |
164+
| [remote_fs_zero_copy_path_compatible_mode](/operations/settings/merge-tree-settings#remote_fs_zero_copy_path_compatible_mode) | `0` |
165+
| [remote_fs_zero_copy_zookeeper_path](/operations/settings/merge-tree-settings#remote_fs_zero_copy_zookeeper_path) | `/clickhouse/zero_copy` |
166+
| [remove_rolled_back_parts_immediately](/operations/settings/merge-tree-settings#remove_rolled_back_parts_immediately) | `1` |
167+
| [shared_merge_tree_virtual_parts_discovery_batch](/operations/settings/merge-tree-settings#shared_merge_tree_virtual_parts_discovery_batch) | `1` |
168168
<!--AUTOGENERATED_END-->

docs/cloud/reference/03_billing/05_payment-thresholds.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,10 @@ import billing_2 from '@site/static/images/cloud/reference/billing_payment_thres
1313

1414
## Payment thresholds {#threshholds}
1515

16-
If you are a pay as you go customer and your amount due in a billing period for ClickHouse Cloud reaches $10,000 USD or the equivalent value, your payment method configured to your organization will be automatically charged.
16+
If you are a pay as you go customer and your amount due in a billing period for ClickHouse Cloud reaches $1,000 USD or the equivalent value, your payment method configured to your organization will be automatically charged.
1717

1818
:::tip
19-
This default payment threshold amount can be adjusted below $10,000.
20-
If you wish to do so, [contact support](mailto:support@clickhouse.com).
19+
If you wish to adjust the default payment threshold amount, [contact support](mailto:support@clickhouse.com).
2120
:::
2221

2322
A failed charge will result in the suspension of your services after a 14 day grace period.
@@ -32,7 +31,7 @@ In the example below, the Billing UI in cloud console is shown:
3231

3332
<Image img={billing_2} size="lg" alt="Bill"/>
3433

35-
As you can see from the above example - there was a threshold invoice sent during the Feb 28-March 31 billing period and then there is another invoice sent during the same billing period for the remaining usage over $10,000.
34+
As you can see from the above example - there was a threshold invoice sent during the Feb 28-March 31 billing period and then there is another invoice sent during the same billing period for the remaining usage over $1,000.
3635

3736
## Payment threshold notifications {#threshholds-notifications}
3837

0 commit comments

Comments
 (0)