Merge branch 'main' into redirect-deployment-options-to-pricing

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

@@ -8813,3 +8813,321 @@
     docker_arm_limited_access: false
   source: true
   previous_release: v25.2.0-beta.1
+
+
+- release_name: v23.2.24
+  major_version: v23.2
+  release_date: '2025-04-28'
+  release_type: Production
+  go_version: go1.23.7
+  sha: 8961e814bff7eeb85d42bbdbaf54769294af3681
+  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.23
+
+
+- release_name: v24.1.17
+  major_version: v24.1
+  release_date: '2025-04-28'
+  release_type: Production
+  go_version: go1.23.7
+  sha: c3b5cb46876358879012a5eb01461aa2c2c5b070
+  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.16
+
+
+- release_name: v24.3.11
+  major_version: v24.3
+  release_date: '2025-04-28'
+  release_type: Production
+  go_version: go1.23.7
+  sha: 48c74189a0dabf38e990e4a2d94431e630945822
+  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.10
+
+
+- release_name: v25.1.5
+  major_version: v25.1
+  release_date: '2025-04-28'
+  release_type: Production
+  go_version: go1.23.7
+  sha: d148d3abe6cb84ecc15c470c524f05c1e726c671
+  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.4
+
+
+- release_name: v25.2.0-beta.3
+  major_version: v25.2
+  release_date: '2025-04-28'
+  release_type: Testing
+  go_version: go1.23.7
+  sha: 2ca5649d32f7b0920421be7dcebbd842c9fc757b
+  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.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
+  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: v25.2.0-rc.1
+  major_version: v25.2
+  release_date: '2025-05-12'
+  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: 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
+    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).

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.