Skip to content

Commit

Permalink
This is an automated cherry-pick of tikv#8764
Browse files Browse the repository at this point in the history 
ref tikv#4257

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
  • Loading branch information
@baurine @ti-chi-bot
baurine authored and ti-chi-bot committed Dec 12, 2024
1 parent 21a31ab commit fbd7d4f
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 0 deletions.
4 changes: 4 additions & 0 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,11 @@ require (
github.com/pingcap/kvproto v0.0.0-20230920042517-db656f45023b
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3
github.com/pingcap/sysutil v1.0.1-0.20230407040306-fb007c5aff21
<<<<<<< HEAD
github.com/pingcap/tidb-dashboard v0.0.0-20240925072858-ec6d9999ae7e
=======
github.com/pingcap/tidb-dashboard v0.0.0-20241104061623-bce95733dad7
>>>>>>> cfd8f3436 (chore(dashboard): update TiDB Dashboard to v8.5.0-bce95733 [master] (#8764))
github.com/prometheus/client_golang v1.19.0
github.com/prometheus/common v0.48.0
github.com/sasha-s/go-deadlock v0.2.0
Expand Down
5 changes: 5 additions & 0 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -435,8 +435,13 @@ github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 h1:HR/ylkkLmGdSSDaD8
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3/go.mod h1:DWQW5jICDR7UJh4HtxXSM20Churx4CQL0fwL/SoOSA4=
github.com/pingcap/sysutil v1.0.1-0.20230407040306-fb007c5aff21 h1:QV6jqlfOkh8hqvEAgwBZa+4bSgO0EeKC7s5c6Luam2I=
github.com/pingcap/sysutil v1.0.1-0.20230407040306-fb007c5aff21/go.mod h1:QYnjfA95ZaMefyl1NO8oPtKeb8pYUdnDVhQgf+qdpjM=
<<<<<<< HEAD
github.com/pingcap/tidb-dashboard v0.0.0-20240925072858-ec6d9999ae7e h1:L4sz5SKaujJS5TpzySWAuLWO4IxialUk/Z+HlxhNAl8=
github.com/pingcap/tidb-dashboard v0.0.0-20240925072858-ec6d9999ae7e/go.mod h1:ucZBRz52icb23T/5Z4CsuUHmarYiin7p2MeiVBe+o8c=
=======
github.com/pingcap/tidb-dashboard v0.0.0-20241104061623-bce95733dad7 h1:qQnXeY2585WkQaPVc7p4i1MWUECKCbkbw5/QcrK5Ahg=
github.com/pingcap/tidb-dashboard v0.0.0-20241104061623-bce95733dad7/go.mod h1:AT9vfeojwr/GGCHTURXtA8yZBE9AW8LdIo02/eYdfHU=
>>>>>>> cfd8f3436 (chore(dashboard): update TiDB Dashboard to v8.5.0-bce95733 [master] (#8764))
github.com/pingcap/tipb v0.0.0-20220718022156-3e2483c20a9e h1:FBaTXU8C3xgt/drM58VHxojHo/QoG1oPsgWTGvaSpO4=
github.com/pingcap/tipb v0.0.0-20220718022156-3e2483c20a9e/go.mod h1:A7mrd7WHBl1o63LE2bIBGEJMTNWXqhgmYiOvMLxozfs=
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
Expand Down
5 changes: 5 additions & 0 deletions scripts/dashboard-version
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# This file is updated by running scripts/update-dashboard.sh
<<<<<<< HEAD
# Don't edit it manullay
7.5.4-ec6d9999a
=======
# Don't edit it manually
8.5.0-bce95733
>>>>>>> cfd8f3436 (chore(dashboard): update TiDB Dashboard to v8.5.0-bce95733 [master] (#8764))
4 changes: 4 additions & 0 deletions tests/integrations/client/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,11 @@ require (
github.com/pingcap/errcode v0.3.0 // indirect
github.com/pingcap/errors v0.11.5-0.20211224045212-9687c2b0f87c // indirect
github.com/pingcap/sysutil v1.0.1-0.20230407040306-fb007c5aff21 // indirect
<<<<<<< HEAD:tests/integrations/client/go.mod
github.com/pingcap/tidb-dashboard v0.0.0-20240925072858-ec6d9999ae7e // indirect
=======
github.com/pingcap/tidb-dashboard v0.0.0-20241104061623-bce95733dad7 // indirect
>>>>>>> cfd8f3436 (chore(dashboard): update TiDB Dashboard to v8.5.0-bce95733 [master] (#8764)):tools/go.mod
github.com/pingcap/tipb v0.0.0-20220718022156-3e2483c20a9e // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
Expand Down
4 changes: 4 additions & 0 deletions tests/integrations/mcs/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,11 @@ require (
github.com/pingcap/errcode v0.3.0 // indirect
github.com/pingcap/errors v0.11.5-0.20211224045212-9687c2b0f87c // indirect
github.com/pingcap/sysutil v1.0.1-0.20230407040306-fb007c5aff21 // indirect
<<<<<<< HEAD:tests/integrations/mcs/go.mod
github.com/pingcap/tidb-dashboard v0.0.0-20240925072858-ec6d9999ae7e // indirect
=======
github.com/pingcap/tidb-dashboard v0.0.0-20241104061623-bce95733dad7 // indirect
>>>>>>> cfd8f3436 (chore(dashboard): update TiDB Dashboard to v8.5.0-bce95733 [master] (#8764)):tests/integrations/go.mod
github.com/pingcap/tipb v0.0.0-20220718022156-3e2483c20a9e // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
Expand Down
5 changes: 5 additions & 0 deletions tests/integrations/mcs/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -403,8 +403,13 @@ github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 h1:HR/ylkkLmGdSSDaD8
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3/go.mod h1:DWQW5jICDR7UJh4HtxXSM20Churx4CQL0fwL/SoOSA4=
github.com/pingcap/sysutil v1.0.1-0.20230407040306-fb007c5aff21 h1:QV6jqlfOkh8hqvEAgwBZa+4bSgO0EeKC7s5c6Luam2I=
github.com/pingcap/sysutil v1.0.1-0.20230407040306-fb007c5aff21/go.mod h1:QYnjfA95ZaMefyl1NO8oPtKeb8pYUdnDVhQgf+qdpjM=
<<<<<<< HEAD:tests/integrations/mcs/go.sum
github.com/pingcap/tidb-dashboard v0.0.0-20240925072858-ec6d9999ae7e h1:L4sz5SKaujJS5TpzySWAuLWO4IxialUk/Z+HlxhNAl8=
github.com/pingcap/tidb-dashboard v0.0.0-20240925072858-ec6d9999ae7e/go.mod h1:ucZBRz52icb23T/5Z4CsuUHmarYiin7p2MeiVBe+o8c=
=======
github.com/pingcap/tidb-dashboard v0.0.0-20241104061623-bce95733dad7 h1:qQnXeY2585WkQaPVc7p4i1MWUECKCbkbw5/QcrK5Ahg=
github.com/pingcap/tidb-dashboard v0.0.0-20241104061623-bce95733dad7/go.mod h1:AT9vfeojwr/GGCHTURXtA8yZBE9AW8LdIo02/eYdfHU=
>>>>>>> cfd8f3436 (chore(dashboard): update TiDB Dashboard to v8.5.0-bce95733 [master] (#8764)):tests/integrations/go.sum
github.com/pingcap/tipb v0.0.0-20220718022156-3e2483c20a9e h1:FBaTXU8C3xgt/drM58VHxojHo/QoG1oPsgWTGvaSpO4=
github.com/pingcap/tipb v0.0.0-20220718022156-3e2483c20a9e/go.mod h1:A7mrd7WHBl1o63LE2bIBGEJMTNWXqhgmYiOvMLxozfs=
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
Expand Down
5 changes: 5 additions & 0 deletions tests/integrations/tso/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -397,8 +397,13 @@ github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 h1:HR/ylkkLmGdSSDaD8
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3/go.mod h1:DWQW5jICDR7UJh4HtxXSM20Churx4CQL0fwL/SoOSA4=
github.com/pingcap/sysutil v1.0.1-0.20230407040306-fb007c5aff21 h1:QV6jqlfOkh8hqvEAgwBZa+4bSgO0EeKC7s5c6Luam2I=
github.com/pingcap/sysutil v1.0.1-0.20230407040306-fb007c5aff21/go.mod h1:QYnjfA95ZaMefyl1NO8oPtKeb8pYUdnDVhQgf+qdpjM=
<<<<<<< HEAD:tests/integrations/tso/go.sum
github.com/pingcap/tidb-dashboard v0.0.0-20240925072858-ec6d9999ae7e h1:L4sz5SKaujJS5TpzySWAuLWO4IxialUk/Z+HlxhNAl8=
github.com/pingcap/tidb-dashboard v0.0.0-20240925072858-ec6d9999ae7e/go.mod h1:ucZBRz52icb23T/5Z4CsuUHmarYiin7p2MeiVBe+o8c=
=======
github.com/pingcap/tidb-dashboard v0.0.0-20241104061623-bce95733dad7 h1:qQnXeY2585WkQaPVc7p4i1MWUECKCbkbw5/QcrK5Ahg=
github.com/pingcap/tidb-dashboard v0.0.0-20241104061623-bce95733dad7/go.mod h1:AT9vfeojwr/GGCHTURXtA8yZBE9AW8LdIo02/eYdfHU=
>>>>>>> cfd8f3436 (chore(dashboard): update TiDB Dashboard to v8.5.0-bce95733 [master] (#8764)):tools/go.sum
github.com/pingcap/tipb v0.0.0-20220718022156-3e2483c20a9e h1:FBaTXU8C3xgt/drM58VHxojHo/QoG1oPsgWTGvaSpO4=
github.com/pingcap/tipb v0.0.0-20220718022156-3e2483c20a9e/go.mod h1:A7mrd7WHBl1o63LE2bIBGEJMTNWXqhgmYiOvMLxozfs=
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
Expand Down

0 comments on commit fbd7d4f

Please sign in to comment.