From 3b2e6115e288f1b53a4f0bffff3d8b2c1faf7b13 Mon Sep 17 00:00:00 2001 From: Hu# Date: Wed, 20 Dec 2023 14:42:22 +0800 Subject: [PATCH 1/4] makefile: make clean to remove dashboard temp (#7586) close tikv/pd#7585 Signed-off-by: husharp Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com> --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index bf25730c0d9..8e2353691b8 100644 --- a/Makefile +++ b/Makefile @@ -305,6 +305,7 @@ clean-test: clean-build: # Cleaning building files... rm -rf .dashboard_download_cache/ + rm -rf .dashboard_build_temp/ rm -rf $(BUILD_BIN_PATH) rm -rf $(GO_TOOLS_BIN_PATH) From d98daf3dd8f10a1315d9650a43e8bb4c27a04ebb Mon Sep 17 00:00:00 2001 From: JmPotato Date: Wed, 20 Dec 2023 16:00:23 +0800 Subject: [PATCH 2/4] tests, Makefile: rename the test from realtiup to realcluster (#7573) ref tikv/pd#7298 Rename the real-cluster test to a more general naming. Signed-off-by: JmPotato --- Makefile | 2 +- pd.code-workspace | 2 +- tests/integrations/{realtiup => realcluster}/Makefile | 0 tests/integrations/{realtiup => realcluster}/deploy.sh | 0 tests/integrations/{realtiup => realcluster}/go.mod | 2 +- tests/integrations/{realtiup => realcluster}/go.sum | 0 tests/integrations/{realtiup => realcluster}/mock_db.go | 2 +- .../integrations/{realtiup => realcluster}/reboot_pd_test.go | 2 +- .../{realtiup => realcluster}/transfer_leader_test.go | 2 +- tests/integrations/{realtiup => realcluster}/ts_test.go | 2 +- tests/integrations/{realtiup => realcluster}/util.go | 4 ++-- tests/integrations/{realtiup => realcluster}/wait_tiup.sh | 0 12 files changed, 9 insertions(+), 9 deletions(-) rename tests/integrations/{realtiup => realcluster}/Makefile (100%) rename tests/integrations/{realtiup => realcluster}/deploy.sh (100%) rename tests/integrations/{realtiup => realcluster}/go.mod (96%) rename tests/integrations/{realtiup => realcluster}/go.sum (100%) rename tests/integrations/{realtiup => realcluster}/mock_db.go (99%) rename tests/integrations/{realtiup => realcluster}/reboot_pd_test.go (98%) rename tests/integrations/{realtiup => realcluster}/transfer_leader_test.go (99%) rename tests/integrations/{realtiup => realcluster}/ts_test.go (98%) rename tests/integrations/{realtiup => realcluster}/util.go (92%) rename tests/integrations/{realtiup => realcluster}/wait_tiup.sh (100%) diff --git a/Makefile b/Makefile index 8e2353691b8..b94de374a81 100644 --- a/Makefile +++ b/Makefile @@ -261,7 +261,7 @@ test-tso-consistency: install-tools CGO_ENABLED=1 go test -race -tags without_dashboard,tso_consistency_test,deadlock $(TSO_INTEGRATION_TEST_PKGS) || { $(FAILPOINT_DISABLE); exit 1; } @$(FAILPOINT_DISABLE) -REAL_CLUSTER_TEST_PATH := $(ROOT_PATH)/tests/integrations/realtiup +REAL_CLUSTER_TEST_PATH := $(ROOT_PATH)/tests/integrations/realcluster test-real-cluster: # testing with the real cluster... diff --git a/pd.code-workspace b/pd.code-workspace index 54a8ea324aa..8cdb8d4d043 100644 --- a/pd.code-workspace +++ b/pd.code-workspace @@ -22,7 +22,7 @@ }, { "name": "real-cluster-tests", - "path": "tests/integrations/realtiup" + "path": "tests/integrations/realcluster" }, { "name": "pd-tso-bench", diff --git a/tests/integrations/realtiup/Makefile b/tests/integrations/realcluster/Makefile similarity index 100% rename from tests/integrations/realtiup/Makefile rename to tests/integrations/realcluster/Makefile diff --git a/tests/integrations/realtiup/deploy.sh b/tests/integrations/realcluster/deploy.sh similarity index 100% rename from tests/integrations/realtiup/deploy.sh rename to tests/integrations/realcluster/deploy.sh diff --git a/tests/integrations/realtiup/go.mod b/tests/integrations/realcluster/go.mod similarity index 96% rename from tests/integrations/realtiup/go.mod rename to tests/integrations/realcluster/go.mod index ccb23548f3e..66f40012863 100644 --- a/tests/integrations/realtiup/go.mod +++ b/tests/integrations/realcluster/go.mod @@ -1,4 +1,4 @@ -module github.com/tikv/pd/tests/integrations/realtiup +module github.com/tikv/pd/tests/integrations/realcluster go 1.21 diff --git a/tests/integrations/realtiup/go.sum b/tests/integrations/realcluster/go.sum similarity index 100% rename from tests/integrations/realtiup/go.sum rename to tests/integrations/realcluster/go.sum diff --git a/tests/integrations/realtiup/mock_db.go b/tests/integrations/realcluster/mock_db.go similarity index 99% rename from tests/integrations/realtiup/mock_db.go rename to tests/integrations/realcluster/mock_db.go index 95f3af8a06c..255ff6c0057 100644 --- a/tests/integrations/realtiup/mock_db.go +++ b/tests/integrations/realcluster/mock_db.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package realtiup +package realcluster import ( "testing" diff --git a/tests/integrations/realtiup/reboot_pd_test.go b/tests/integrations/realcluster/reboot_pd_test.go similarity index 98% rename from tests/integrations/realtiup/reboot_pd_test.go rename to tests/integrations/realcluster/reboot_pd_test.go index bccf465bde0..59747912897 100644 --- a/tests/integrations/realtiup/reboot_pd_test.go +++ b/tests/integrations/realcluster/reboot_pd_test.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package realtiup +package realcluster import ( "context" diff --git a/tests/integrations/realtiup/transfer_leader_test.go b/tests/integrations/realcluster/transfer_leader_test.go similarity index 99% rename from tests/integrations/realtiup/transfer_leader_test.go rename to tests/integrations/realcluster/transfer_leader_test.go index 51142be03f9..6a8f2e8a732 100644 --- a/tests/integrations/realtiup/transfer_leader_test.go +++ b/tests/integrations/realcluster/transfer_leader_test.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package realtiup +package realcluster import ( "context" diff --git a/tests/integrations/realtiup/ts_test.go b/tests/integrations/realcluster/ts_test.go similarity index 98% rename from tests/integrations/realtiup/ts_test.go rename to tests/integrations/realcluster/ts_test.go index 9bf8aee2d49..5d970556fbc 100644 --- a/tests/integrations/realtiup/ts_test.go +++ b/tests/integrations/realcluster/ts_test.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package realtiup +package realcluster import ( "testing" diff --git a/tests/integrations/realtiup/util.go b/tests/integrations/realcluster/util.go similarity index 92% rename from tests/integrations/realtiup/util.go rename to tests/integrations/realcluster/util.go index 8f0c71038d6..412df51894b 100644 --- a/tests/integrations/realtiup/util.go +++ b/tests/integrations/realcluster/util.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package realtiup +package realcluster import ( "time" @@ -24,7 +24,7 @@ const physicalShiftBits = 18 var ( pdAddrs = []string{"127.0.0.1:2379"} - pdHTTPCli = http.NewClient("pd-realtiup-test", pdAddrs) + pdHTTPCli = http.NewClient("pd-real-cluster-test", pdAddrs) ) // GetTimeFromTS extracts time.Time from a timestamp. diff --git a/tests/integrations/realtiup/wait_tiup.sh b/tests/integrations/realcluster/wait_tiup.sh similarity index 100% rename from tests/integrations/realtiup/wait_tiup.sh rename to tests/integrations/realcluster/wait_tiup.sh From ebd2fc09981a6a6cc58dee72e931744178ba6607 Mon Sep 17 00:00:00 2001 From: Hu# Date: Wed, 20 Dec 2023 16:12:22 +0800 Subject: [PATCH 3/4] dashboard-ui: make custom dashboard ui work (#7594) close tikv/pd#7593 Signed-off-by: husharp Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com> --- scripts/embed-dashboard-ui.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/embed-dashboard-ui.sh b/scripts/embed-dashboard-ui.sh index 80c90bb1788..6ea9153d265 100755 --- a/scripts/embed-dashboard-ui.sh +++ b/scripts/embed-dashboard-ui.sh @@ -138,6 +138,8 @@ function compile_asset { echo '+ Build UI' cd "${BUILD_DIR}" + # ref https://github.com/tikv/pd/issues/7593 + git init make ui echo '+ Generating UI assets' From 84e60be69d811368220aac9ed39094a62b28c129 Mon Sep 17 00:00:00 2001 From: Yongbo Jiang Date: Wed, 20 Dec 2023 17:19:53 +0800 Subject: [PATCH 4/4] grafana: reassign the ID of the panel (#7588) ref tikv/pd#7583 Signed-off-by: Cabinfever_B Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com> --- metrics/grafana/pd.json | 301 ++++++++++++++++++++-------------------- 1 file changed, 149 insertions(+), 152 deletions(-) diff --git a/metrics/grafana/pd.json b/metrics/grafana/pd.json index 809244771b7..a242235b204 100644 --- a/metrics/grafana/pd.json +++ b/metrics/grafana/pd.json @@ -95,7 +95,7 @@ "x": 0, "y": 0 }, - "id": 10, + "id": 100, "interval": null, "links": [], "mappingType": 1, @@ -181,7 +181,7 @@ "y": 0 }, "hideTimeOverride": false, - "id": 38, + "id": 101, "interval": null, "links": [], "mappingType": 1, @@ -266,7 +266,7 @@ "y": 0 }, "hideTimeOverride": false, - "id": 37, + "id": 102, "interval": null, "links": [], "mappingType": 1, @@ -348,7 +348,7 @@ "x": 12, "y": 0 }, - "id": 97, + "id": 103, "interval": null, "links": [], "mappingType": 1, @@ -434,7 +434,7 @@ "x": 16, "y": 0 }, - "id": 21, + "id": 104, "interval": null, "links": [], "mappingType": 1, @@ -518,7 +518,7 @@ "x": 20, "y": 0 }, - "id": 20, + "id": 105, "interval": null, "links": [], "mappingType": 1, @@ -594,7 +594,7 @@ "y": 6 }, "hideTimeOverride": true, - "id": 96, + "id": 106, "links": [], "pageSize": null, "scroll": false, @@ -744,7 +744,7 @@ "y": 6 }, "hiddenSeries": false, - "id": 72, + "id": 108, "legend": { "alignAsTable": true, "avg": false, @@ -845,7 +845,7 @@ "x": 16, "y": 6 }, - "id": 55, + "id": 109, "interval": null, "links": [], "maxDataPoints": 100, @@ -907,9 +907,6 @@ "indexByName": { "instance": 1, "service": 0 - }, - "renameByName": { - "instance": "" } } } @@ -944,7 +941,7 @@ "x": 0, "y": 13 }, - "id": 1449, + "id": 110, "options": { "orientation": "auto", "reduceOptions": { @@ -1002,7 +999,7 @@ "x": 4, "y": 13 }, - "id": 1453, + "id": 110, "options": { "reduceOptions": { "calcs": [ @@ -1039,7 +1036,7 @@ "x": 8, "y": 13 }, - "id": 1111, + "id": 111, "options": { "showHeader": false }, @@ -1100,7 +1097,7 @@ "x": 12, "y": 13 }, - "id": 1112, + "id": 112, "targets": [ { "expr": "pd_cluster_speed{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\"}", @@ -1159,7 +1156,7 @@ "y": 13 }, "hiddenSeries": false, - "id": 22, + "id": 113, "interval": null, "legend": { "alignAsTable": true, @@ -1252,7 +1249,7 @@ "x": 0, "y": 19 }, - "id": 118, + "id": 200, "panels": [ { "columns": [ @@ -1270,7 +1267,7 @@ "y": 20 }, "hideTimeOverride": true, - "id": 116, + "id": 201, "links": [], "pageSize": null, "scroll": true, @@ -1328,7 +1325,7 @@ "x": 4, "y": 20 }, - "id": 1433, + "id": 202, "links": [], "pageSize": null, "scroll": true, @@ -1453,7 +1450,7 @@ "y": 20 }, "hideTimeOverride": true, - "id": 139, + "id": 203, "links": [], "pageSize": null, "scroll": false, @@ -1522,7 +1519,7 @@ "y": 20 }, "hideTimeOverride": true, - "id": 103, + "id": 204, "links": [], "pageSize": null, "scroll": true, @@ -1602,7 +1599,7 @@ "y": 20 }, "hideTimeOverride": true, - "id": 117, + "id": 205, "links": [], "pageSize": null, "scroll": true, @@ -1704,7 +1701,7 @@ "y": 23 }, "hideTimeOverride": true, - "id": 115, + "id": 206, "interval": null, "links": [], "mappingType": 1, @@ -1784,7 +1781,7 @@ "y": 27 }, "hiddenSeries": false, - "id": 1427, + "id": 207, "legend": { "alignAsTable": true, "avg": true, @@ -1891,7 +1888,7 @@ "y": 27 }, "hiddenSeries": false, - "id": 1429, + "id": 208, "legend": { "alignAsTable": true, "avg": false, @@ -2034,7 +2031,7 @@ "y": 34 }, "hiddenSeries": false, - "id": 1430, + "id": 209, "legend": { "alignAsTable": true, "avg": false, @@ -2133,7 +2130,7 @@ "y": 34 }, "hiddenSeries": false, - "id": 1431, + "id": 210, "legend": { "alignAsTable": true, "avg": false, @@ -2243,7 +2240,7 @@ "y": 41 }, "hideTimeOverride": true, - "id": 137, + "id": 211, "interval": null, "links": [], "mappingType": 1, @@ -2329,7 +2326,7 @@ "y": 41 }, "hiddenSeries": false, - "id": 1443, + "id": 212, "legend": { "alignAsTable": true, "avg": false, @@ -2431,7 +2428,7 @@ "y": 41 }, "hiddenSeries": false, - "id": 1464, + "id": 213, "legend": { "alignAsTable": true, "avg": false, @@ -2547,7 +2544,7 @@ "y": 45 }, "hideTimeOverride": true, - "id": 1444, + "id": 214, "interval": null, "links": [], "mappingType": 1, @@ -2621,7 +2618,7 @@ "x": 0, "y": 20 }, - "id": 119, + "id": 300, "panels": [ { "aliasColors": {}, @@ -2638,7 +2635,7 @@ "x": 0, "y": 15 }, - "id": 45, + "id": 301, "legend": { "alignAsTable": true, "avg": true, @@ -2731,7 +2728,7 @@ "x": 12, "y": 15 }, - "id": 79, + "id": 302, "legend": { "alignAsTable": true, "avg": true, @@ -2824,7 +2821,7 @@ "x": 0, "y": 22 }, - "id": 77, + "id": 303, "legend": { "alignAsTable": true, "avg": true, @@ -2916,7 +2913,7 @@ "x": 12, "y": 22 }, - "id": 78, + "id": 304, "legend": { "alignAsTable": true, "avg": true, @@ -3009,7 +3006,7 @@ "x": 0, "y": 29 }, - "id": 80, + "id": 305, "legend": { "alignAsTable": true, "avg": true, @@ -3109,7 +3106,7 @@ "x": 12, "y": 29 }, - "id": 47, + "id": 306, "legend": { "alignAsTable": true, "avg": false, @@ -3203,7 +3200,7 @@ "x": 0, "y": 36 }, - "id": 67, + "id": 307, "legend": { "alignAsTable": true, "avg": false, @@ -3303,7 +3300,7 @@ "x": 12, "y": 36 }, - "id": 81, + "id": 308, "legend": { "alignAsTable": true, "avg": false, @@ -3403,7 +3400,7 @@ "x": 0, "y": 43 }, - "id": 1426, + "id": 309, "legend": { "alignAsTable": true, "avg": true, @@ -3501,7 +3498,7 @@ "x": 12, "y": 42 }, - "id": 1455, + "id": 310, "legend": { "alignAsTable": true, "avg": true, @@ -3590,7 +3587,7 @@ "x": 0, "y": 21 }, - "id": 120, + "id": 400, "panels": [ { "aliasColors": {}, @@ -3607,7 +3604,7 @@ "x": 0, "y": 23 }, - "id": 83, + "id": 401, "legend": { "alignAsTable": true, "avg": false, @@ -3705,7 +3702,7 @@ "x": 12, "y": 23 }, - "id": 91, + "id": 402, "legend": { "alignAsTable": true, "avg": false, @@ -3798,7 +3795,7 @@ "x": 0, "y": 29 }, - "id": 90, + "id": 403, "legend": { "alignAsTable": true, "avg": false, @@ -3892,7 +3889,7 @@ "x": 12, "y": 29 }, - "id": 84, + "id": 404, "legend": { "alignAsTable": true, "avg": false, @@ -3985,7 +3982,7 @@ "x": 0, "y": 35 }, - "id": 85, + "id": 405, "legend": { "alignAsTable": true, "avg": false, @@ -4081,7 +4078,7 @@ "x": 12, "y": 35 }, - "id": 41, + "id": 406, "legend": { "alignAsTable": true, "avg": false, @@ -4205,7 +4202,7 @@ "x": 0, "y": 41 }, - "id": 40, + "id": 407, "legend": { "alignAsTable": true, "avg": false, @@ -4309,7 +4306,7 @@ "x": 12, "y": 41 }, - "id": 57, + "id": 408, "legend": { "alignAsTable": true, "avg": false, @@ -4405,7 +4402,7 @@ "x": 0, "y": 47 }, - "id": 56, + "id": 409, "legend": { "alignAsTable": true, "avg": false, @@ -4500,7 +4497,7 @@ "x": 12, "y": 47 }, - "id": 59, + "id": 410, "legend": { "alignAsTable": true, "avg": false, @@ -4601,7 +4598,7 @@ "y": 111 }, "hiddenSeries": false, - "id": 1463, + "id": 411, "legend": { "alignAsTable": true, "avg": false, @@ -4701,7 +4698,7 @@ "x": 0, "y": 53 }, - "id": 58, + "id": 412, "legend": { "alignAsTable": true, "avg": false, @@ -4793,7 +4790,7 @@ "x": 0, "y": 22 }, - "id": 135, + "id": 500, "panels": [ { "aliasColors": {}, @@ -4810,7 +4807,7 @@ "x": 0, "y": 17 }, - "id": 50, + "id": 501, "legend": { "alignAsTable": true, "avg": false, @@ -4906,7 +4903,7 @@ "x": 12, "y": 17 }, - "id": 51, + "id": 502, "legend": { "alignAsTable": true, "avg": false, @@ -5002,7 +4999,7 @@ "x": 0, "y": 24 }, - "id": 61, + "id": 503, "legend": { "alignAsTable": true, "avg": false, @@ -5115,7 +5112,7 @@ "x": 12, "y": 24 }, - "id": 48, + "id": 504, "legend": { "alignAsTable": true, "avg": false, @@ -5220,7 +5217,7 @@ "x": 12, "y": 31 }, - "id": 1465, + "id": 505, "legend": { "alignAsTable": true, "avg": false, @@ -5324,7 +5321,7 @@ "x": 0, "y": 31 }, - "id": 143, + "id": 506, "legend": { "alignAsTable": true, "avg": false, @@ -5436,7 +5433,7 @@ "x": 12, "y": 38 }, - "id": 1445, + "id": 507, "legend": { "alignAsTable": true, "avg": false, @@ -5540,7 +5537,7 @@ "x": 0, "y": 38 }, - "id": 146, + "id": 508, "legend": { "alignAsTable": true, "avg": true, @@ -5636,7 +5633,7 @@ "x": 12, "y": 45 }, - "id": 106, + "id": 509, "legend": { "alignAsTable": true, "avg": true, @@ -5731,7 +5728,7 @@ "x": 0, "y": 45 }, - "id": 150, + "id": 510, "legend": { "alignAsTable": true, "avg": true, @@ -5833,7 +5830,7 @@ "x": 12, "y": 52 }, - "id": 148, + "id": 511, "legend": { "alignAsTable": true, "avg": true, @@ -5943,7 +5940,7 @@ "y": 52 }, "hiddenSeries": false, - "id": 1441, + "id": 512, "legend": { "alignAsTable": true, "avg": true, @@ -6039,7 +6036,7 @@ "x": 0, "y": 23 }, - "id": 121, + "id": 600, "panels": [ { "aliasColors": {}, @@ -6064,7 +6061,7 @@ "y": 53 }, "hiddenSeries": false, - "id": 60, + "id": 601, "legend": { "alignAsTable": true, "avg": false, @@ -6174,7 +6171,7 @@ "x": 12, "y": 53 }, - "id": 105, + "id": 602, "legend": { "alignAsTable": true, "avg": false, @@ -6285,7 +6282,7 @@ "x": 0, "y": 60 }, - "id": 107, + "id": 603, "legend": { "alignAsTable": true, "avg": false, @@ -6396,7 +6393,7 @@ "x": 12, "y": 60 }, - "id": 1446, + "id": 604, "legend": { "alignAsTable": true, "avg": false, @@ -6508,7 +6505,7 @@ "x": 0, "y": 67 }, - "id": 149, + "id": 605, "legend": { "alignAsTable": true, "avg": true, @@ -6610,7 +6607,7 @@ "x": 12, "y": 67 }, - "id": 144, + "id": 606, "legend": { "alignAsTable": true, "avg": true, @@ -6727,7 +6724,7 @@ "x": 0, "y": 74 }, - "id": 147, + "id": 607, "legend": { "alignAsTable": true, "avg": true, @@ -6829,7 +6826,7 @@ "x": 12, "y": 74 }, - "id": 1440, + "id": 608, "legend": { "alignAsTable": true, "avg": true, @@ -6928,7 +6925,7 @@ "x": 0, "y": 81 }, - "id": 1466, + "id": 609, "legend": { "alignAsTable": true, "avg": true, @@ -7022,7 +7019,7 @@ "x": 0, "y": 24 }, - "id": 122, + "id": 700, "panels": [ { "aliasColors": {}, @@ -7040,7 +7037,7 @@ "y": 25 }, "hiddenSeries": false, - "id": 46, + "id": 701, "legend": { "alignAsTable": true, "avg": false, @@ -7136,7 +7133,7 @@ "y": 33 }, "hiddenSeries": false, - "id": 87, + "id": 702, "legend": { "alignAsTable": true, "avg": false, @@ -7240,7 +7237,7 @@ }, "hiddenSeries": false, "hideTimeOverride": false, - "id": 86, + "id": 703, "legend": { "alignAsTable": true, "avg": false, @@ -7342,7 +7339,7 @@ "y": 41 }, "hiddenSeries": false, - "id": 52, + "id": 704, "legend": { "alignAsTable": true, "avg": false, @@ -7448,7 +7445,7 @@ "y": 41 }, "hiddenSeries": false, - "id": 53, + "id": 705, "legend": { "alignAsTable": true, "avg": false, @@ -7554,7 +7551,7 @@ "y": 49 }, "hiddenSeries": false, - "id": 1458, + "id": 706, "legend": { "alignAsTable": true, "avg": false, @@ -7651,7 +7648,7 @@ "y": 49 }, "hiddenSeries": false, - "id": 1459, + "id": 707, "legend": { "alignAsTable": true, "avg": false, @@ -7747,7 +7744,7 @@ "y": 57 }, "hiddenSeries": false, - "id": 108, + "id": 708, "legend": { "alignAsTable": true, "avg": false, @@ -7852,7 +7849,7 @@ "x": 0, "y": 65 }, - "id": 1424, + "id": 709, "interval": null, "links": [], "mappingType": 1, @@ -7927,7 +7924,7 @@ "y": 65 }, "hiddenSeries": false, - "id": 141, + "id": 710, "legend": { "alignAsTable": true, "avg": false, @@ -8019,7 +8016,7 @@ "x": 0, "y": 73 }, - "id": 70, + "id": 711, "legend": { "alignAsTable": true, "avg": false, @@ -8112,7 +8109,7 @@ "y": 73 }, "hiddenSeries": false, - "id": 71, + "id": 712, "legend": { "alignAsTable": true, "avg": false, @@ -8205,7 +8202,7 @@ "y": 81 }, "hiddenSeries": false, - "id": 109, + "id": 713, "legend": { "alignAsTable": true, "avg": false, @@ -8301,7 +8298,7 @@ "y": 81 }, "hiddenSeries": false, - "id": 110, + "id": 714, "legend": { "alignAsTable": true, "avg": false, @@ -8419,7 +8416,7 @@ "x": 0, "y": 25 }, - "id": 1437, + "id": 800, "panels": [ { "aliasColors": {}, @@ -8435,7 +8432,7 @@ "x": 0, "y": 20 }, - "id": 1439, + "id": 801, "legend": { "alignAsTable": true, "avg": true, @@ -8538,7 +8535,7 @@ "x": 12, "y": 20 }, - "id": 1435, + "id": 802, "legend": { "alignAsTable": true, "avg": false, @@ -8633,7 +8630,7 @@ "x": 0, "y": 26 }, - "id": 123, + "id": 900, "panels": [ { "aliasColors": {}, @@ -8653,7 +8650,7 @@ "x": 0, "y": 119 }, - "id": 1, + "id": 901, "legend": { "alignAsTable": true, "avg": false, @@ -8749,7 +8746,7 @@ "x": 12, "y": 119 }, - "id": 2, + "id": 902, "legend": { "alignAsTable": true, "avg": false, @@ -8843,7 +8840,7 @@ "x": 0, "y": 27 }, - "id": 124, + "id": 1000, "panels": [ { "aliasColors": {}, @@ -8863,7 +8860,7 @@ "x": 0, "y": 119 }, - "id": 1461, + "id": 1001, "legend": { "alignAsTable": true, "avg": false, @@ -8959,7 +8956,7 @@ "x": 12, "y": 119 }, - "id": 1462, + "id": 1002, "legend": { "alignAsTable": true, "avg": false, @@ -9053,7 +9050,7 @@ "x": 0, "y": 28 }, - "id": 125, + "id": 1100, "panels": [ { "aliasColors": {}, @@ -9068,7 +9065,7 @@ "x": 0, "y": 21 }, - "id": 1422, + "id": 1101, "legend": { "alignAsTable": true, "avg": false, @@ -9170,7 +9167,7 @@ "x": 12, "y": 21 }, - "id": 5, + "id": 1102, "legend": { "alignAsTable": true, "avg": false, @@ -9267,7 +9264,7 @@ "x": 0, "y": 29 }, - "id": 6, + "id": 1103, "legend": { "alignAsTable": true, "avg": false, @@ -9363,7 +9360,7 @@ "x": 12, "y": 29 }, - "id": 34, + "id": 1104, "legend": { "alignAsTable": true, "avg": false, @@ -9458,7 +9455,7 @@ "x": 0, "y": 37 }, - "id": 7, + "id": 1105, "legend": { "alignAsTable": true, "avg": false, @@ -9596,7 +9593,7 @@ "x": 12, "y": 37 }, - "id": 44, + "id": 1106, "legend": { "alignAsTable": true, "avg": false, @@ -9699,7 +9696,7 @@ "x": 0, "y": 45 }, - "id": 151, + "id": 1107, "legend": { "alignAsTable": true, "avg": false, @@ -9795,7 +9792,7 @@ "x": 12, "y": 45 }, - "id": 152, + "id": 1108, "legend": { "alignAsTable": true, "avg": false, @@ -9887,7 +9884,7 @@ "x": 0, "y": 53 }, - "id": 92, + "id": 1109, "legend": { "alignAsTable": true, "avg": false, @@ -9978,7 +9975,7 @@ "x": 8, "y": 53 }, - "id": 93, + "id": 1110, "legend": { "alignAsTable": true, "alignLevel": null, @@ -10070,7 +10067,7 @@ "x": 16, "y": 53 }, - "id": 94, + "id": 1111, "legend": { "alignAsTable": true, "avg": false, @@ -10160,7 +10157,7 @@ "x": 0, "y": 29 }, - "id": 126, + "id": 1200, "panels": [ { "aliasColors": {}, @@ -10179,7 +10176,7 @@ "x": 0, "y": 114 }, - "id": 29, + "id": 1201, "legend": { "alignAsTable": true, "avg": false, @@ -10304,7 +10301,7 @@ "x": 12, "y": 114 }, - "id": 142, + "id": 1202, "legend": { "alignAsTable": true, "avg": false, @@ -10410,7 +10407,7 @@ "x": 0, "y": 123 }, - "id": 28, + "id": 1203, "legend": { "alignAsTable": true, "avg": false, @@ -10516,7 +10513,7 @@ "x": 12, "y": 123 }, - "id": 1447, + "id": 1204, "legend": { "alignAsTable": true, "avg": false, @@ -10626,7 +10623,7 @@ "x": 0, "y": 30 }, - "id": 127, + "id": 1300, "panels": [ { "aliasColors": {}, @@ -10645,7 +10642,7 @@ "x": 0, "y": 23 }, - "id": 74, + "id": 1301, "legend": { "alignAsTable": true, "avg": false, @@ -10742,7 +10739,7 @@ "x": 12, "y": 23 }, - "id": 140, + "id": 1302, "legend": { "alignAsTable": true, "avg": false, @@ -10847,7 +10844,7 @@ "y": 31 }, "hiddenSeries": false, - "id": 1460, + "id": 1303, "legend": { "alignAsTable": true, "avg": false, @@ -10957,7 +10954,7 @@ "x": 12, "y": 31 }, - "id": 54, + "id": 1304, "legend": { "alignAsTable": true, "avg": true, @@ -11054,7 +11051,7 @@ "x": 0, "y": 39 }, - "id": 64, + "id": 1305, "legend": { "alignAsTable": true, "avg": true, @@ -11148,7 +11145,7 @@ "x": 12, "y": 39 }, - "id": 133, + "id": 1306, "legend": { "alignAsTable": true, "avg": true, @@ -11238,7 +11235,7 @@ "x": 0, "y": 47 }, - "id": 131, + "id": 1307, "legend": { "alignAsTable": true, "avg": true, @@ -11331,7 +11328,7 @@ "x": 12, "y": 47 }, - "id": 1400, + "id": 1308, "legend": { "alignAsTable": true, "avg": false, @@ -11428,7 +11425,7 @@ "x": 0, "y": 55 }, - "id": 1402, + "id": 1309, "legend": { "alignAsTable": true, "avg": true, @@ -11525,7 +11522,7 @@ "x": 12, "y": 55 }, - "id": 1403, + "id": 1310, "legend": { "alignAsTable": true, "avg": true, @@ -11622,7 +11619,7 @@ "x": 0, "y": 63 }, - "id": 1451, + "id": 1311, "legend": { "alignAsTable": true, "avg": true, @@ -11719,7 +11716,7 @@ "x": 12, "y": 63 }, - "id": 1452, + "id": 1312, "legend": { "alignAsTable": true, "avg": true, @@ -11812,7 +11809,7 @@ "x": 0, "y": 31 }, - "id": 1420, + "id": 1400, "panels": [ { "datasource": "${DS_TEST-CLUSTER}", @@ -11842,7 +11839,7 @@ "x": 0, "y": 24 }, - "id": 1407, + "id": 1401, "options": { "displayMode": "lcd", "orientation": "horizontal", @@ -11900,7 +11897,7 @@ "x": 12, "y": 24 }, - "id": 1411, + "id": 1402, "options": { "displayMode": "lcd", "orientation": "horizontal", @@ -11960,7 +11957,7 @@ "x": 0, "y": 32 }, - "id": 1406, + "id": 1403, "options": { "displayMode": "lcd", "orientation": "horizontal", @@ -12020,7 +12017,7 @@ "x": 12, "y": 32 }, - "id": 1412, + "id": 1404, "options": { "displayMode": "lcd", "orientation": "horizontal", @@ -12080,7 +12077,7 @@ "x": 0, "y": 40 }, - "id": 1408, + "id": 1405, "interval": "", "options": { "displayMode": "lcd", @@ -12142,7 +12139,7 @@ "x": 12, "y": 40 }, - "id": 1409, + "id": 1406, "interval": "", "options": { "displayMode": "lcd", @@ -12191,7 +12188,7 @@ "x": 0, "y": 48 }, - "id": 1454, + "id": 1407, "interval": "", "options": { "displayMode": "lcd", @@ -12240,7 +12237,7 @@ "x": 12, "y": 48 }, - "id": 1467, + "id": 1408, "interval": "", "options": { "displayMode": "lcd", @@ -12284,7 +12281,7 @@ "x": 0, "y": 32 }, - "id": 128, + "id": 1500, "panels": [ { "aliasColors": {}, @@ -12299,7 +12296,7 @@ "x": 0, "y": 213 }, - "id": 112, + "id": 1501, "legend": { "alignAsTable": true, "avg": false, @@ -12382,7 +12379,7 @@ "x": 12, "y": 213 }, - "id": 113, + "id": 1502, "legend": { "alignAsTable": true, "avg": false, @@ -12465,7 +12462,7 @@ "x": 0, "y": 33 }, - "id": 1471, + "id": 1600, "panels": [ { "datasource": "${DS_TEST-CLUSTER}", @@ -12530,7 +12527,7 @@ "x": 0, "y": 34 }, - "id": 1473, + "id": 1601, "options": { "colorMode": "value", "graphMode": "area", @@ -12584,7 +12581,7 @@ "y": 34 }, "hiddenSeries": false, - "id": 1478, + "id": 1602, "legend": { "alignAsTable": true, "avg": false, @@ -12686,7 +12683,7 @@ "y": 40 }, "hiddenSeries": false, - "id": 1474, + "id": 1603, "legend": { "alignAsTable": true, "avg": false, @@ -12788,7 +12785,7 @@ "y": 40 }, "hiddenSeries": false, - "id": 1477, + "id": 1604, "legend": { "alignAsTable": true, "avg": false, @@ -12890,7 +12887,7 @@ "y": 46 }, "hiddenSeries": false, - "id": 1475, + "id": 1605, "legend": { "alignAsTable": true, "avg": false, @@ -12992,7 +12989,7 @@ "y": 46 }, "hiddenSeries": false, - "id": 1476, + "id": 1606, "legend": { "alignAsTable": true, "avg": false,