Skip to content

Commit e8085cd

Browse files
bsanchez-the-roachbsanchez-the-roach
authored
Merge branch 'main' into DOC-14111 
2 parents 65ac503 + 55188c2 commit e8085cd

File tree

8 files changed

+84
-28
lines changed

8 files changed

+84
-28
lines changed

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -392,10 +392,6 @@ jobs.auto_config_task.currently_paused
392392
jobs.auto_config_task.protected_age_sec
393393
jobs.auto_config_task.protected_record_count
394394
jobs.auto_create_partial_stats.currently_paused
395-
jobs.auto_create_partial_stats.protected_age_sec
396-
jobs.auto_create_partial_stats.protected_record_count
397-
jobs.auto_create_stats.protected_age_sec
398-
jobs.auto_create_stats.protected_record_count
399395
jobs.auto_schema_telemetry.currently_paused
400396
jobs.auto_schema_telemetry.protected_age_sec
401397
jobs.auto_schema_telemetry.protected_record_count
@@ -412,17 +408,13 @@ jobs.backup.protected_age_sec
412408
jobs.backup.protected_record_count
413409
jobs.changefeed.protected_record_count
414410
jobs.create_stats.currently_paused
415-
jobs.create_stats.protected_age_sec
416-
jobs.create_stats.protected_record_count
417411
jobs.history_retention.currently_paused
418412
jobs.history_retention.protected_age_sec
419413
jobs.history_retention.protected_record_count
420414
jobs.import.currently_paused
421415
jobs.import.protected_age_sec
422416
jobs.import.protected_record_count
423417
jobs.import_rollback.currently_paused
424-
jobs.import_rollback.protected_age_sec
425-
jobs.import_rollback.protected_record_count
426418
jobs.key_visualizer.currently_paused
427419
jobs.key_visualizer.protected_age_sec
428420
jobs.key_visualizer.protected_record_count
@@ -491,3 +483,8 @@ sql.routine.select.count
491483
sql.routine.select.started.count
492484
sql.routine.update.count
493485
sql.routine.update.started.count
486+
admission.wait_durations.kv
487+
admission.wait_durations.kv-stores
488+
storage.wal.fsync.latency
489+
sql.conn.failures
490+
sql.mem.sql.current

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ metrics:
77
addsstable_applications: sum
88
addsstable_copies: sum
99
addsstable_proposals: sum
10+
admission_io_overload: mean
11+
admission_wait_durations_kv: sum
12+
admission_wait_durations_kv_stores: sum
1013
admission_wait_sum_kv: sum
1114
admission_wait_sum_kv_stores: sum
1215
admission_wait_sum_sql_kv_response: sum
@@ -184,6 +187,7 @@ metrics:
184187
security_certificate_expiration_ca: max
185188
storage_l0_num_files: sum
186189
storage_l0_sublevels: sum
190+
storage_wal_fsync_latency: sum
187191
sys_cgo_allocbytes: sum
188192
sys_cgo_totalbytes: sum
189193
sys_cgocalls: sum

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

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ metrics:
1818
changefeed_backfill_count: sum
1919
changefeed_backfill_pending_ranges: sum
2020
changefeed_commit_latency: sum
21+
changefeed_emitted_bytes: sum
2122
changefeed_emitted_messages: sum
2223
changefeed_error_retries: sum
2324
changefeed_failures: sum
@@ -32,7 +33,29 @@ metrics:
3233
distsender_rpc_sent: sum
3334
distsender_rpc_sent_local: sum
3435
distsender_rpc_sent_nextreplicaerror: sum
36+
jobs_changefeed_currently_paused: sum
37+
jobs_changefeed_protected_age_sec: max
3538
jobs_changefeed_resume_retry_error: sum
39+
jobs_row_level_ttl_currently_paused: sum
40+
jobs_row_level_ttl_currently_running: sum
41+
jobs_row_level_ttl_delete_duration: sum
42+
jobs_row_level_ttl_num_active_spans: sum
43+
jobs_row_level_ttl_resume_completed: sum
44+
jobs_row_level_ttl_resume_failed: sum
45+
jobs_row_level_ttl_rows_deleted: sum
46+
jobs_row_level_ttl_rows_selected: sum
47+
jobs_row_level_ttl_select_duration: sum
48+
jobs_row_level_ttl_span_total_duration: sum
49+
jobs_row_level_ttl_total_expired_rows: sum
50+
jobs_scheduled_row_level_ttl_executor_failed: sum
51+
queue_replicate_replacedecommissioningreplica_error: sum
52+
range_merges: sum
53+
rebalancing_cpunanospersecond: sum
54+
rebalancing_lease_transfers: sum
55+
rebalancing_queriespersecond: sum
56+
rebalancing_range_rebalances: sum
57+
rebalancing_replicas_cpunanospersecond: sum
58+
rebalancing_replicas_queriespersecond: sum
3659
requests_slow_distsender: sum
3760
round_trip_latency: sum
3861
schedules_BACKUP_failed: sum
@@ -41,6 +64,7 @@ metrics:
4164
schedules_BACKUP_succeeded: sum
4265
sql_bytesin: sum
4366
sql_bytesout: sum
67+
sql_conn_failures: sum
4468
sql_conn_latency: sum
4569
sql_conns: sum
4670
sql_ddl_count: sum
@@ -63,7 +87,6 @@ metrics:
6387
sql_mem_internal_session_max: max
6488
sql_mem_internal_txn_current: sum
6589
sql_mem_internal_txn_max: max
66-
sql_mem_root_current: sum
6790
sql_misc_count: sum
6891
sql_new_conns: sum
6992
sql_query_count: sum
@@ -84,4 +107,8 @@ metrics:
84107
txn_durations: sum
85108
txn_restarts: sum
86109
txn_restarts_serializable: sum
110+
txn_restarts_txnaborted: sum
111+
txn_restarts_txnpush: sum
112+
txn_restarts_unknown: sum
87113
txn_restarts_writetooold: sum
114+
txnwaitqueue_deadlocks_total: sum

