Skip to content

Commit f1438a3

Browse files
authored
metric: display the user metrics by default in transaction and kv panels (#42510)
ref #41203
1 parent ea7a37c commit f1438a3

File tree

1 file changed

+17
-15
lines changed

1 file changed

+17
-15
lines changed

metrics/grafana/tidb.json

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4422,10 +4422,10 @@
44224422
"steppedLine": false,
44234423
"targets": [
44244424
{
4425-
"expr": "sum(rate(tidb_tikvclient_txn_cmd_duration_seconds_count{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", type=\"commit\"}[1m])) by (instance)",
4425+
"expr": "sum(rate(tidb_tikvclient_txn_cmd_duration_seconds_count{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", scope=~\"general\"}[1m])) by (instance, type)",
44264426
"format": "time_series",
44274427
"intervalFactor": 2,
4428-
"legendFormat": "{{instance}}",
4428+
"legendFormat": "{{instance}}-{{type}}",
44294429
"refId": "A",
44304430
"step": 40
44314431
}
@@ -4524,7 +4524,7 @@
45244524
"steppedLine": false,
45254525
"targets": [
45264526
{
4527-
"expr": "histogram_quantile(0.99, sum(rate(tidb_tikvclient_txn_cmd_duration_seconds_bucket{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[1m])) by (le, type))",
4527+
"expr": "histogram_quantile(0.99, sum(rate(tidb_tikvclient_txn_cmd_duration_seconds_bucket{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", scope=~\"general\"}[1m])) by (le, type))",
45284528
"format": "time_series",
45294529
"intervalFactor": 2,
45304530
"legendFormat": "99-{{type}}",
@@ -4533,13 +4533,15 @@
45334533
{
45344534
"expr": "histogram_quantile(0.95, sum(rate(tidb_tikvclient_txn_cmd_duration_seconds_bucket{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[1m])) by (le, type))",
45354535
"format": "time_series",
4536+
"hide": true,
45364537
"intervalFactor": 2,
45374538
"legendFormat": "95-{{type}}",
45384539
"refId": "B"
45394540
},
45404541
{
45414542
"expr": "histogram_quantile(0.80, sum(rate(tidb_tikvclient_txn_cmd_duration_seconds_bucket{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[1m])) by (le, type))",
45424543
"format": "time_series",
4544+
"hide": true,
45434545
"intervalFactor": 2,
45444546
"legendFormat": "80-{{type}}",
45454547
"refId": "C"
@@ -4622,7 +4624,7 @@
46224624
"reverseYBuckets": false,
46234625
"targets": [
46244626
{
4625-
"expr": "sum(increase(tidb_tikvclient_txn_regions_num_bucket{instance=~\"$instance\", type=\"2pc_prewrite\"}[1m])) by (le)",
4627+
"expr": "sum(increase(tidb_tikvclient_txn_regions_num_bucket{instance=~\"$instance\", type=\"2pc_prewrite\", scope=~\"general\"}[1m])) by (le)",
46264628
"format": "heatmap",
46274629
"intervalFactor": 2,
46284630
"legendFormat": "{{le}}",
@@ -4718,14 +4720,14 @@
47184720
"steppedLine": false,
47194721
"targets": [
47204722
{
4721-
"expr": "rate(tidb_tikvclient_txn_write_kv_num_sum{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[30s])",
4723+
"expr": "rate(tidb_tikvclient_txn_write_kv_num_sum{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", scope=~\"general\"}[30s])",
47224724
"format": "time_series",
47234725
"intervalFactor": 1,
47244726
"legendFormat": "{{instance}}-rate",
47254727
"refId": "A"
47264728
},
47274729
{
4728-
"expr": "tidb_tikvclient_txn_write_kv_num_sum{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}",
4730+
"expr": "tidb_tikvclient_txn_write_kv_num_sum{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", scope=~\"general\"}",
47294731
"format": "time_series",
47304732
"intervalFactor": 1,
47314733
"legendFormat": "{{instance}}-sum",
@@ -4811,7 +4813,7 @@
48114813
"reverseYBuckets": false,
48124814
"targets": [
48134815
{
4814-
"expr": "sum(increase(tidb_tikvclient_txn_write_kv_num_bucket{instance=~\"$instance\"}[1m])) by (le)",
4816+
"expr": "sum(increase(tidb_tikvclient_txn_write_kv_num_bucket{instance=~\"$instance\", scope=~\"general\"}[1m])) by (le)",
48154817
"format": "heatmap",
48164818
"intervalFactor": 1,
48174819
"legendFormat": "{{le}}",
@@ -5098,15 +5100,15 @@
50985100
"steppedLine": false,
50995101
"targets": [
51005102
{
5101-
"expr": "rate(tidb_tikvclient_txn_write_size_bytes_sum{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[30s])",
5103+
"expr": "rate(tidb_tikvclient_txn_write_size_bytes_sum{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", scope=~\"general\"}[30s])",
51025104
"format": "time_series",
51035105
"intervalFactor": 1,
51045106
"legendFormat": "{{instance}}-rate",
51055107
"refId": "A",
51065108
"step": 40
51075109
},
51085110
{
5109-
"expr": "tidb_tikvclient_txn_write_size_bytes_sum{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}",
5111+
"expr": "tidb_tikvclient_txn_write_size_bytes_sum{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", scope=~\"general\"}",
51105112
"format": "time_series",
51115113
"intervalFactor": 1,
51125114
"legendFormat": "{{instance}}-sum",
@@ -5191,7 +5193,7 @@
51915193
"reverseYBuckets": false,
51925194
"targets": [
51935195
{
5194-
"expr": "sum(increase(tidb_tikvclient_txn_write_size_bytes_bucket{instance=~\"$instance\"}[1m])) by (le)",
5196+
"expr": "sum(increase(tidb_tikvclient_txn_write_size_bytes_bucket{instance=~\"$instance\", scope=~\"general\"}[1m])) by (le)",
51955197
"format": "heatmap",
51965198
"intervalFactor": 1,
51975199
"legendFormat": "{{le}}",
@@ -9380,7 +9382,7 @@
93809382
"steppedLine": false,
93819383
"targets": [
93829384
{
9383-
"expr": "sum(rate(tidb_tikvclient_request_seconds_count{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[1m])) by (instance, type)",
9385+
"expr": "sum(rate(tidb_tikvclient_request_seconds_count{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", scope=\"false\"}[1m])) by (instance, type)",
93849386
"format": "time_series",
93859387
"intervalFactor": 2,
93869388
"legendFormat": "{{instance}}-{{type}}",
@@ -9475,7 +9477,7 @@
94759477
"steppedLine": false,
94769478
"targets": [
94779479
{
9478-
"expr": "histogram_quantile(0.99, sum(rate(tidb_tikvclient_request_seconds_bucket{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", store!=\"0\"}[1m])) by (le, store))",
9480+
"expr": "histogram_quantile(0.99, sum(rate(tidb_tikvclient_request_seconds_bucket{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", store!=\"0\", scope=\"false\"}[1m])) by (le, store))",
94799481
"format": "time_series",
94809482
"intervalFactor": 2,
94819483
"legendFormat": "store-{{store}}",
@@ -9570,7 +9572,7 @@
95709572
"steppedLine": false,
95719573
"targets": [
95729574
{
9573-
"expr": "histogram_quantile(0.99, sum(rate(tidb_tikvclient_request_seconds_bucket{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", store!=\"0\"}[1m])) by (le,type))",
9575+
"expr": "histogram_quantile(0.99, sum(rate(tidb_tikvclient_request_seconds_bucket{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", store!=\"0\", scope=\"false\"}[1m])) by (le,type))",
95749576
"format": "time_series",
95759577
"intervalFactor": 2,
95769578
"legendFormat": "{{type}}",
@@ -10139,7 +10141,7 @@
1013910141
"targets": [
1014010142
{
1014110143
"exemplar": true,
10142-
"expr": "histogram_quantile(0.99, sum(rate(tidb_tikvclient_rpc_net_latency_seconds_bucket{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[1m])) by (le, store))",
10144+
"expr": "histogram_quantile(0.99, sum(rate(tidb_tikvclient_rpc_net_latency_seconds_bucket{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", scope=\"false\"}[1m])) by (le, store))",
1014310145
"format": "time_series",
1014410146
"interval": "",
1014510147
"intervalFactor": 2,
@@ -10148,7 +10150,7 @@
1014810150
},
1014910151
{
1015010152
"exemplar": true,
10151-
"expr": "sum(rate(tidb_tikvclient_rpc_net_latency_seconds_sum{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[1m])) by (le, store) / sum(rate(tidb_tikvclient_rpc_net_latency_seconds_count{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[1m])) by (le, store)",
10153+
"expr": "sum(rate(tidb_tikvclient_rpc_net_latency_seconds_sum{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", scope=\"false\"}[1m])) by (le, store) / sum(rate(tidb_tikvclient_rpc_net_latency_seconds_count{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", scope=\"false\"}[1m])) by (le, store)",
1015210154
"format": "time_series",
1015310155
"interval": "",
1015410156
"intervalFactor": 2,

0 commit comments

Comments
 (0)