Updated crdb_metrics.yaml and shared_metrics.yaml from https://github.com/cockroachlabs/managed-service/tree/88fab7c0da5da662b90759202e04f18732c006d9/pkg/otel/assets.

In available-metrics-in-metrics-list.csv, added 5 metrics.

In metric-names.md, updated the check to look at shared_metrics.yaml first.

Author: florence-crl

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

@@ -491,3 +491,8 @@ sql.routine.select.count
 sql.routine.select.started.count
 sql.routine.update.count
 sql.routine.update.started.count
+admission.wait_durations.kv
+admission.wait_durations.kv-stores
+storage.wal.fsync.latency
+sql.conn.failures
+sql.mem.sql.current

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

@@ -7,6 +7,9 @@ metrics:
   addsstable_applications: sum
   addsstable_copies: sum
   addsstable_proposals: sum
+  admission_io_overload: mean
+  admission_wait_durations_kv: sum
+  admission_wait_durations_kv_stores: sum
   admission_wait_sum_kv: sum
   admission_wait_sum_kv_stores: sum
   admission_wait_sum_sql_kv_response: sum
@@ -184,6 +187,7 @@ metrics:
   security_certificate_expiration_ca: max
   storage_l0_num_files: sum
   storage_l0_sublevels: sum
+  storage_wal_fsync_latency: sum
   sys_cgo_allocbytes: sum
   sys_cgo_totalbytes: sum
   sys_cgocalls: sum

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

@@ -18,6 +18,7 @@ metrics:
   changefeed_backfill_count: sum
   changefeed_backfill_pending_ranges: sum
   changefeed_commit_latency: sum
+  changefeed_emitted_bytes: sum
   changefeed_emitted_messages: sum
   changefeed_error_retries: sum
   changefeed_failures: sum
@@ -32,7 +33,29 @@ metrics:
   distsender_rpc_sent: sum
   distsender_rpc_sent_local: sum
   distsender_rpc_sent_nextreplicaerror: sum
+  jobs_changefeed_currently_paused: sum
+  jobs_changefeed_protected_age_sec: max
   jobs_changefeed_resume_retry_error: sum
+  jobs_row_level_ttl_currently_paused: sum
+  jobs_row_level_ttl_currently_running: sum
+  jobs_row_level_ttl_delete_duration: sum
+  jobs_row_level_ttl_num_active_spans: sum
+  jobs_row_level_ttl_resume_completed: sum
+  jobs_row_level_ttl_resume_failed: sum
+  jobs_row_level_ttl_rows_deleted: sum
+  jobs_row_level_ttl_rows_selected: sum
+  jobs_row_level_ttl_select_duration: sum
+  jobs_row_level_ttl_span_total_duration: sum
+  jobs_row_level_ttl_total_expired_rows: sum
+  jobs_scheduled_row_level_ttl_executor_failed: sum
+  queue_replicate_replacedecommissioningreplica_error: sum
+  range_merges: sum
+  rebalancing_cpunanospersecond: sum
+  rebalancing_lease_transfers: sum
+  rebalancing_queriespersecond: sum
+  rebalancing_range_rebalances: sum
+  rebalancing_replicas_cpunanospersecond: sum
+  rebalancing_replicas_queriespersecond: sum
   requests_slow_distsender: sum
   round_trip_latency: sum
   schedules_BACKUP_failed: sum
@@ -41,6 +64,7 @@ metrics:
   schedules_BACKUP_succeeded: sum
   sql_bytesin: sum
   sql_bytesout: sum
+  sql_conn_failures: sum
   sql_conn_latency: sum
   sql_conns: sum
   sql_ddl_count: sum
@@ -63,7 +87,6 @@ metrics:
   sql_mem_internal_session_max: max
   sql_mem_internal_txn_current: sum
   sql_mem_internal_txn_max: max
-  sql_mem_root_current: sum
   sql_misc_count: sum
   sql_new_conns: sum
   sql_query_count: sum
@@ -84,4 +107,8 @@ metrics:
   txn_durations: sum
   txn_restarts: sum
   txn_restarts_serializable: sum
+  txn_restarts_txnaborted: sum
+  txn_restarts_txnpush: sum
+  txn_restarts_unknown: sum
   txn_restarts_writetooold: sum
+  txnwaitqueue_deadlocks_total: sum

src/current/_includes/v25.4/metric-names.md

@@ -42,18 +42,18 @@
             <td>
                 {%- assign key = m.metric_id | replace: '.', '_'  | replace: '-', '_'-%}{%- comment -%} Replace periods and hyphens with underscores to normalize. {%- endcomment -%}
                 {%- comment -%}
-                - If in crdb_metrics.yaml      -> "Advanced/self-hosted"
-                - Else if in shared_metrics.yaml -> "Standard/Advanced/self-hosted"
+                - If in shared_metrics.yaml      -> "Standard/Advanced/self-hosted"
+                - Else if in crdb_metrics.yaml   -> "Advanced/self-hosted"
                 - Else if in tenant_metrics.yaml -> "Standard/self-hosted"
                 - Else                           -> "self-hosted"
                 {%- endcomment -%}
 
-                {%- assign crdb_match    = site.data[version].metrics.export.crdb_metrics.metrics[key] -%}
                 {%- assign shared_match  = site.data[version].metrics.export.shared_metrics.metrics[key] -%}
+                {%- assign crdb_match    = site.data[version].metrics.export.crdb_metrics.metrics[key] -%}
                 {%- assign tenant_match  = site.data[version].metrics.export.tenant_metrics.metrics[key] -%}
 
-                {%- if crdb_match -%}{{ site.data.products.advanced }}/{{ site.data.products.core }}
-                {%- elsif shared_match -%}{{ site.data.products.standard }}/{{ site.data.products.advanced }}/{{ site.data.products.core }}
+                {%- if shared_match -%}{{ site.data.products.standard }}/{{ site.data.products.advanced }}/{{ site.data.products.core }}
+                {%- elsif crdb_match -%}{{ site.data.products.advanced }}/{{ site.data.products.core }}
                 {%- elsif tenant_match -%}{{ site.data.products.standard }}/{{ site.data.products.core }}
                 {%- else -%}{{ site.data.products.core }}
                 {%- endif -%}