Skip to content

Commit 8dbc00c

Browse files
ti-chi-botti-chi-bot
authored
chore(monitor-snapshot/master): update files from upstreams (#1005)
1 parent 238f2b6 commit 8dbc00c

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

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

84 Bytes
Binary file not shown.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"steppedLine": false,
6565
"targets": [
6666
{
67-
"expr": "time() - process_start_time_seconds{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}",
67+
"expr": "time() - process_start_time_seconds{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", component=\"tici-meta\"}",
6868
"format": "time_series",
6969
"intervalFactor": 2,
7070
"legendFormat": "{{instance}}",
@@ -150,7 +150,7 @@
150150
"steppedLine": false,
151151
"targets": [
152152
{
153-
"expr": "rate(process_cpu_seconds_total{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[1m])",
153+
"expr": "rate(process_cpu_seconds_total{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", component=\"tici-meta\"}[1m])",
154154
"format": "time_series",
155155
"intervalFactor": 2,
156156
"legendFormat": "{{instance}}",
@@ -236,7 +236,7 @@
236236
"steppedLine": false,
237237
"targets": [
238238
{
239-
"expr": "process_resident_memory_bytes{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}",
239+
"expr": "process_resident_memory_bytes{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", component=\"tici-meta\"}",
240240
"format": "time_series",
241241
"intervalFactor": 2,
242242
"legendFormat": "{{instance}}",
@@ -1725,7 +1725,7 @@
17251725
"options": [ ],
17261726
"query": "query_result(max by (instance) (up{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", component=\"tici-meta\"} or up{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"tici-meta-.+\"}))",
17271727
"refresh": 2,
1728-
"regex": "/.*instance=\\\"([^\\\"]+)\\\".*/",
1728+
"regex": "/.*instance=\"([^\"]+)\".*/",
17291729
"sort": 1,
17301730
"tagValuesQuery": "",
17311731
"tags": [ ],

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"steppedLine": false,
6565
"targets": [
6666
{
67-
"expr": "time() - process_start_time_seconds{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}",
67+
"expr": "tiflash_system_asynchronous_metric_Uptime{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}",
6868
"format": "time_series",
6969
"intervalFactor": 2,
7070
"legendFormat": "{{instance}}",
@@ -150,7 +150,7 @@
150150
"steppedLine": false,
151151
"targets": [
152152
{
153-
"expr": "rate(process_cpu_seconds_total{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[1m])",
153+
"expr": "rate(tiflash_proxy_process_cpu_seconds_total{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[1m])",
154154
"format": "time_series",
155155
"intervalFactor": 2,
156156
"legendFormat": "{{instance}}",
@@ -236,7 +236,7 @@
236236
"steppedLine": false,
237237
"targets": [
238238
{
239-
"expr": "process_resident_memory_bytes{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}",
239+
"expr": "tiflash_proxy_process_resident_memory_bytes{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}",
240240
"format": "time_series",
241241
"intervalFactor": 2,
242242
"legendFormat": "{{instance}}",
@@ -871,7 +871,7 @@
871871
"options": [ ],
872872
"query": "query_result(max by (instance) (up{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", component=~\".*tiflash\"} or up{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", job=~\".*tiflash.*\"}))",
873873
"refresh": 2,
874-
"regex": "/.*instance=\\\"([^\\\"]+)\\\".*/",
874+
"regex": "/.*instance=\"([^\"]+)\".*/",
875875
"sort": 1,
876876
"tagValuesQuery": "",
877877
"tags": [ ],

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"steppedLine": false,
6565
"targets": [
6666
{
67-
"expr": "time() - process_start_time_seconds{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}",
67+
"expr": "time() - process_start_time_seconds{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", component=\"tici-worker\"}",
6868
"format": "time_series",
6969
"intervalFactor": 2,
7070
"legendFormat": "{{instance}}",
@@ -150,7 +150,7 @@
150150
"steppedLine": false,
151151
"targets": [
152152
{
153-
"expr": "rate(process_cpu_seconds_total{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[1m])",
153+
"expr": "rate(process_cpu_seconds_total{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", component=\"tici-worker\"}[1m])",
154154
"format": "time_series",
155155
"intervalFactor": 2,
156156
"legendFormat": "{{instance}}",
@@ -236,7 +236,7 @@
236236
"steppedLine": false,
237237
"targets": [
238238
{
239-
"expr": "process_resident_memory_bytes{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}",
239+
"expr": "process_resident_memory_bytes{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", component=\"tici-worker\"}",
240240
"format": "time_series",
241241
"intervalFactor": 2,
242242
"legendFormat": "{{instance}}",
@@ -1139,7 +1139,7 @@
11391139
"options": [ ],
11401140
"query": "query_result(max by (instance) (up{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", component=\"tici-worker\"} or up{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"tici-worker-.+\"}))",
11411141
"refresh": 2,
1142-
"regex": "/.*instance=\\\"([^\\\"]+)\\\".*/",
1142+
"regex": "/.*instance=\"([^\"]+)\".*/",
11431143
"sort": 1,
11441144
"tagValuesQuery": "",
11451145
"tags": [ ],

0 commit comments

Comments
 (0)