Merge branch 'main' into devarshishah3-patch-4

Author: mikeCRL

.github/workflows/nightly.yml

@@ -6,7 +6,8 @@ source "https://rubygems.org"
 # docs-builder Docker image to keep things speedy in CI. See ci/README.md for
 # instructions.
 
-gem "jekyll", "~> 4.3"
+# Removed `gem "jekyll", "~> 4.3"`` until conflict with our use of ianjevins/jekyll-remote-include is resolved (DOC-13509)
+gem "jekyll", "4.3.4"
 gem "liquid-c", "~> 4.0.0"
 gem "redcarpet", "~> 3.6"
 gem "rss"

src/current/Gemfile

@@ -1,7 +1,7 @@
 baseurl: /docs
-current_cloud_version: v25.1
+current_cloud_version: v25.2
 destination: _site/docs
 homepage_title: CockroachDB Docs
 versions:
-  stable: v25.1
-  dev: v25.2
+  stable: v25.2
+  dev: v25.2

src/current/_config_cockroachdb.yml

@@ -873,6 +873,10 @@
   sources: ['cockroachcloud/serverless-cluster-management.md']
   versions: ['cockroachcloud']
 
+- destination: cockroachcloud/advanced-cluster-management.md
+  sources: ['cockroachcloud/cluster-management-advanced.md']
+  versions: ['cockroachcloud']
+
 - destination: cockroachcloud/connect-to-a-basic-cluster.md
   sources: ['cockroachcloud/connect-to-a-serverless-cluster.md']
 

src/current/_data/redirects.yml

@@ -8953,3 +8953,203 @@
     docker_arm_limited_access: false
   source: true
   previous_release: v25.2.0-beta.2
