Merge branch 'main' into ltree

Author: taroface

src/current/_data/v25.4/metrics/available-metrics-in-metrics-list.csv

@@ -483,3 +483,11 @@ rebalancing.range.rebalances
 rebalancing.replicas.cpunanospersecond
 rebalancing.replicas.queriespersecond
 rebalancing.state.imbalanced_overfull_options_exhausted
+sql.routine.delete.count
+sql.routine.delete.started.count
+sql.routine.insert.count
+sql.routine.insert.started.count
+sql.routine.select.count
+sql.routine.select.started.count
+sql.routine.update.count
+sql.routine.update.started.count

src/current/_data/v25.4/metrics/metrics.yaml

@@ -1,15 +1,15 @@
 {% assign version = page.version.version | replace: ".", "" %}
 {% comment %}DEBUG: {{ version }}{% endcomment %}
 
-These essential CockroachDB metrics let you monitor your CockroachDB {{ site.data.products.core }} cluster. Use them to build custom dashboards with the following tools:
-
 {% comment %} STEP 1. Assign variables specific to deployment {% endcomment %}
 {% if include.deployment == 'self-hosted' %}
   {% assign metrics_datadog = site.data[version].metrics.datadog-cockroachdb %}
   {% assign datadog_link = "https://docs.datadoghq.com/integrations/cockroachdb/?tab=host#metrics" %}
   {% assign datadog_prefix = "cockroachdb" %}
   {% assign category_order = "HARDWARE,STORAGE,OVERLOAD,NETWORKING,DISTRIBUTED,REPLICATION,SQL,CHANGEFEEDS,TTL,UNSET," %}
 
