Skip to content

Commit 71d0c7b

Browse files
ti-chi-botti-chi-bot
authored
chore(monitor-snapshot/master): update files from upstreams (#894)
1 parent 2f88241 commit 71d0c7b

2 files changed

Lines changed: 33 additions & 21 deletions

File tree

‎monitor-snapshot/master/ansible-monitor.tar.gz‎

40 Bytes
Binary file not shown.

‎monitor-snapshot/master/operator/dashboards/overview.json‎

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@
216216
"tableColumn": "",
217217
"targets": [
218218
{
219-
"expr": "pd_cluster_status{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=\"$instance\",type=\"storage_capacity\"}",
219+
"expr": "sum(pd_cluster_status{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", type=\"storage_capacity\"})",
220220
"format": "time_series",
221221
"intervalFactor": 2,
222222
"refId": "A",
@@ -301,7 +301,7 @@
301301
"tableColumn": "",
302302
"targets": [
303303
{
304-
"expr": "pd_cluster_status{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=\"$instance\",type=\"storage_size\"}",
304+
"expr": "sum(pd_cluster_status{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", type=\"storage_size\"})",
305305
"intervalFactor": 2,
306306
"refId": "A",
307307
"step": 60
@@ -381,7 +381,7 @@
381381
"tableColumn": "",
382382
"targets": [
383383
{
384-
"expr": "pd_cluster_status{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=\"$instance\", type=\"leader_count\"}",
384+
"expr": "sum(pd_cluster_status{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", type=\"leader_count\"})",
385385
"intervalFactor": 2,
386386
"refId": "A",
387387
"step": 60
@@ -461,7 +461,7 @@
461461
"tableColumn": "",
462462
"targets": [
463463
{
464-
"expr": "sum(pd_cluster_status{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=\"$instance\", type=\"store_up_count\"})",
464+
"expr": "sum(pd_cluster_status{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", type=\"store_up_count\"})",
465465
"format": "time_series",
466466
"interval": "15s",
467467
"intervalFactor": 2,
@@ -536,52 +536,64 @@
536536
],
537537
"targets": [
538538
{
539-
"expr": "sum(pd_cluster_status{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=\"$instance\", type=\"store_disconnected_count\"})",
539+
"expr": "sum(pd_cluster_status{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", type=\"store_disconnected_count\"})",
540540
"format": "time_series",
541541
"intervalFactor": 2,
542542
"legendFormat": "Disconnect Stores",
543543
"refId": "B",
544-
"step": 20
544+
"step": 20,
545+
"instant": true,
546+
"range": false
545547
},
546548
{
547-
"expr": "sum(pd_cluster_status{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=\"$instance\", type=\"store_unhealth_count\"})",
549+
"expr": "sum(pd_cluster_status{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", type=\"store_unhealth_count\"})",
548550
"format": "time_series",
549551
"intervalFactor": 2,
550552
"legendFormat": "Unhealth Stores",
551553
"refId": "C",
552-
"step": 20
554+
"step": 20,
555+
"instant": true,
556+
"range": false
553557
},
554558
{
555-
"expr": "sum(pd_cluster_status{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=\"$instance\", type=\"store_low_space_count\"})",
559+
"expr": "sum(pd_cluster_status{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", type=\"store_low_space_count\"})",
556560
"format": "time_series",
557561
"intervalFactor": 2,
558562
"legendFormat": "LowSpace Stores",
559563
"refId": "D",
560-
"step": 20
564+
"step": 20,
565+
"instant": true,
566+
"range": false
561567
},
562568
{
563-
"expr": "sum(pd_cluster_status{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=\"$instance\", type=\"store_down_count\"})",
569+
"expr": "sum(pd_cluster_status{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", type=\"store_down_count\"})",
564570
"format": "time_series",
565571
"intervalFactor": 2,
566572
"legendFormat": "Down Stores",
567573
"refId": "E",
568-
"step": 20
574+
"step": 20,
575+
"instant": true,
576+
"range": false
569577
},
570578
{
571-
"expr": "sum(pd_cluster_status{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=\"$instance\", type=\"store_offline_count\"})",
579+
"expr": "sum(pd_cluster_status{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", type=\"store_offline_count\"})",
572580
"format": "time_series",
573581
"intervalFactor": 2,
574582
"legendFormat": "Offline Stores",
575583
"refId": "F",
576-
"step": 20
584+
"step": 20,
585+
"instant": true,
586+
"range": false
577587
},
578588
{
579-
"expr": "sum(pd_cluster_status{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=\"$instance\", type=\"store_tombstone_count\"})",
589+
"expr": "sum(pd_cluster_status{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", type=\"store_tombstone_count\"})",
580590
"format": "time_series",
581591
"intervalFactor": 2,
582592
"legendFormat": "Tombstone Stores",
583593
"refId": "G",
584-
"step": 20
594+
"step": 20,
595+
"instant": true,
596+
"range": false
585597
}
586598
],
587599
"timeFrom": "1s",
@@ -1134,7 +1146,7 @@
11341146
"steppedLine": false,
11351147
"targets": [
11361148
{
1137-
"expr": "pd_hotspot_status{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=\"$instance\",type=\"hot_write_region_as_leader\"}",
1149+
"expr": "pd_hotspot_status{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", type=\"hot_write_region_as_leader\"}",
11381150
"format": "time_series",
11391151
"intervalFactor": 2,
11401152
"legendFormat": "store-{{store}}",
@@ -1225,7 +1237,7 @@
12251237
"steppedLine": false,
12261238
"targets": [
12271239
{
1228-
"expr": "pd_hotspot_status{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=\"$instance\",type=\"hot_read_region_as_leader\"}",
1240+
"expr": "pd_hotspot_status{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", type=\"hot_read_region_as_leader\"}",
12291241
"format": "time_series",
12301242
"intervalFactor": 2,
12311243
"legendFormat": "store-{{store}}",
@@ -4212,7 +4224,7 @@
42124224
"steppedLine": false,
42134225
"targets": [
42144226
{
4215-
"expr": "sum(rate(tikv_thread_cpu_seconds_total{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", name=~\"raftstore_.*\"}[1m])) by (instance)",
4227+
"expr": "sum(rate(tikv_thread_cpu_seconds_total{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", name=~\"(raftstore|rs|rfstore)_.*\"}[1m])) by (instance)",
42164228
"format": "time_series",
42174229
"intervalFactor": 2,
42184230
"legendFormat": "{{instance}}",
@@ -4307,7 +4319,7 @@
43074319
"steppedLine": false,
43084320
"targets": [
43094321
{
4310-
"expr": "sum(rate(tikv_thread_cpu_seconds_total{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", name=~\"cop_.*\"}[1m])) by (instance)",
4322+
"expr": "sum(rate(tikv_thread_cpu_seconds_total{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", name=~\"unified_read_po.*\"}[1m])) by (instance)",
43114323
"format": "time_series",
43124324
"intervalFactor": 2,
43134325
"legendFormat": "{{instance}}",
@@ -4320,7 +4332,7 @@
43204332
"timeFrom": null,
43214333
"timeRegions": [],
43224334
"timeShift": null,
4323-
"title": "Coprocessor CPU",
4335+
"title": "Unified Read Pool CPU",
43244336
"tooltip": {
43254337
"shared": true,
43264338
"sort": 0,

0 commit comments

Comments
 (0)