chore(monitor-snapshot/release-8.4): update files from upstreams (#647)

pingcap · Oct 29, 2024 · 0e0e38e · 0e0e38e
1 parent a3c7092
commit 0e0e38e
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 27 deletions.
diff --git a/monitor-snapshot/release-8.4/ansible-monitor.tar.gz b/monitor-snapshot/release-8.4/ansible-monitor.tar.gz
diff --git a/monitor-snapshot/release-8.4/operator/dashboards/tidb_resource_control.json b/monitor-snapshot/release-8.4/operator/dashboards/tidb_resource_control.json
@@ -22,45 +22,67 @@
          "id": 2,
          "panels": [
             {
-               "columns": [ ],
                "datasource": "tidb-cluster",
+               "fieldConfig": {
+                  "overrides": [
+                     {
+                        "matcher": {
+                           "id": "byName",
+                           "options": "Burstable"
+                        },
+                        "properties": [
+                           {
+                              "id": "mappings",
+                              "value": [
+                                 {
+                                    "options": {
+                                       "0": {
+                                          "index": 1,
+                                          "text": "false"
+                                       },
+                                       "1": {
+                                          "index": 0,
+                                          "text": "true"
+                                       }
+                                    },
+                                    "type": "value"
+                                 }
+                              ]
+                           }
+                        ]
+                     }
+                  ]
+               },
                "gridPos": {
                   "h": 7,
                   "w": 24,
                   "x": 0,
                   "y": 0
                },
                "id": 3,
-               "links": [ ],
-               "styles": [ ],
                "targets": [
                   {
-                     "expr": "resource_manager_server_group_config{type=\"priority\"}",
+                     "expr": "max by (resource_group, type) (resource_manager_server_group_config{type=\"priority\"})",
                      "format": "time_series",
-                     "instant": "instant",
+                     "instant": true,
                      "intervalFactor": 2,
-                     "legendFormat": "{{resource_group}}",
-                     "refId": "A"
+                     "legendFormat": "{{resource_group}}"
                   },
                   {
-                     "expr": "resource_manager_server_group_config{type=\"ru_capacity\"}",
+                     "expr": "max by (resource_group, type) (resource_manager_server_group_config{type=\"ru_capacity\"}) < bool 0",
                      "format": "time_series",
-                     "instant": "instant",
+                     "instant": true,
                      "intervalFactor": 2,
-                     "legendFormat": "{{resource_group}}",
-                     "refId": "B"
+                     "legendFormat": "{{resource_group}}"
                   },
                   {
-                     "expr": "resource_manager_server_group_config{type=\"ru_per_sec\"}",
+                     "expr": "max by (resource_group, type) (resource_manager_server_group_config{type=\"ru_per_sec\"})",
                      "format": "time_series",
-                     "instant": "instant",
+                     "instant": true,
                      "intervalFactor": 2,
-                     "legendFormat": "{{resource_group}}",
-                     "refId": "C"
+                     "legendFormat": "{{resource_group}}"
                   }
                ],
-               "timeFrom": null,
-               "timeShift": null,
                "title": "RU Config",
                "transformations": [
                   {
@@ -87,10 +109,17 @@
                            "resource_group": 4,
                            "ru_capacity": 7,
                            "ru_per_sec": 6
+                        },
+                        "renameByName": {
+                           "priority": "Priority",
+                           "resource_group": "Group Name",
+                           "ru_capacity": "Burstable",
+                           "ru_per_sec": "RU_PER_SEC"
                         }
                      }
                   }
                ],
+               "transparent": false,
                "type": "table"
             },
             {
@@ -246,7 +275,7 @@
                "thresholds": [ ],
                "timeFrom": null,
                "timeShift": null,
-               "title": "RU (Max Cost During 20s Period)",
+               "title": "RU Max (Max Cost During 20s Period)",
                "tooltip": {
                   "shared": true,
                   "sort": 0,
@@ -1764,17 +1793,18 @@
                "steppedLine": false,
                "targets": [
                   {
-                     "expr": "sum(rate(resource_manager_client_request_fail{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$tidb_instance\"}[1m])) by (instance)",
+                     "expr": "sum(rate(resource_manager_client_request_fail{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$tidb_instance\"}[1m])) by (instance, name, type)",
                      "format": "time_series",
                      "intervalFactor": 2,
-                     "legendFormat": "{{instance}}-total",
+                     "legendFormat": "{{name}}-{{type}}-{{instance}}",
                      "refId": "A"
                   },
                   {
-                     "expr": "sum(rate(resource_manager_client_request_fail{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$tidb_instance\"}[1m])) by (instance, name)",
+                     "expr": "sum(rate(resource_manager_client_request_fail{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$tidb_instance\"}[1m])) by (instance)",
                      "format": "time_series",
+                     "hide": true,
                      "intervalFactor": 2,
-                     "legendFormat": "{{instance}}-{{name}}",
+                     "legendFormat": "{{instance}}-total",
                      "refId": "B"
                   }
                ],
@@ -2076,15 +2106,15 @@
                },
                "yaxes": [
                   {
-                     "format": "short",
+                     "format": "s",
                      "label": null,
                      "logBase": 1,
                      "max": null,
                      "min": null,
                      "show": true
                   },
                   {
-                     "format": "short",
+                     "format": "s",
                      "label": null,
                      "logBase": 1,
                      "max": null,
@@ -2289,15 +2319,15 @@
                },
                "yaxes": [
                   {
-                     "format": "short",
+                     "format": "s",
                      "label": null,
                      "logBase": 2,
                      "max": null,
                      "min": null,
                      "show": true
                   },
                   {
-                     "format": "short",
+                     "format": "s",
                      "label": null,
                      "logBase": 1,
                      "max": null,
@@ -3919,7 +3949,7 @@
             "multi": false,
             "name": "tidb_cluster",
             "options": [ ],
-            "query": "label_values(pd_cluster_status{k8s_cluster=\"$kuberentes\"}, tidb_cluster)",
+            "query": "label_values(pd_cluster_status{k8s_cluster=\"$k8s_cluster\"}, tidb_cluster)",
             "refresh": 2,
             "regex": "",
             "sort": 1,