Merge in main and resolve yml and csv conflicts

src/current/_data/metrics/available-metrics-not-in-metrics-list.csv

@@ -0,0 +1,19 @@
+metric_id,description,y-axis label,type,unit
+"security.certificate.expiration.ca","Expiration for the CA certificate. 0 means no certificate or error.","Certificate Expiration",GAUGE,TIMESTAMP_SEC
+"security.certificate.expiration.client-ca","Expiration for the client CA certificate. 0 means no certificate or error.","Certificate Expiration",GAUGE,TIMESTAMP_SEC
+"security.certificate.expiration.client","Minimum expiration for client certificates, labeled by SQL user. 0 means no certificate or error.","Certificate Expiration",GAUGE,TIMESTAMP_SEC
+"security.certificate.expiration.ui-ca","Expiration for the UI CA certificate. 0 means no certificate or error.","Certificate Expiration",GAUGE,TIMESTAMP_SEC
+"security.certificate.expiration.node","Expiration for the node certificate. 0 means no certificate or error.","Certificate Expiration",GAUGE,TIMESTAMP_SEC
+"security.certificate.expiration.node-client","Expiration for the node's client certificate. 0 means no certificate or error.","Certificate Expiration",GAUGE,TIMESTAMP_SEC
+"security.certificate.expiration.ui","Expiration for the UI certificate. 0 means no certificate or error.","Certificate Expiration",GAUGE,TIMESTAMP_SEC
+"security.certificate.expiration.ca-client-tenant","Expiration for the Tenant Client CA certificate. 0 means no certificate or error.","Certificate Expiration",GAUGE,TIMESTAMP_SEC
+"security.certificate.expiration.client-tenant","Expiration for the Tenant Client certificate. 0 means no certificate or error.","Certificate Expiration",GAUGE,TIMESTAMP_SEC
+"security.certificate.ttl.ca","Seconds till expiration for the CA certificate. 0 means expired, no certificate or error.","Certificate TTL",GAUGE,TIMESTAMP_SEC
+"security.certificate.ttl.client-ca","Seconds till expiration for the client CA certificate. 0 means expired, no certificate or error.","Certificate TTL",GAUGE,TIMESTAMP_SEC
+"security.certificate.ttl.client","Seconds till expiration for the client certificates, labeled by SQL user. 0 means expired, no certificate or error.","Certificate TTL",GAUGE,TIMESTAMP_SEC
+"security.certificate.ttl.ui-ca","Seconds till expiration for the UI CA certificate. 0 means expired, no certificate or error.","Certificate TTL",GAUGE,TIMESTAMP_SEC
+"security.certificate.ttl.node","Seconds till expiration for the node certificate. 0 means expired, no certificate or error.","Certificate TTL",GAUGE,TIMESTAMP_SEC
+"security.certificate.ttl.node-client","Seconds till expiration for the node's client certificate. 0 means expired, no certificate or error.","Certificate TTL",GAUGE,TIMESTAMP_SEC
+"security.certificate.ttl.ui","Seconds till expiration for the UI certificate. 0 means expired, no certificate or error.","Certificate TTL",GAUGE,TIMESTAMP_SEC
+"security.certificate.ttl.ca-client-tenant","Seconds till expiration for the Tenant Client CA certificate. 0 means expired, no certificate or error.","Certificate TTL",GAUGE,TIMESTAMP_SEC
+"security.certificate.ttl.client-tenant","Seconds till expiration for the Tenant Client certificate. 0 means expired, no certificate or error.","Certificate TTL",GAUGE,TIMESTAMP_SEC

src/current/_data/metrics/child-metrics.yml

@@ -233,4 +233,20 @@
   feature: all
 
 - child_metric_id: rpc.connection.avg_round_trip_latency
-  feature: all
+  feature: all
+
+- child_metric_id: logical_replication.catchup_ranges_by_label
+  feature: ldr
+
+- child_metric_id: logical_replication.events_dlqed_by_label
+  feature: ldr
+
+- child_metric_id: logical_replication.events_ingested_by_label
+  feature: ldr
+
+- child_metric_id: logical_replication.replicated_time_by_label
+  feature: ldr
+
+- child_metric_id: logical_replication.scanning_ranges_by_label
+  feature: ldr
+

src/current/_data/releases.yml

@@ -7301,7 +7301,7 @@
 
 - release_name: v24.2.5
   major_version: v24.2
-  release_date: '2024-11-14'
+  release_date: '2024-11-18'
   release_type: Production
   go_version: go1.22.8
   sha: beddec16a5a438d66bd3f5f4202085cf21c0973c
@@ -7329,7 +7329,7 @@
 
 - release_name: v23.1.29
   major_version: v23.1