+
+
+- release_name: v24.1.18
+  major_version: v24.1
+  release_date: '2025-04-30'
+  release_type: Production
+  go_version: go1.23.7
+  sha: 3764ba8bc49f54ad0f72bd988ab133527dd87bc0
+  has_sql_only: true
+  has_sha256sum: true
+  mac:
+    mac_arm: true
+    mac_arm_experimental: true
+    mac_arm_limited_access: false
+  windows: true
+  linux:
+    linux_arm: true
+    linux_arm_experimental: false
+    linux_arm_limited_access: false
+    linux_intel_fips: true
+    linux_arm_fips: false
+  docker:
+    docker_image: cockroachdb/cockroach
+    docker_arm: true
+    docker_arm_experimental: false
+    docker_arm_limited_access: false
+  source: true
+  previous_release: v24.1.17
+
+- release_name: v23.2.25
+  major_version: v23.2
+  release_date: '2025-04-30'
+  release_type: Production
+  go_version: go1.23.7
+  sha: 863469918dec11b408e9ad37b0ad8bb3ef6ce7cf
+  has_sql_only: true
+  has_sha256sum: true
+  mac:
+    mac_arm: true
+    mac_arm_experimental: true
+    mac_arm_limited_access: false
+  windows: true
+  linux:
+    linux_arm: true
+    linux_arm_experimental: false
+    linux_arm_limited_access: false
+    linux_intel_fips: true
+    linux_arm_fips: false
+  docker:
+    docker_image: cockroachdb/cockroach
+    docker_arm: true
+    docker_arm_experimental: false
+    docker_arm_limited_access: false
+  source: true
+  previous_release: v23.2.24
+
+- release_name: v24.3.12
+  major_version: v24.3
+  release_date: '2025-04-30'
+  release_type: Production
+  go_version: go1.23.7
+  sha: cde00dd1b97fb000bf2f3479eb0a50bfbb5f8337
+  has_sql_only: true
+  has_sha256sum: true
+  mac:
+    mac_arm: true
+    mac_arm_experimental: true
+    mac_arm_limited_access: false
+  windows: true
+  linux:
+    linux_arm: true
+    linux_arm_experimental: false
+    linux_arm_limited_access: false
+    linux_intel_fips: true
+    linux_arm_fips: false
+  docker:
+    docker_image: cockroachdb/cockroach
+    docker_arm: true
+    docker_arm_experimental: false
+    docker_arm_limited_access: false
+  source: true
+  previous_release: v24.3.11
+
+
+- release_name: v25.1.6
+  major_version: v25.1
+  release_date: '2025-04-30'
+  release_type: Production
+  go_version: go1.23.7
+  sha: 9af34db410ad57b58a35d8251d7c4fe1ddfcec69
+  has_sql_only: true
+  has_sha256sum: true
+  mac:
+    mac_arm: true
+    mac_arm_experimental: true
+    mac_arm_limited_access: false
+  windows: true
+  linux:
+    linux_arm: true
+    linux_arm_experimental: false
+    linux_arm_limited_access: false
+    linux_intel_fips: true
+    linux_arm_fips: false
+  docker:
+    docker_image: cockroachdb/cockroach
+    docker_arm: true
+    docker_arm_experimental: false
+    docker_arm_limited_access: false
+  source: true
+  previous_release: v25.1.5
+
+
+- release_name: v25.2.0-rc.1
+  major_version: v25.2
+  release_date: '2025-05-11'
+  release_type: Testing
+  go_version: go1.23.7
+  sha: 4377500860ff39cc5ddf7954079ced214bd788dc
+  has_sql_only: true
+  has_sha256sum: true
+  mac:
+    mac_arm: true
+    mac_arm_experimental: true
+    mac_arm_limited_access: false
+  windows: true
+  linux:
+    linux_arm: true
+    linux_arm_experimental: false
+    linux_arm_limited_access: false
+    linux_intel_fips: true
+    linux_arm_fips: false
+  docker:
+    docker_image: cockroachdb/cockroach-unstable
+    docker_arm: true
+    docker_arm_experimental: false
+    docker_arm_limited_access: false
+  source: true
+  previous_release: v25.2.0-beta.3
+
+- release_name: v25.2.0
+  major_version: v25.2
+  release_date: '2025-05-12'
+  release_type: Production
+  go_version: go1.23.7
+  sha: e032d36a422d31f74334a25135d74de21c3da29d
+  has_sql_only: true
+  has_sha256sum: true
+  mac:
+    mac_arm: true
+    mac_arm_experimental: true
+    mac_arm_limited_access: false
+  windows: true
+  linux:
+    linux_arm: true
+    linux_arm_experimental: false
+    linux_arm_limited_access: false
+    linux_intel_fips: true
+    linux_arm_fips: false
+  docker:
+    docker_image: cockroachdb/cockroach
+    docker_arm: true
+    docker_arm_experimental: false
+    docker_arm_limited_access: false
+  source: true
+  previous_release: v25.2.0-rc.1
+  cloud_only: true
+  cloud_only_message_short: 'Available only for select CockroachDB Cloud clusters'
+  cloud_only_message: >
+      This version is currently available only for select
+      CockroachDB Cloud clusters. To request to upgrade
+      a CockroachDB self-hosted cluster to this version,
+      [contact support](https://support.cockroachlabs.com/hc/requests/new).
+
+
+- release_name: v24.3.13
+  major_version: v24.3
+  release_date: '2025-05-15'
+  release_type: Production
+  go_version: go1.23.7
+  sha: 4b1048c740f790a97a4a088e06e5781ad7b1114f
+  has_sql_only: true
+  has_sha256sum: true
+  mac:
+    mac_arm: true
+    mac_arm_experimental: true
+    mac_arm_limited_access: false
+  windows: true
+  linux:
+    linux_arm: true
+    linux_arm_experimental: false
+    linux_arm_limited_access: false
+    linux_intel_fips: true
+    linux_arm_fips: false
+  docker:
+    docker_image: cockroachdb/cockroach
+    docker_arm: true
+    docker_arm_experimental: false
+    docker_arm_limited_access: false
+  source: true
+  previous_release: v24.3.12

src/current/_data/releases.yml

@@ -15,6 +15,6 @@ v23.1,2023-05-15,2024-05-15,2024-11-15,23.1.11,23.1.12,2023-11-13,2024-11-13,202
 v23.2,2024-02-05,2025-02-05,2025-08-05,23.2.6,23.2.7,2024-07-08,2025-07-08,2026-07-08,v23.1,release-23.2,N/A
 v24.1,2024-05-20,2025-05-20,2025-11-20,24.1.5,24.1.6,2024-10-21,2025-10-21,2026-10-21,v23.2,release-24.1,N/A
 v24.2,2024-08-12,2025-02-12,N/A,N/A,N/A,N/A,N/A,N/A,v24.1,release-24.2,2028-08-12
-v24.3,2024-11-18,2025-11-18,2026-05-18,N/A,N/A,N/A,N/A,N/A,v24.2,release-24.3,N/A
+v24.3,2024-11-18,2025-11-18,2026-05-18,24.3.11,24.3.12,2025-05-05,2026-05-05,2027-05-05,v24.2,release-24.3,N/A
 v25.1,2025-02-18,2026-08-18,N/A,N/A,N/A,N/A,N/A,N/A,v24.3,release-25.1,N/A
-v25.2,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,v25.1,release-25.2,N/A
+v25.2,2025-05-09,2026-05-12,2026-11-12,N/A,N/A,N/A,N/A,N/A,v25.1,release-25.2,N/A

src/current/_data/versions.csv

@@ -1,4 +1,4 @@
 {% assign tab_names_html = "CockroachDB Basic;CockroachDB Standard;CockroachDB Advanced" %}
-{% assign html_page_filenames = "basic-cluster-management.html;cluster-management.html;cluster-management-advanced.html;advanced-cluster-management.html" %}
+{% assign html_page_filenames = "basic-cluster-management.html;cluster-management.html;advanced-cluster-management.html" %}
 
 {% include filter-tabs.md tab_names=tab_names_html page_filenames=html_page_filenames page_folder="cockroachcloud" %}

src/current/_includes/cockroachcloud/filter-tabs/cluster-management.md

@@ -1,4 +1,4 @@
-    A {% if page.name == 'authorization.md' %}**Folder Admin**{% else %}[**Folder Admin**]({% link cockroachcloud/authorization.md %}#folder-admin){% endif %} can create, rename, and move, or delete folders where they are granted the role, and they can also manage access to these folders. This role can be granted at the level of the organization or on a specific folder. If granted at the level of the organization, the role grants the ability to view all users and service accounts in the organization. If granted on a specific folder, the role is inherited by descendant folders.
+    A {% if page.name == 'authorization.md' %}**Folder Admin**{% else %}[**Folder Admin**]({% link cockroachcloud/authorization.md %}#folder-admin){% endif %} can create, rename, and move, or delete folders where they are granted the role, and they can also manage access to these folders. They can also [edit folder labels]({% link cockroachcloud/labels.md %}). This role can be granted at the level of the organization or on a specific folder. If granted at the level of the organization, the role grants the ability to view all users and service accounts in the organization. If granted on a specific folder, the role is inherited by descendant folders.
 
     A user with the {% if page.name == 'authorization.md' %}[Org Administrator](#org-administrator){% else %}[Org Administrator]({% link cockroachcloud/authorization.md %}#org-administrator){% endif %} role can grant themselves, another user, or a service account the Folder Admin role.
 

src/current/_includes/cockroachcloud/org-roles/folder-admin.md

@@ -1 +1 @@
-CockroachDB is evolving. In late 2024, we will retire our Core offering to consolidate on a single CockroachDB Enterprise offering under a new [license](https://www.cockroachlabs.com/cockroachdb-software-license/). CockroachDB Enterprise will be available at no charge for individual users and small businesses and will offer all users, free and paid, the full breadth of CockroachDB capabilities. See the [CockroachDB licensing update page](https://www.cockroachlabs.com/enterprise-license-update/) for details.
+CockroachDB is evolving. In late 2024, we will retire our Core offering to consolidate on a single CockroachDB Enterprise offering under a new [license](https://www.cockroachlabs.com/cockroachdb-software-license/). CockroachDB Enterprise will be available at no charge for individual users and small businesses and will offer all users, free and paid, the full breadth of CockroachDB capabilities. See the [CockroachDB licensing update page](https://www.cockroachlabs.com/enterprise-license-update/) for details.

src/current/_includes/common/license/evolving.md

@@ -8,9 +8,10 @@ The table of licenses below refers to options for {{ site.data.products.core }}
 
 Type | Description
 -------------|------------
-**Enterprise** <a name="enterprise"></a> | This paid license allows usage of all CockroachDB features in accordance with the terms specified in the [CockroachDB Software License][csl]. License must be renewed annually or as negotiated. Support levels available include [Enterprise][support] or [Essential][support].
-**Enterprise Free** <a name="enterprise-free"></a> | Same functionality as **Enterprise**, but free of charge for businesses with less than $10M in annual revenue. Clusters will be [throttled](#throttling) after 7 days without sending [telemetry]({% link {{ page.version.version }}/telemetry.md %}). License must be renewed annually. Support level available is Community (i.e., [Docs]({% link {{ page.version.version }}/index.md %}), [Forum][forum], [Slack][slack]).
-**Enterprise Trial** <a name="enterprise-trial"></a> | A 30 day self-service trial license. [Telemetry]({% link {{ page.version.version }}/telemetry.md %}) is required during the trial. Clusters will be [throttled](#throttling) after 7 days without sending telemetry. Telemetry can be disabled once the cluster is upgraded to a paid **Enterprise** license. Support level available during trial is Community (i.e., [Docs]({% link {{ page.version.version }}/index.md %}), [Forum][forum], [Slack][slack]).
+**Enterprise** <a name="enterprise"></a> | This paid license allows usage of all CockroachDB features in accordance with the terms specified in the [CockroachDB Software License][csl]. License must be renewed annually or as negotiated. Support levels available include [Enterprise][support] or [Essential][support]. The type of enterprise license may be set to **Production**, **Pre-production**, or **Development** depending on the environment in which CockroachDB is deployed.
+**Free** <a name="enterprise-free"></a> | Same functionality as **Enterprise**, but free of charge for businesses with less than $10M in annual revenue. Clusters will be [throttled](#throttling) after 7 days without sending [telemetry]({% link {{ page.version.version }}/telemetry.md %}). License must be renewed annually. Support level available is Community (i.e., [Docs]({% link {{ page.version.version }}/index.md %}), [Forum][forum], [Slack][slack]).
+**Trial** <a name="enterprise-trial"></a> | A 30 day self-service trial license. [Telemetry]({% link {{ page.version.version }}/telemetry.md %}) is required during the trial. Clusters will be [throttled](#throttling) after 7 days without sending telemetry. Telemetry can be disabled once the cluster is upgraded to a paid **Enterprise** license. Support level available during trial is Community (i.e., [Docs]({% link {{ page.version.version }}/index.md %}), [Forum][forum], [Slack][slack]).
+**Evaluation** <a name="enterprise-evaluation"></a> | Same functionality as **Enterprise**, but may be provided by your sales team if needed for an extended evaluation period. Support level is equivalent to a enterprise license.
 
 <a href="mailto:[email protected]">Contact Sales</a> if you want to try CockroachDB without telemetry requirements or if you require an extended trial period.
 
@@ -23,7 +24,13 @@ Note that:
 
 ## Obtain a license
 
-To obtain a paid **Enterprise** license, <a href="mailto:[email protected]">contact Sales</a>.
+To obtain a paid **Enterprise** license, <a href="mailto:[email protected]">contact Sales</a>. Once a license is added to your account, it appears in the [CockroachDB {{ site.data.products.cloud }} Console][cloud-console] on the **Organization &raquo; Enterprise Licenses** page. This page is only accessible by users with **Organization Admin** permissions.
+
+[Sign up for a CockroachDB {{ site.data.products.cloud }} Console account](https://cockroachlabs.cloud/signup?experience=enterprise) if you do not already have one.
+
+{{site.data.alerts.callout_info}}
+Enterprise licenses generated prior to May 31st 2025 are not visible in the **Enterprise Licenses** page.
+{{site.data.alerts.end}}
 
 To obtain an **Enterprise Free** or **Enterprise Trial** license, take the following steps:
 

src/current/_includes/common/licensing-faqs.md

@@ -293,12 +293,6 @@ With the move from Preview to GA, this feature brings many new capabilities, suc
    </tr>
   </thead>
   <tbody>
-  <tr>
-   <td><p>Support longer incremental backup chains</p>
-   </td>
-   <td><p>We now support up to 400 incremental backups, an 8x increase, enabling you to preserve your data even more effectively (reducing RPO) while being more cost-efficient. Incremental backups contain only the data that has changed since the last backup, so they are smaller and faster to produce.
-   </td>
-  </tr>
   <tr>
    <td><p>Restrict backups to a locality</p>
    </td>

src/current/_includes/releases/v23.1/v23.1.0.md

@@ -0,0 +1,31 @@
+## v23.2.25
+
+Release Date: April 30, 2025
+
+{% include releases/new-release-downloads-docker-image.md release=include.release %}
+
+<h3 id="v23-2-25-sql-language-changes">SQL language changes</h3>
+
+- Added the `WITH IGNORE_FOREIGN_KEYS` option to `SHOW CREATE TABLE` which omits foreign key constraints from the output schema. This option is also allowed in `SHOW CREATE VIEW`, but has no effect. It cannot be combined with the `WITH REDACT` option.
+ [#142165][#142165]
+
+<h3 id="v23-2-25-bug-fixes">Bug fixes</h3>
+
+- Fixed a bug where CockroachDB would encounter an internal error when decoding the gists of plans with `CALL` statements. The bug had been present since v23.2.
+ [#143312][#143312]
+- Fixed a bug that caused changefeeds to fail on startup when scanning a single key.
+ [#143147][#143147]
+- Fixed a bug that could cause a stack overflow during execution of a prepared statement that invoked a PL/pgSQL routine with a loop. The bug existed in versions v23.2.22, v24.1.15, v24.3.9, v25.1.2, v25.1.3, and pre-release versions of v25.2 prior to v25.2.0-alpha.3.
+ [#144029][#144029]
+- Fixed a bug that could leave behind a dangling reference to a dropped role if that role had default privileges granted to itself. The bug was caused by defining privileges such as: `ALTER DEFAULT PRIVILEGES FOR ROLE self_referencing_role GRANT INSERT ON TABLES TO self_referencing_role`.
+ [#143291][#143291]
+- MVCC garbage collection is now fully subject to IO admission control. Previously, it was possible for MVCC GC to cause store overload (such as LSM inversion) when a large amount of data would become eligible for garbage collection. Should any issues arise from subjecting MVCC GC to admission control, the `kv.mvcc_gc.queue_kv_admission_control.enabled` cluster setting can be set to `false` to restore the previous behavior.
+ [#143274][#143274]
+
+
+[#142165]: https://github.com/cockroachdb/cockroach/pull/142165
+[#143312]: https://github.com/cockroachdb/cockroach/pull/143312
+[#143147]: https://github.com/cockroachdb/cockroach/pull/143147
+[#144029]: https://github.com/cockroachdb/cockroach/pull/144029
+[#143291]: https://github.com/cockroachdb/cockroach/pull/143291
+[#143274]: https://github.com/cockroachdb/cockroach/pull/143274