‎src/current/_data/v26.1/metrics/available-metrics-in-metrics-list.csv‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -392,10 +392,6 @@ jobs.auto_config_task.currently_paused
392392
jobs.auto_config_task.protected_age_sec
393393
jobs.auto_config_task.protected_record_count
394394
jobs.auto_create_partial_stats.currently_paused
395-
jobs.auto_create_partial_stats.protected_age_sec
396-
jobs.auto_create_partial_stats.protected_record_count
397-
jobs.auto_create_stats.protected_age_sec
398-
jobs.auto_create_stats.protected_record_count
399395
jobs.auto_schema_telemetry.currently_paused
400396
jobs.auto_schema_telemetry.protected_age_sec
401397
jobs.auto_schema_telemetry.protected_record_count
@@ -412,17 +408,13 @@ jobs.backup.protected_age_sec
412408
jobs.backup.protected_record_count
413409
jobs.changefeed.protected_record_count
414410
jobs.create_stats.currently_paused
415-
jobs.create_stats.protected_age_sec
416-
jobs.create_stats.protected_record_count
417411
jobs.history_retention.currently_paused
418412
jobs.history_retention.protected_age_sec
419413
jobs.history_retention.protected_record_count
420414
jobs.import.currently_paused
421415
jobs.import.protected_age_sec
422416
jobs.import.protected_record_count
423417
jobs.import_rollback.currently_paused
424-
jobs.import_rollback.protected_age_sec
425-
jobs.import_rollback.protected_record_count
426418
jobs.key_visualizer.currently_paused
427419
jobs.key_visualizer.protected_age_sec
428420
jobs.key_visualizer.protected_record_count
@@ -491,3 +483,8 @@ sql.routine.select.count
491483
sql.routine.select.started.count
492484
sql.routine.update.count
493485
sql.routine.update.started.count
486+
admission.wait_durations.kv
487+
admission.wait_durations.kv-stores
488+
storage.wal.fsync.latency
489+
sql.conn.failures
490+
sql.mem.sql.current