-  release_date: '2024-11-14'
+  release_date: '2024-11-18'
   release_type: Production
   go_version: go1.22.8
   sha: cb0646dc26328963ca2c89d7a8d105d166836d6d
@@ -7356,7 +7356,7 @@
 
 - release_name: v24.1.7
   major_version: v24.1
-  release_date: '2024-11-14'
+  release_date: '2024-11-18'
   release_type: Production
   go_version: go1.22.8
   sha: 3613a619e327fb412ac62036ce2c7060c25e48db
@@ -7410,7 +7410,7 @@
 
 - release_name: v23.2.16
   major_version: v23.2
-  release_date: '2024-11-16'
+  release_date: '2024-11-18'
   release_type: Production
   go_version: go1.22.8
   sha: 720d706874e2424b32c7c9347f6d52140f83beee
@@ -7462,6 +7462,141 @@
   source: true
   previous_release: v24.3.0-beta.3
 
+- release_name: v24.2.6
+  major_version: v24.2
+  release_date: '2024-12-12'
+  release_type: Production
+  go_version: go1.22.8
+  sha: 74f60821a82c570ab58b8d7716c1d74b85e87df0
+  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.2.5
+
+- release_name: v24.1.8
+  major_version: v24.1
+  release_date: '2024-12-12'
+  release_type: Production
+  go_version: go1.22.8
+  sha: 05e5df3c04a577643a59b78f574b0084832e67e6
+  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.7
+
+- release_name: v23.1.30
+  major_version: v23.1
+  release_date: '2024-12-12'
+  release_type: Production
+  go_version: go1.22.8
+  sha: 2ee70ad63870ea3b44cb8593d0ac84d379547fc6
+  has_sql_only: true
+  has_sha256sum: true
+  mac:
+    mac_arm: true
+    mac_arm_experimental: true
+    mac_arm_limited_access: true
+  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.1.29
+
+- release_name: v23.2.17
+  major_version: v23.2
+  release_date: '2024-12-12'
+  release_type: Production
+  go_version: go1.22.8
+  sha: 1a524cd3ced15426926fb4898162ab43c7484d92
+  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.16
+
+- release_name: v24.3.1
+  major_version: v24.3
+  release_date: '2024-12-12'
+  release_type: Production
+  go_version: go1.22.8
+  sha: f9b40bb0eb7ed20acd68f24afc4c402614a9274b
+  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.0
+
 - release_name: v25.1.0-alpha.1
   major_version: v25.1
   release_date: '2024-12-19'
@@ -7486,4 +7621,4 @@
     docker_arm: true
     docker_arm_experimental: false
     docker_arm_limited_access: false
-  source: true
+  source: true

src/current/_data/versions.csv

@@ -16,4 +16,4 @@ v23.2,2024-02-05,2025-02-05,2025-08-05,23.2.6,23.2.7,2024-07-08,2025-07-08,2026-
 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
 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
 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
-v25.1,N/A,N/A,N/A,v24.3,master
+v25.1,2025-02-18,2025-08-18,N/A,N/A,N/A,N/A,N/A,N/A,v24.2,master

src/current/_includes/cockroachcloud/use-cockroachcloud-instead.md

@@ -1,3 +1,3 @@
 {{site.data.alerts.callout_success}}
-To deploy a free CockroachDB {{ site.data.products.cloud }} cluster instead of running CockroachDB yourself, see the <a href="{% link cockroachcloud/quickstart.md %}">Quickstart</a>.
+To try CockroachDB {{ site.data.products.cloud }} instead of running CockroachDB yourself, refer to the <a href="{% link cockroachcloud/quickstart.md %}">Cloud Quickstart</a>.
 {{site.data.alerts.end}}

src/current/_includes/common/cdc-cloud-costs-link.md

@@ -0,0 +1 @@
+If you're using a CockroachDB {{ site.data.products.cloud }} cluster, refer to [Understand CockroachDB Cloud Costs]({% link cockroachcloud/costs.md %}) for detail on how CDC is billed monthly based on usage.

src/current/_includes/common/define-watched-cdc.md

@@ -0,0 +1 @@
+The main feature of {% if page.name == "change-data-capture-overview.md" %} CockroachDB CDC {% else %} [CockroachDB CDC]({% link {{site.current_cloud_version}}/change-data-capture-overview.md %}) {% endif %} is the _changefeed_, which targets an allowlist of tables, known as _watched tables_.

src/current/_includes/common/telemetry-table.html

@@ -83,9 +83,7 @@
  </tr>
  <tr>
   <td>Altered cluster settings</td>
-  <td>
-      Cluster settings that have been altered from their default values.
-      Note that any values of type 'string' are redacted, such as the cluster organization.
+  <td>Cluster settings that have been altered from their default values. Note that every value of type 'string' is redacted, such as the cluster organization, as well as sensitive settings, such as OIDC authentication.
   </td>
   <td>
    <ul>
