Merge branch 'main' into DOC-11173

src/current/releases/cloud.md

@@ -15,6 +15,14 @@ Get future release notes emailed to you:
 {% include marketo.html formId=1083 %}
 
 
+## November 1, 2024
+
+Cockroach Labs has announced [updated pricing](https://www.cockroachlabs.com/blog/improved-cockroachdb-cloud-pricing/) for CockroachDB Cloud. This new pricing model goes into effect December 1, 2024 for new customers and existing pay-as-you-go customers, and upon renewal for annual or multi-year contract customers.
+
+A [Preview](https://www.cockroachlabs.com/docs/cockroachcloud/costs#usage-based-billing-metrics-in-preview) of metering for usage-based billing of data transfer, backups, and changefeeds remains in effect through November 30, 2024. During this Preview, line items with a charge of $0 will be shown on your monthly invoice for these items. Customers with existing annual or multi-year contracts may continue to preview these line items until charges begin upon contract renewal.
+
+For more information, refer to [CockroachDB Cloud Costs](https://www.cockroachlabs.com/docs/cockroachcloud/costs) and the [CockroachDB Pricing](https://www.cockroachlabs.com/pricing/) page.
+
 ## October 29, 2024
 
 The new official [Cockroach Labs Okta app integration]({% link cockroachcloud/configure-cloud-org-sso.md %}#add-a-custom-authentication-method) eases the configuration of OIDC and SAML SSO authentication methods for CockroachDB {{ site.data.products.cloud }} organizations. Previously, a custom OIDC or SAML app integration in Okta was required.
@@ -31,16 +39,12 @@ The new official [Cockroach Labs Okta app integration]({% link cockroachcloud/co
 
 ## October 1, 2024
 
-Metering for usage-based billing of data transfer, managed backup storage, and changefeeds is now in [Preview]({% link {{site.current_cloud_version }}/cockroachdb-feature-availability.md %}) for all CockroachDB Cloud organizations.
+[Metering](https://www.cockroachlabs.com/docs/cockroachcloud/costs) for usage-based billing of data transfer, managed backup storage, and changefeeds is now in [Preview](https://www.cockroachlabs.com/docs/stable/cockroachdb-feature-availability#features-in-preview) for all CockroachDB Cloud organizations.
 
-- [Usage metrics]({% link cockroachcloud/costs.md %}) for data transfer, managed backup storage, and changefeeds are now visible for CockroachDB Standard and Advanced clusters in the CockroachDB Cloud Console. You can view your usage across these metrics on the [Billing page](https://cockroachlabs.cloud/billing/overview) and on invoices.
-- There will be no usage-based charges associated with these metrics during the preview period, which is in effect through November 30, 2024. During this time, line items with a charge of $0 will be shown for each metric on your monthly invoice.
-- We will share pricing for these usage-based costs by November 1, 2024.
-- On December 1, 2024, once the preview has ended, pricing for these metrics goes into effect immediately for new customers and customers billed monthly, and upon contract renewal for customers billed by invoice.
-
-{{site.data.alerts.callout_info}}
-Bytes transferred for [managed backups]({% link cockroachcloud/managed-backups.md %}) on CockroachDB Standard are not yet metered under [Data Transfer]({% link cockroachcloud/costs.md %}#data-transfer) metrics. This will be implemented during the Preview period and be announced in a future release note.
-{{site.data.alerts.end}}
+- Usage metrics for data transfer, managed backup storage, and changefeeds are now visible for CockroachDB Standard and Advanced clusters in the CockroachDB Cloud Console. You can view your usage across these metrics on the [Billing page](https://cockroachlabs.cloud/billing/overview) and on invoices.  
+- There will be no usage-based charges associated with these metrics during the Preview period, which is in effect through November 30, 2024\. During this time, line items with a charge of $0 will be shown for each metric on your monthly invoice.  
+- We will share pricing for these usage-based costs by November 1, 2024\.  
+- On December 1, 2024, once the Preview has ended, pricing for these metrics goes into effect immediately for new customers and for existing pay-as-you-go customers (e.g. paying monthly by credit card). Customers with annual or multi-year contracts will continue to preview these line items without incurring charges for them (i.e. expending credits) through the end of their current contract term.
 
 ## September 25, 2024
 

src/current/v23.1/performance-benchmarking-with-tpcc-medium.md

@@ -134,7 +134,6 @@ You'll be importing a large TPC-C data set. To speed that up, you can tweak some
     {% include_cached copy-clipboard.html %}
     ~~~ sql
     > SET CLUSTER SETTING rocksdb.ingest_backpressure.l0_file_count_threshold = 100;
-    SET CLUSTER SETTING rocksdb.ingest_backpressure.pending_compaction_threshold = '5 GiB';
     SET CLUSTER SETTING schemachanger.backfiller.max_buffer_size = '5 GiB';
     SET CLUSTER SETTING kv.snapshot_rebalance.max_rate = '128 MiB';
     SET CLUSTER SETTING rocksdb.min_wal_sync_interval = '500us';

src/current/v23.2/cockroachdb-feature-availability.md

@@ -39,6 +39,14 @@ Any feature made available in a phase prior to GA is provided without any warran
 
 ## Features in preview
 
+### Usage-based billing metrics
+
+Metering for [usage-based billing](https://www.cockroachlabs.com/docs/cockroachcloud/costs) of data transfer, managed backup storage, and changefeeds is in Preview for all CockroachDB Standard and Advanced clusters through November 2024\. You can view your usage in the CockroachDB Cloud Console, where line items with a charge of $0 are shown for each metric. There will be no usage-based charges associated with these metrics during the Preview period.
+
+On December 1, 2024, once the Preview has ended, pricing for these metrics goes into effect immediately for new customers and for existing pay-as-you-go customers (e.g. paying monthly by credit card). Customers with annual or multi-year contracts will continue to preview these line items without incurring charges for them (i.e. expending credits) through the end of their current contract term.
+
+For more information, refer to [CockroachDB Cloud Costs: Usage-based billing metrics in Preview](https://www.cockroachlabs.com/docs/cockroachcloud/costs#usage-based-billing-metrics-in-preview) and the announcements in the release notes published [October 1](https://www.cockroachlabs.com/docs/releases/cloud#october-1-2024) and [November 1](https://www.cockroachlabs.com/docs/releases/cloud#november-1-2024).
+
 {{site.data.alerts.callout_info}}
 **The following features are in preview** and are subject to change. To share feedback and/or issues, contact [Support](https://support.cockroachlabs.com/hc).
 {{site.data.alerts.end}}

src/current/v23.2/performance-benchmarking-with-tpcc-medium.md

@@ -134,7 +134,6 @@ You'll be importing a large TPC-C data set. To speed that up, you can tweak some
     {% include_cached copy-clipboard.html %}
     ~~~ sql
     > SET CLUSTER SETTING rocksdb.ingest_backpressure.l0_file_count_threshold = 100;
-    SET CLUSTER SETTING rocksdb.ingest_backpressure.pending_compaction_threshold = '5 GiB';
     SET CLUSTER SETTING schemachanger.backfiller.max_buffer_size = '5 GiB';
     SET CLUSTER SETTING kv.snapshot_rebalance.max_rate = '128 MiB';
     SET CLUSTER SETTING rocksdb.min_wal_sync_interval = '500us';

src/current/v24.1/cockroachdb-feature-availability.md

@@ -43,6 +43,14 @@ Any feature made available in a phase prior to GA is provided without any warran
 **The following features are in preview** and are subject to change. To share feedback and/or issues, contact [Support](https://support.cockroachlabs.com/hc).
 {{site.data.alerts.end}}
 
+### Usage-based billing metrics
+
+Metering for [usage-based billing](https://www.cockroachlabs.com/docs/cockroachcloud/costs) of data transfer, managed backup storage, and changefeeds is in Preview for all CockroachDB Standard and Advanced clusters through November 2024\. You can view your usage in the CockroachDB Cloud Console, where line items with a charge of $0 are shown for each metric. There will be no usage-based charges associated with these metrics during the Preview period.
+
+On December 1, 2024, once the Preview has ended, pricing for these metrics goes into effect immediately for new customers and for existing pay-as-you-go customers (e.g. paying monthly by credit card). Customers with annual or multi-year contracts will continue to preview these line items without incurring charges for them (i.e. expending credits) through the end of their current contract term.
+
+For more information, refer to [CockroachDB Cloud Costs: Usage-based billing metrics in Preview](https://www.cockroachlabs.com/docs/cockroachcloud/costs#usage-based-billing-metrics-in-preview) and the announcements in the release notes published [October 1](https://www.cockroachlabs.com/docs/releases/cloud#october-1-2024) and [November 1](https://www.cockroachlabs.com/docs/releases/cloud#november-1-2024).
+
 ### CockroachDB Cloud Folders
 
 [Organizing CockroachDB {{ site.data.products.cloud }} clusters using folders]({% link cockroachcloud/folders.md %}) is in preview. Folders allow you to organize and manage access to your clusters according to your organization's requirements. For example, you can create top-level folders for each business unit in your organization, and within those folders, organize clusters by geographic location and then by  level of maturity, such as production, staging, and testing.

src/current/v24.1/performance-benchmarking-with-tpcc-medium.md

@@ -134,7 +134,6 @@ You'll be importing a large TPC-C data set. To speed that up, you can tweak some
     {% include_cached copy-clipboard.html %}
     ~~~ sql
     > SET CLUSTER SETTING rocksdb.ingest_backpressure.l0_file_count_threshold = 100;
-    SET CLUSTER SETTING rocksdb.ingest_backpressure.pending_compaction_threshold = '5 GiB';
     SET CLUSTER SETTING schemachanger.backfiller.max_buffer_size = '5 GiB';
     SET CLUSTER SETTING kv.snapshot_rebalance.max_rate = '128 MiB';
     SET CLUSTER SETTING rocksdb.min_wal_sync_interval = '500us';

src/current/v24.2/cockroachdb-feature-availability.md

@@ -49,7 +49,11 @@ Any feature made available in a phase prior to GA is provided without any warran
 
 ### Usage-based billing metrics
 
-Metering for [usage-based billing]({% link cockroachcloud/costs.md %}) of data transfer, managed backup storage, and changefeeds is now in Preview for all CockroachDB Standard and Advanced clusters through November 2024. You can view your usage in the CockroachDB Cloud Console, where line items with a charge of $0 will be shown for each metric. There will be no usage-based charges associated with these metrics during the preview period. For more information, refer to [CockroachDB Cloud Costs: Usage-based billing metrics in Preview]({% link cockroachcloud/costs.md %}#usage-based-billing-metrics-in-preview) or the [announcement]({% link releases/cloud.md %}#october-1-2024) in the release notes.
+Metering for [usage-based billing](https://www.cockroachlabs.com/docs/cockroachcloud/costs) of data transfer, managed backup storage, and changefeeds is in Preview for all CockroachDB Standard and Advanced clusters through November 2024\. You can view your usage in the CockroachDB Cloud Console, where line items with a charge of $0 are shown for each metric. There will be no usage-based charges associated with these metrics during the Preview period.
+
+On December 1, 2024, once the Preview has ended, pricing for these metrics goes into effect immediately for new customers and for existing pay-as-you-go customers (e.g. paying monthly by credit card). Customers with annual or multi-year contracts will continue to preview these line items without incurring charges for them (i.e. expending credits) through the end of their current contract term.
+
+For more information, refer to [CockroachDB Cloud Costs: Usage-based billing metrics in Preview](https://www.cockroachlabs.com/docs/cockroachcloud/costs#usage-based-billing-metrics-in-preview) and the announcements in the release notes published [October 1](https://www.cockroachlabs.com/docs/releases/cloud#october-1-2024) and [November 1](https://www.cockroachlabs.com/docs/releases/cloud#november-1-2024).
 
 ### CockroachDB Standard
 

src/current/v24.2/performance-benchmarking-with-tpcc-medium.md

@@ -134,7 +134,6 @@ You'll be importing a large TPC-C data set. To speed that up, you can tweak some
     {% include_cached copy-clipboard.html %}
     ~~~ sql
     > SET CLUSTER SETTING rocksdb.ingest_backpressure.l0_file_count_threshold = 100;
-    SET CLUSTER SETTING rocksdb.ingest_backpressure.pending_compaction_threshold = '5 GiB';
     SET CLUSTER SETTING schemachanger.backfiller.max_buffer_size = '5 GiB';
     SET CLUSTER SETTING kv.snapshot_rebalance.max_rate = '128 MiB';
     SET CLUSTER SETTING rocksdb.min_wal_sync_interval = '500us';

src/current/v24.3/performance-benchmarking-with-tpcc-medium.md

@@ -134,7 +134,6 @@ You'll be importing a large TPC-C data set. To speed that up, you can tweak some
     {% include_cached copy-clipboard.html %}
     ~~~ sql
     > SET CLUSTER SETTING rocksdb.ingest_backpressure.l0_file_count_threshold = 100;
-    SET CLUSTER SETTING rocksdb.ingest_backpressure.pending_compaction_threshold = '5 GiB';
     SET CLUSTER SETTING schemachanger.backfiller.max_buffer_size = '5 GiB';
     SET CLUSTER SETTING kv.snapshot_rebalance.max_rate = '128 MiB';
     SET CLUSTER SETTING rocksdb.min_wal_sync_interval = '500us';