‎src/current/_data/v26.1/metrics/export/crdb_metrics.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ metrics:
77
addsstable_applications: sum
88
addsstable_copies: sum
99
addsstable_proposals: sum
10+
admission_io_overload: mean
11+
admission_wait_durations_kv: sum
12+
admission_wait_durations_kv_stores: sum
1013
admission_wait_sum_kv: sum
1114
admission_wait_sum_kv_stores: sum
1215
admission_wait_sum_sql_kv_response: sum
@@ -184,6 +187,7 @@ metrics:
184187
security_certificate_expiration_ca: max
185188
storage_l0_num_files: sum
186189
storage_l0_sublevels: sum
190+
storage_wal_fsync_latency: sum
187191
sys_cgo_allocbytes: sum
188192
sys_cgo_totalbytes: sum
189193
sys_cgocalls: sum

‎src/current/_data/v26.1/metrics/export/shared_metrics.yaml‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ metrics:
1818
changefeed_backfill_count: sum
1919
changefeed_backfill_pending_ranges: sum
2020
changefeed_commit_latency: sum
21+
changefeed_emitted_bytes: sum
2122
changefeed_emitted_messages: sum
2223
changefeed_error_retries: sum
2324
changefeed_failures: sum
@@ -32,7 +33,29 @@ metrics:
3233
distsender_rpc_sent: sum
3334
distsender_rpc_sent_local: sum
3435
distsender_rpc_sent_nextreplicaerror: sum
36+
jobs_changefeed_currently_paused: sum
37+
jobs_changefeed_protected_age_sec: max
3538
jobs_changefeed_resume_retry_error: sum
39+
jobs_row_level_ttl_currently_paused: sum
40+
jobs_row_level_ttl_currently_running: sum
41+
jobs_row_level_ttl_delete_duration: sum
42+
jobs_row_level_ttl_num_active_spans: sum
43+
jobs_row_level_ttl_resume_completed: sum
44+
jobs_row_level_ttl_resume_failed: sum
45+
jobs_row_level_ttl_rows_deleted: sum
46+
jobs_row_level_ttl_rows_selected: sum
47+
jobs_row_level_ttl_select_duration: sum
48+
jobs_row_level_ttl_span_total_duration: sum
49+
jobs_row_level_ttl_total_expired_rows: sum
50+
jobs_scheduled_row_level_ttl_executor_failed: sum
51+
queue_replicate_replacedecommissioningreplica_error: sum
52+
range_merges: sum
53+
rebalancing_cpunanospersecond: sum
54+
rebalancing_lease_transfers: sum
55+
rebalancing_queriespersecond: sum
56+
rebalancing_range_rebalances: sum
57+
rebalancing_replicas_cpunanospersecond: sum
58+
rebalancing_replicas_queriespersecond: sum
3659
requests_slow_distsender: sum
3760
round_trip_latency: sum
3861
schedules_BACKUP_failed: sum
@@ -41,6 +64,7 @@ metrics:
4164
schedules_BACKUP_succeeded: sum
4265
sql_bytesin: sum
4366
sql_bytesout: sum
67+
sql_conn_failures: sum
4468
sql_conn_latency: sum
4569
sql_conns: sum
4670
sql_ddl_count: sum
@@ -63,7 +87,6 @@ metrics:
6387
sql_mem_internal_session_max: max
6488
sql_mem_internal_txn_current: sum
6589
sql_mem_internal_txn_max: max
66-
sql_mem_root_current: sum
6790
sql_misc_count: sum
6891
sql_new_conns: sum
6992
sql_query_count: sum
@@ -84,4 +107,8 @@ metrics:
84107
txn_durations: sum
85108
txn_restarts: sum
86109
txn_restarts_serializable: sum
110+
txn_restarts_txnaborted: sum
111+
txn_restarts_txnpush: sum
112+
txn_restarts_unknown: sum
87113
txn_restarts_writetooold: sum
114+
txnwaitqueue_deadlocks_total: sum

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,18 @@
4242
<td>
4343
{%- assign key = m.metric_id | replace: '.', '_' | replace: '-', '_'-%}{%- comment -%} Replace periods and hyphens with underscores to normalize. {%- endcomment -%}
4444
{%- comment -%}
45-
- If in crdb_metrics.yaml -> "Advanced/self-hosted"
46-
- Else if in shared_metrics.yaml -> "Standard/Advanced/self-hosted"
45+
- If in shared_metrics.yaml -> "Standard/Advanced/self-hosted"
46+
- Else if in crdb_metrics.yaml -> "Advanced/self-hosted"
4747
- Else if in tenant_metrics.yaml -> "Standard/self-hosted"
4848
- Else -> "self-hosted"
4949
{%- endcomment -%}
5050