+These essential CockroachDB metrics let you monitor your CockroachDB {{ site.data.products.core }} cluster. Use them to build custom dashboards with the following tools:
+
 - [Grafana]({% link {{ page.version.version }}/monitor-cockroachdb-with-prometheus.md %}#step-5-visualize-metrics-in-grafana)
 - [Datadog Integration]({% link {{ page.version.version }}/datadog.md %}): The [**Datadog Integration Metric Name**]({{ datadog_link }}) column lists the corresponding Datadog metric which requires the `{{ datadog_prefix }}.` prefix.
 
@@ -20,6 +20,8 @@ These essential CockroachDB metrics let you monitor your CockroachDB {{ site.dat
 {% comment %} Removed NETWORKING category for advanced deployment {% endcomment %}
   {% assign category_order = "HARDWARE,STORAGE,OVERLOAD,DISTRIBUTED,REPLICATION,SQL,CHANGEFEEDS,TTL,UNSET," %}
 
+These essential CockroachDB metrics let you monitor your CockroachDB {{ site.data.products.advanced }} cluster. Use them to build custom dashboards with the following tools:
+
 - [Datadog integration]({% link cockroachcloud/tools-page.md %}#monitor-cockroachdb-cloud-with-datadog) - The [**Datadog Integration Metric Name**]({{ datadog_link }}) column lists the corresponding Datadog metric which requires the `{{ datadog_prefix }}` prefix.
 - [Metrics export]({% link cockroachcloud/export-metrics-advanced.md %})
 

src/current/_includes/v25.3/essential-metrics.md

@@ -1,14 +1,14 @@
 {% assign version = page.version.version | replace: ".", "" %}
 {% comment %}DEBUG: {{ version }}{% endcomment %}
 
-These essential CockroachDB metrics let you monitor your CockroachDB {{ site.data.products.core }} cluster. Use them to build custom dashboards with the following tools:
-
 {% comment %} STEP 1. Assign variables specific to deployment {% endcomment %}
 {% if include.deployment == 'self-hosted' %}
   {% assign metrics_datadog = site.data[version].metrics.datadog-cockroachdb %}
   {% assign datadog_link = "https://docs.datadoghq.com/integrations/cockroachdb/?tab=host#metrics" %}
   {% assign datadog_prefix = "cockroachdb" %}
-  {% assign category_order = "HARDWARE,STORAGE,OVERLOAD,NETWORKING,DISTRIBUTED,REPLICATION,SQL,CHANGEFEEDS,TTL,UNSET," %}
+  {% assign category_order = "HARDWARE,STORAGE,OVERLOAD,NETWORKING,DISTRIBUTED,REPLICATION,SQL,CHANGEFEEDS,TTL,CROSS_CLUSTER_REPLICATION,LOGICAL_DATA_REPLICATION,UNSET," %}
+
+These essential CockroachDB metrics let you monitor your CockroachDB {{ site.data.products.core }} cluster. Use them to build custom dashboards with the following tools:
 
 - [Grafana]({% link {{ page.version.version }}/monitor-cockroachdb-with-prometheus.md %}#step-5-visualize-metrics-in-grafana)
 - [Datadog Integration]({% link {{ page.version.version }}/datadog.md %}): The [**Datadog Integration Metric Name**]({{ datadog_link }}) column lists the corresponding Datadog metric which requires the `{{ datadog_prefix }}.` prefix.
@@ -18,7 +18,9 @@ These essential CockroachDB metrics let you monitor your CockroachDB {{ site.dat
   {% assign datadog_link = "https://docs.datadoghq.com/integrations/cockroach-cloud/#metrics" %}
   {% assign datadog_prefix = "crdb_dedicated" %}
 {% comment %} Removed NETWORKING category for advanced deployment {% endcomment %}
-  {% assign category_order = "HARDWARE,STORAGE,OVERLOAD,DISTRIBUTED,REPLICATION,SQL,CHANGEFEEDS,TTL,UNSET," %}
+  {% assign category_order = "HARDWARE,STORAGE,OVERLOAD,DISTRIBUTED,REPLICATION,SQL,CHANGEFEEDS,TTL,CROSS_CLUSTER_REPLICATION,LOGICAL_DATA_REPLICATION,UNSET," %}
+
+These essential CockroachDB metrics let you monitor your CockroachDB {{ site.data.products.advanced }} cluster. Use them to build custom dashboards with the following tools:
 
 - [Datadog integration]({% link cockroachcloud/tools-page.md %}#monitor-cockroachdb-cloud-with-datadog) - The [**Datadog Integration Metric Name**]({{ datadog_link }}) column lists the corresponding Datadog metric which requires the `{{ datadog_prefix }}` prefix.
 - [Metrics export]({% link cockroachcloud/export-metrics-advanced.md %})
@@ -56,7 +58,7 @@ The **Usage** column explains why each metric is important to visualize and how
 
 {% comment %} Order categories, NOTE: new categories may break this order, however all relevant categories will be displayed though not in the desired order{% endcomment %}
 {% comment %}DEBUG: category_names_string = {{ category_names_string }}{% endcomment %}
-{% assign category_names_string_ordered = category_names_string | replace: "CHANGEFEEDS,DISTRIBUTED,NETWORKING,SQL,TTL,UNSET,HARDWARE,OVERLOAD,REPLICATION,STORAGE,", category_order  %}
+{% assign category_names_string_ordered = category_names_string | replace: "CHANGEFEEDS,CROSS_CLUSTER_REPLICATION,DISTRIBUTED,LOGICAL_DATA_REPLICATION,NETWORKING,SQL,TTL,UNSET,HARDWARE,OVERLOAD,STORAGE,", category_order  %}
 {% comment %}DEBUG: category_names_string_ordered = {{ category_names_string_ordered }}{% endcomment %}
 {% assign category_names_array = category_names_string_ordered | split: "," %}
 
@@ -90,6 +92,8 @@ The **Usage** column explains why each metric is important to visualize and how
       {% elsif category_name == "REPLICATION" %}{% assign category_display_name = "KV Replication" %}
       {% elsif category_name == "CHANGEFEEDS" %}{% assign category_display_name = "Changefeeds" %}
       {% elsif category_name == "TTL" %}{% assign category_display_name = "Row-level TTL" %}
+      {% elsif category_name == "CROSS_CLUSTER_REPLICATION" %}{% assign category_display_name = "Physical Replication" %}
+      {% elsif category_name == "LOGICAL_DATA_REPLICATION" %}{% assign category_display_name = "Logical Replication" %}
       {% else %}{% assign category_display_name = category_name %}{% comment %} For example, SQL {% endcomment %}
       {% endif %}
 

src/current/_includes/v25.4/essential-metrics.md

@@ -15,6 +15,12 @@ This page describes how to configure CockroachDB logs with the [`--log` or `log-
 
 For examples of how these settings can be used in practice, see [Logging Use Cases]({% link {{ page.version.version }}/logging-use-cases.md %}).
 
+{{site.data.alerts.callout_info}}
+In a future major release, certain events will be directed by default to new [logging channels]({% link {{ page.version.version }}/logging-overview.md %}#logging-channels).
+
+To prepare for the change and assess potential downstream impacts on your logging setup and pipelines, review the [`log.channel_compatibility_mode.enabled`]({% link {{ page.version.version }}/logging-overview.md %}#log-channel_compatibility_mode-enabled) cluster setting. After reviewing the documentation, set `log.channel_compatibility_mode.enabled` to `false` in a non-production environment.
+{{site.data.alerts.end}}
+
 ## Flag
 
 To configure the logging behavior of a `cockroach` command, include one of these flags with the command:
@@ -865,6 +871,19 @@ sinks:
       redactable: true
       exit-on-error: true
       buffering: NONE
+    kv-exec:
+      channels: {INFO: [KV_EXEC]}
+      dir: /cockroach-data/logs
+      max-file-size: 10MiB
+      max-group-size: 100MiB
+      file-permissions: "0640"
+      buffered-writes: true
+      filter: INFO
+      format: crdb-v2
+      redact: false
+      redactable: true
+      exit-on-error: true
+      buffering: NONE
     pebble:
       channels: {INFO: [STORAGE]}
       dir: /cockroach-data/logs

src/current/v25.4/configure-logs.md

@@ -7,6 +7,12 @@ docs_area: manage
 
 This tutorial describes how to configure logging of telemetry events, including [`sampled_query`]({% link {{ page.version.version }}/eventlog.md %}#sampled_query) and [`sampled_transaction`]({% link {{ page.version.version }}/eventlog.md %}#sampled_query), to [Datadog](https://www.datadoghq.com/) for finer granularity and long-term retention of SQL activity. The `sampled_query` and `sampled_transaction` events contain common SQL event and execution details for [statements]({% link {{ page.version.version }}/sql-statements.md %}) and [transactions]({% link {{ page.version.version }}/transactions.md %}).
 
+{{site.data.alerts.callout_info}}
+`sampled_query` and `sampled_transaction` events, which are sent by default to the [`TELEMETRY`]({% link {{ page.version.version }}/logging-overview.md %}#telemetry) channel in {{ page.version.version }} and earlier versions, will instead be routed by default to the [`SQL_EXEC`]({% link {{ page.version.version }}/logging-overview.md %}#sql_exec) channel in a future major release.
+
+To prepare for the change and assess potential downstream impacts on your logging setup and pipelines, review the [`log.channel_compatibility_mode.enabled`]({% link {{ page.version.version }}/logging-overview.md %}#log-channel_compatibility_mode-enabled) cluster setting. After reviewing the documentation, set `log.channel_compatibility_mode.enabled` to `false` in a non-production environment to log `sampled_query` and `sampled_transaction` events to the [SQL_EXEC]({% link {{ page.version.version }}/logging-overview.md %}#sql_exec) channel.
+{{site.data.alerts.end}}
+
 CockroachDB supports a built-in integration with Datadog which sends these events as logs via the [Datadog HTTP API](https://docs.datadoghq.com/api/latest/logs/). This integration is the recommended path to achieve high throughput data ingestion, which will in turn provide more query and transaction events for greater workload observability.
 
 {{site.data.alerts.callout_info}}