@@ -96,8 +94,11 @@
   <td>
    <code>
 "alteredSettings": {
-    "cluster.organization": "\u003credacted\u003e", "kv.lease.expiration_leases_only.enabled": "false",
-    "kv.rangefeed.enabled": "true"
+    "cluster.organization": "\u003credacted\u003e",
+    "cluster.secret": "\u003credacted\u003e",
+    "kv.rangefeed.enabled": "true",
+    "server.oidc_authentication.client_id": "\u003credacted\u003e",
+    "server.oidc_authentication.client_secret": "\u003credacted\u003e",
   }
 </code>
   </td>

src/current/_includes/common/upgrade/prepare-to-upgrade-self-hosted.md

@@ -1,11 +1,9 @@
 Before beginning a major-version or patch upgrade:
 
 1. Verify the overall health of your cluster using the [DB Console]({% link {{ page.version.version }}/ui-cluster-overview-page.md %}):
-    - Under **Node Status**, make sure all nodes that should be live are listed as such. If any nodes are unexpectedly listed as `SUSPECT` or `DEAD`, identify why the nodes are offline and either restart them or [decommission]({% link {{ page.version.version }}/node-shutdown.md %}?filters=decommission#remove-nodes) them before beginning your upgrade. If there are `DEAD` and non-decommissioned nodes in your cluster, the upgrade cannot be finalized.
-
-        If any node is not fully decommissioned, try the following:
-            1. First, reissue the [decommission command]({% link {{ page.version.version }}/node-shutdown.md %}?filters=decommission#decommission-the-node). The second command typically succeeds within a few minutes.
-            1. If the second decommission command does not succeed, [recommission]({% link {{ page.version.version }}/node-shutdown.md %}?filters=decommission#recommission-nodes) and then decommission it again. Before continuing the upgrade, the node must be marked as `decommissioned`.
+    - Under **Node Status**, make sure all nodes that should be live are listed as such. If any nodes are unexpectedly listed as `SUSPECT` or `DEAD`, identify why the nodes are offline and either restart them or [decommission]({% link {{ page.version.version }}/node-shutdown.md %}?filters=decommission#remove-nodes) them before beginning your upgrade. If there are `DEAD` and non-decommissioned nodes in your cluster, the upgrade cannot be finalized. If any node is not fully decommissioned, try the following:
+        1. First, reissue the [decommission command]({% link {{ page.version.version }}/node-shutdown.md %}?filters=decommission#decommission-the-node). The second command typically succeeds within a few minutes.
+        1. If the second decommission command does not succeed, [recommission]({% link {{ page.version.version }}/node-shutdown.md %}?filters=decommission#recommission-nodes) and then decommission it again. Before continuing the upgrade, the node must be marked as `decommissioned`.
     - Under **Replication Status**, make sure there are `0` under-replicated and unavailable ranges. Otherwise, performing a rolling upgrade increases the risk that ranges will lose a majority of their replicas and cause cluster unavailability. Therefore, it's important to identify and resolve the cause of range under-replication and/or unavailability before beginning your upgrade.
     - In the **Node List**, make sure all nodes are on the same version. Upgrade them to the cluster's current version before continuing. If any nodes are behind, this also indicates that the previous major-version upgrade may not be finalized.
     - In the **Metrics** dashboards, make sure [CPU]({% link {{ page.version.version }}/common-issues-to-monitor.md %}#cpu-usage), [memory]({% link {{ page.version.version }}/common-issues-to-monitor.md %}#database-memory-usage), and [storage]({% link {{ page.version.version }}/common-issues-to-monitor.md %}#storage-capacity) capacity are within acceptable values for each node. Nodes must be able to tolerate some increase in case the new version uses more resources for your workload. If any of these metrics is above healthy limits, consider [adding nodes]({% link {{ page.version.version }}/cockroach-start.md %}) to your cluster before beginning your upgrade.

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

@@ -1,6 +1,6 @@
 ## v23.1.29
 
-Release Date: November 14, 2024
+Release Date: November 18, 2024
 
 {% include releases/new-release-downloads-docker-image.md release=include.release %}
 

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

@@ -0,0 +1,35 @@
+## v23.1.30
+
+Release Date: December 12, 2024
+
+{% include releases/new-release-downloads-docker-image.md release=include.release %}
+
+<h3 id="v23-1-30-security-updates">Security updates</h3>
+
+- All cluster settings that accept strings are now fully redacted when transmitted as part of CockroachDB's diagnostics telemetry. The transmitted payload includes a record of modified cluster settings and their values when they are not strings. If you previously applied the mitigations in [Technical Advisory 133479]({% link advisories/a133479.md %}), you can safely turn on diagnostic reporting via the `diagnostics.reporting.enabled` cluster setting without leaking sensitive cluster settings values. [#134063][#134063]
+
+<h3 id="v23-1-30-general-changes">General changes</h3>
+
+- `COCKROACH_SKIP_ENABLING_DIAGNOSTIC_REPORTING` is no longer mentioned in the `cockroach demo` command. [#134083][#134083]
+
+<h3 id="v23-1-30-bug-fixes">Bug fixes</h3>
+
+- Fixed a bug where CockroachDB could encounter an internal error `interface conversion: coldata.Column is` in an edge case. The bug was present in v22.2.13+, v23.1.9+, and v23.2+. [#133758][#133758]
+- Fixed a bug that caused incorrect `NOT NULL` constraint violation errors on `UPSERT` and `INSERT ... ON CONFLICT ... DO UPDATE` statements when those statements updated an existing row and a subset of columns that did not include a `NOT NULL` column of the table. This bug had been present since at least v20.1.0. [#133824][#133824]
+- Fixed an unhandled error that could occur when using `REVOKE ... ON SEQUENCE FROM ... user` on an object that is not a sequence. [#133706][#133706]
+- Addressed a panic that could occur inside `CREATE TABLE AS` if sequence builtin expressions had invalid function overloads. [#133866][#133866]
+- Previously, when executing queries with index / lookup joins where ordering needed to be maintained, CockroachDB's behavior could lead to increased query latency, potentially by several orders of magnitude. This bug was introduced in v22.2, and is now fixed. [#134363][#134363]
+- Fixed a bug where `DROP CASCADE` would occasionally panic with an `un-dropped backref` message on partitioned tables. [#134524][#134524]
+- Reduced the duration of partitions in the gossip network when a node crashes. This eliminates false positives in the `ranges.unavailable` metric. [#134603][#134603]
+
+[#133706]: https://github.com/cockroachdb/cockroach/pull/133706
+[#133758]: https://github.com/cockroachdb/cockroach/pull/133758
+[#133824]: https://github.com/cockroachdb/cockroach/pull/133824
+[#133866]: https://github.com/cockroachdb/cockroach/pull/133866
+[#134063]: https://github.com/cockroachdb/cockroach/pull/134063
+[#134083]: https://github.com/cockroachdb/cockroach/pull/134083
+[#134363]: https://github.com/cockroachdb/cockroach/pull/134363
+[#134524]: https://github.com/cockroachdb/cockroach/pull/134524
+[#134603]: https://github.com/cockroachdb/cockroach/pull/134603
+[#134649]: https://github.com/cockroachdb/cockroach/pull/134649
+[154e9f0e0]: https://github.com/cockroachdb/cockroach/commit/154e9f0e0

src/current/_includes/releases/v23.2/v23.2.13.md

@@ -16,7 +16,7 @@ Release Date: October 17, 2024
 
       [#130664][#130664]
 
-- The new [metric]({% link v23.2/metrics.md %}) `changefeed.total_ranges` allows observation of the number of changes that are watched by a changefeed aggregator. It uses the same polling interval as `changefeed.lagging_ranges`, which is controlled by the changefeed option `lagging_ranges_polling_interval`. [#130984][#130984]
+- The new [metric]({% link v23.2/metrics.md %}) `changefeed.total_ranges` allows observation of the number of ranges that are watched by a changefeed aggregator. It uses the same polling interval as `changefeed.lagging_ranges`, which is controlled by the changefeed option `lagging_ranges_polling_interval`. [#130984][#130984]
 - The following groups of [metrics]({% link v23.2/metrics.md %}) and [logs]({% link v23.2/logging.md %}) have been renamed to include the buffer they are associated with. The previous metrics are still maintained for backward compatibility.
       - `changefeed.buffer_entries.*`
       - `changefeed.buffer_entries_mem.*`
@@ -81,6 +81,7 @@ Release Date: October 17, 2024
 [#130664]: https://github.com/cockroachdb/cockroach/pull/130664
 [#130790]: https://github.com/cockroachdb/cockroach/pull/130790
 [#130919]: https://github.com/cockroachdb/cockroach/pull/130919
+[#130984]: https://github.com/cockroachdb/cockroach/pull/130984
 [#130988]: https://github.com/cockroachdb/cockroach/pull/130988
 [#131065]: https://github.com/cockroachdb/cockroach/pull/131065
 [#131128]: https://github.com/cockroachdb/cockroach/pull/131128

src/current/_includes/releases/v23.2/v23.2.16.md

@@ -1,6 +1,6 @@
 ## v23.2.16
 
-Release Date: November 15, 2024
+Release Date: November 18, 2024
 
 {% include releases/new-release-downloads-docker-image.md release=include.release %}