chore(monitor-snapshot/release-8.0): update files from upstreams (#399)

pingcap · Mar 21, 2024 · fe83387 · fe83387
1 parent 7cc099b
commit fe83387
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/monitor-snapshot/release-8.0/ansible-monitor.tar.gz b/monitor-snapshot/release-8.0/ansible-monitor.tar.gz
diff --git a/monitor-snapshot/release-8.0/operator/dashboards/pd.json b/monitor-snapshot/release-8.0/operator/dashboards/pd.json
@@ -1728,7 +1728,7 @@
           "tableColumn": "idalloc",
           "targets": [
             {
-              "expr": "max(pd_cluster_id{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", type=\"idalloc\"})",
+              "expr": "pd_cluster_id{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", type=\"idalloc\"}!=0",
               "format": "time_series",
               "hide": false,
               "instant": true,
@@ -2274,7 +2274,7 @@
           "tableColumn": "tso",
           "targets": [
             {
-              "expr": "max(pd_cluster_tso{type=\"tso\", dc=\"global\"})",
+              "expr": "pd_cluster_tso{type=\"tso\", dc=\"global\"}!=0",
               "format": "time_series",
               "instant": true,
               "interval": "",
@@ -2578,7 +2578,7 @@
           "tableColumn": "tso",
           "targets": [
             {
-              "expr": "max(pd_cluster_tso{type=\"tso\", dc=\"global\"})",
+              "expr": "pd_cluster_tso{type=\"tso\", dc=\"global\"}!=0",
               "format": "time_series",
               "instant": true,
               "interval": "",
@@ -7885,6 +7885,7 @@
           "targets": [
             {
               "expr": "pd_checker_patrol_regions_time{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\"} != 0",
+              "legendFormat": "{{instance}}",
               "format": "time_series",
               "intervalFactor": 1,
               "refId": "A"
@@ -8464,14 +8465,14 @@
               "refId": "A"
             },
             {
-              "expr": "rate(pd_schedule_scatter_operators_count{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", type=\"fail\"}[1m]*60)",
+              "expr": "rate(pd_schedule_scatter_operators_count{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", type=\"fail\"}[1m])*60",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "fail",
               "refId": "B"
             },
             {
-              "expr": "rate(pd_schedule_scatter_operators_count{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", type=\"success\"}[1m]*60)",
+              "expr": "rate(pd_schedule_scatter_operators_count{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", type=\"success\"}[1m])*60",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "success",
@@ -9286,15 +9287,15 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "etcd_mvcc_db_total_size_in_bytes{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", job=\"pd\"}",
+              "expr": "etcd_mvcc_db_total_size_in_bytes{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\".*pd.*\"}",
               "format": "time_series",
               "hide": false,
               "intervalFactor": 1,
               "legendFormat": "{{instance}}-physically-allocated",
               "refId": "A"
             },
             {
-              "expr": "etcd_mvcc_db_total_size_in_use_in_bytes{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", job=\"pd\"}",
+              "expr": "etcd_mvcc_db_total_size_in_use_in_bytes{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\".*pd.*\"}",
               "format": "time_series",
               "hide": false,
               "intervalFactor": 1,