From e2af2e9feb62718657c0c75563325f0a8b159752 Mon Sep 17 00:00:00 2001 From: Florence Morris Date: Sun, 16 Nov 2025 19:26:48 -0500 Subject: [PATCH 1/4] 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. --- .../available-metrics-in-metrics-list.csv | 5 ++++ .../v25.4/metrics/export/crdb_metrics.yaml | 4 +++ .../v25.4/metrics/export/shared_metrics.yaml | 29 ++++++++++++++++++- src/current/_includes/v25.4/metric-names.md | 10 +++---- 4 files changed, 42 insertions(+), 6 deletions(-) diff --git a/src/current/_data/v25.4/metrics/available-metrics-in-metrics-list.csv b/src/current/_data/v25.4/metrics/available-metrics-in-metrics-list.csv index 9d3adad338f..18fa003dc40 100644 --- a/src/current/_data/v25.4/metrics/available-metrics-in-metrics-list.csv +++ b/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 diff --git a/src/current/_data/v25.4/metrics/export/crdb_metrics.yaml b/src/current/_data/v25.4/metrics/export/crdb_metrics.yaml index 8c75fe9b97a..a3fce86bfde 100644 --- a/src/current/_data/v25.4/metrics/export/crdb_metrics.yaml +++ b/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 diff --git a/src/current/_data/v25.4/metrics/export/shared_metrics.yaml b/src/current/_data/v25.4/metrics/export/shared_metrics.yaml index a69be422277..d4e0950336c 100644 --- a/src/current/_data/v25.4/metrics/export/shared_metrics.yaml +++ b/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 diff --git a/src/current/_includes/v25.4/metric-names.md b/src/current/_includes/v25.4/metric-names.md index 1ca26b23b23..7ccc080346e 100644 --- a/src/current/_includes/v25.4/metric-names.md +++ b/src/current/_includes/v25.4/metric-names.md @@ -42,18 +42,18 @@ {%- 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 -%} From 7e70847a45acb0be42746d11e8f9956f6c543ada Mon Sep 17 00:00:00 2001 From: Florence Morris Date: Mon, 17 Nov 2025 10:12:32 -0500 Subject: [PATCH 2/4] restart deploy-preview From f0e38795802ff4a062cc4e4ce3c9c1c9bd7c72fb Mon Sep 17 00:00:00 2001 From: Florence Morris Date: Tue, 9 Dec 2025 12:02:31 -0500 Subject: [PATCH 3/4] Copied files to v26.1 branch. --- .../available-metrics-in-metrics-list.csv | 5 ++++ .../v26.1/metrics/export/crdb_metrics.yaml | 4 +++ .../v26.1/metrics/export/shared_metrics.yaml | 29 ++++++++++++++++++- src/current/_includes/v26.1/metric-names.md | 10 +++---- 4 files changed, 42 insertions(+), 6 deletions(-) diff --git a/src/current/_data/v26.1/metrics/available-metrics-in-metrics-list.csv b/src/current/_data/v26.1/metrics/available-metrics-in-metrics-list.csv index 9d3adad338f..18fa003dc40 100644 --- a/src/current/_data/v26.1/metrics/available-metrics-in-metrics-list.csv +++ b/src/current/_data/v26.1/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 diff --git a/src/current/_data/v26.1/metrics/export/crdb_metrics.yaml b/src/current/_data/v26.1/metrics/export/crdb_metrics.yaml index 8c75fe9b97a..a3fce86bfde 100644 --- a/src/current/_data/v26.1/metrics/export/crdb_metrics.yaml +++ b/src/current/_data/v26.1/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 diff --git a/src/current/_data/v26.1/metrics/export/shared_metrics.yaml b/src/current/_data/v26.1/metrics/export/shared_metrics.yaml index a69be422277..d4e0950336c 100644 --- a/src/current/_data/v26.1/metrics/export/shared_metrics.yaml +++ b/src/current/_data/v26.1/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 diff --git a/src/current/_includes/v26.1/metric-names.md b/src/current/_includes/v26.1/metric-names.md index 1ca26b23b23..7ccc080346e 100644 --- a/src/current/_includes/v26.1/metric-names.md +++ b/src/current/_includes/v26.1/metric-names.md @@ -42,18 +42,18 @@ {%- 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 -%} From 896d74a20d128fa6f776ee0c1432c000994dd265 Mon Sep 17 00:00:00 2001 From: Florence Morris Date: Tue, 9 Dec 2025 12:24:01 -0500 Subject: [PATCH 4/4] In available-metrics-in-metrics-list.csv, removed metrics that are no longer in metrics.yaml. --- .../v25.4/metrics/available-metrics-in-metrics-list.csv | 8 -------- .../v26.1/metrics/available-metrics-in-metrics-list.csv | 8 -------- 2 files changed, 16 deletions(-) diff --git a/src/current/_data/v25.4/metrics/available-metrics-in-metrics-list.csv b/src/current/_data/v25.4/metrics/available-metrics-in-metrics-list.csv index 18fa003dc40..9559de44056 100644 --- a/src/current/_data/v25.4/metrics/available-metrics-in-metrics-list.csv +++ b/src/current/_data/v25.4/metrics/available-metrics-in-metrics-list.csv @@ -392,10 +392,6 @@ jobs.auto_config_task.currently_paused jobs.auto_config_task.protected_age_sec jobs.auto_config_task.protected_record_count jobs.auto_create_partial_stats.currently_paused -jobs.auto_create_partial_stats.protected_age_sec -jobs.auto_create_partial_stats.protected_record_count -jobs.auto_create_stats.protected_age_sec -jobs.auto_create_stats.protected_record_count jobs.auto_schema_telemetry.currently_paused jobs.auto_schema_telemetry.protected_age_sec jobs.auto_schema_telemetry.protected_record_count @@ -412,8 +408,6 @@ jobs.backup.protected_age_sec jobs.backup.protected_record_count jobs.changefeed.protected_record_count jobs.create_stats.currently_paused -jobs.create_stats.protected_age_sec -jobs.create_stats.protected_record_count jobs.history_retention.currently_paused jobs.history_retention.protected_age_sec jobs.history_retention.protected_record_count @@ -421,8 +415,6 @@ jobs.import.currently_paused jobs.import.protected_age_sec jobs.import.protected_record_count jobs.import_rollback.currently_paused -jobs.import_rollback.protected_age_sec -jobs.import_rollback.protected_record_count jobs.key_visualizer.currently_paused jobs.key_visualizer.protected_age_sec jobs.key_visualizer.protected_record_count diff --git a/src/current/_data/v26.1/metrics/available-metrics-in-metrics-list.csv b/src/current/_data/v26.1/metrics/available-metrics-in-metrics-list.csv index 18fa003dc40..9559de44056 100644 --- a/src/current/_data/v26.1/metrics/available-metrics-in-metrics-list.csv +++ b/src/current/_data/v26.1/metrics/available-metrics-in-metrics-list.csv @@ -392,10 +392,6 @@ jobs.auto_config_task.currently_paused jobs.auto_config_task.protected_age_sec jobs.auto_config_task.protected_record_count jobs.auto_create_partial_stats.currently_paused -jobs.auto_create_partial_stats.protected_age_sec -jobs.auto_create_partial_stats.protected_record_count -jobs.auto_create_stats.protected_age_sec -jobs.auto_create_stats.protected_record_count jobs.auto_schema_telemetry.currently_paused jobs.auto_schema_telemetry.protected_age_sec jobs.auto_schema_telemetry.protected_record_count @@ -412,8 +408,6 @@ jobs.backup.protected_age_sec jobs.backup.protected_record_count jobs.changefeed.protected_record_count jobs.create_stats.currently_paused -jobs.create_stats.protected_age_sec -jobs.create_stats.protected_record_count jobs.history_retention.currently_paused jobs.history_retention.protected_age_sec jobs.history_retention.protected_record_count @@ -421,8 +415,6 @@ jobs.import.currently_paused jobs.import.protected_age_sec jobs.import.protected_record_count jobs.import_rollback.currently_paused -jobs.import_rollback.protected_age_sec -jobs.import_rollback.protected_record_count jobs.key_visualizer.currently_paused jobs.key_visualizer.protected_age_sec jobs.key_visualizer.protected_record_count