51-
{%- assign crdb_match = site.data[version].metrics.export.crdb_metrics.metrics[key] -%}
5251
{%- assign shared_match = site.data[version].metrics.export.shared_metrics.metrics[key] -%}
52+
{%- assign crdb_match = site.data[version].metrics.export.crdb_metrics.metrics[key] -%}
5353
{%- assign tenant_match = site.data[version].metrics.export.tenant_metrics.metrics[key] -%}
5454

55-
{%- if crdb_match -%}{{ site.data.products.advanced }}/{{ site.data.products.core }}
56-
{%- elsif shared_match -%}{{ site.data.products.standard }}/{{ site.data.products.advanced }}/{{ site.data.products.core }}
55+
{%- if shared_match -%}{{ site.data.products.standard }}/{{ site.data.products.advanced }}/{{ site.data.products.core }}
56+
{%- elsif crdb_match -%}{{ site.data.products.advanced }}/{{ site.data.products.core }}
5757
{%- elsif tenant_match -%}{{ site.data.products.standard }}/{{ site.data.products.core }}
5858
{%- else -%}{{ site.data.products.core }}
5959
{%- endif -%}

‎src/current/_includes/v26.1/metric-names.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,18 @@
4242
<td>
4343
{%- assign key = m.metric_id | replace: '.', '_' | replace: '-', '_'-%}{%- comment -%} Replace periods and hyphens with underscores to normalize. {%- endcomment -%}
4444
{%- comment -%}
45-
- If in crdb_metrics.yaml -> "Advanced/self-hosted"
46-
- Else if in shared_metrics.yaml -> "Standard/Advanced/self-hosted"
45+
- If in shared_metrics.yaml -> "Standard/Advanced/self-hosted"
46+
- Else if in crdb_metrics.yaml -> "Advanced/self-hosted"
4747
- Else if in tenant_metrics.yaml -> "Standard/self-hosted"
4848
- Else -> "self-hosted"
4949
{%- endcomment -%}
5050

51-
{%- assign crdb_match = site.data[version].metrics.export.crdb_metrics.metrics[key] -%}
5251
{%- assign shared_match = site.data[version].metrics.export.shared_metrics.metrics[key] -%}
52+
{%- assign crdb_match = site.data[version].metrics.export.crdb_metrics.metrics[key] -%}
5353
{%- assign tenant_match = site.data[version].metrics.export.tenant_metrics.metrics[key] -%}
5454

55-
{%- if crdb_match -%}{{ site.data.products.advanced }}/{{ site.data.products.core }}
56-
{%- elsif shared_match -%}{{ site.data.products.standard }}/{{ site.data.products.advanced }}/{{ site.data.products.core }}
55+
{%- if shared_match -%}{{ site.data.products.standard }}/{{ site.data.products.advanced }}/{{ site.data.products.core }}
56+
{%- elsif crdb_match -%}{{ site.data.products.advanced }}/{{ site.data.products.core }}
5757
{%- elsif tenant_match -%}{{ site.data.products.standard }}/{{ site.data.products.core }}
5858
{%- else -%}{{ site.data.products.core }}
5959
{%- endif -%}

0 commit comments

Comments
 (0)