diff --git a/go.mod b/go.mod index 5711dde5cd0..65967966cfc 100644 --- a/go.mod +++ b/go.mod @@ -38,7 +38,11 @@ require ( github.com/pingcap/kvproto v0.0.0-20230407040905-68d0eebd564a 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-20241108022316-afb197c94697 +======= + 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 diff --git a/go.sum b/go.sum index 4ce8551fa8d..08bd1d5ada3 100644 --- a/go.sum +++ b/go.sum @@ -414,8 +414,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-20241108022316-afb197c94697 h1:YKdEA3e+nB+jh6D4NrdZOxQ31HNVClWDja2T6atoCWo= github.com/pingcap/tidb-dashboard v0.0.0-20241108022316-afb197c94697/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= diff --git a/scripts/dashboard-version b/scripts/dashboard-version index 776ef72cbfe..3fc3d1a309f 100644 --- a/scripts/dashboard-version +++ b/scripts/dashboard-version @@ -1,3 +1,8 @@ # This file is updated by running scripts/update-dashboard.sh +<<<<<<< HEAD # Don't edit it manullay 7.1.6-afb197c94 +======= +# Don't edit it manually +8.5.0-bce95733 +>>>>>>> cfd8f3436 (chore(dashboard): update TiDB Dashboard to v8.5.0-bce95733 [master] (#8764)) diff --git a/tests/integrations/client/go.mod b/tests/integrations/client/go.mod index a53f3e1963d..51628687117 100644 --- a/tests/integrations/client/go.mod +++ b/tests/integrations/client/go.mod @@ -120,7 +120,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-20241108022316-afb197c94697 // 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 diff --git a/tests/integrations/client/go.sum b/tests/integrations/client/go.sum index 34dbd206e58..2e87ea09280 100644 --- a/tests/integrations/client/go.sum +++ b/tests/integrations/client/go.sum @@ -377,8 +377,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/client/go.sum github.com/pingcap/tidb-dashboard v0.0.0-20241108022316-afb197c94697 h1:YKdEA3e+nB+jh6D4NrdZOxQ31HNVClWDja2T6atoCWo= github.com/pingcap/tidb-dashboard v0.0.0-20241108022316-afb197c94697/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= diff --git a/tests/integrations/mcs/go.mod b/tests/integrations/mcs/go.mod index 412deb9b8e3..83c8dd5182c 100644 --- a/tests/integrations/mcs/go.mod +++ b/tests/integrations/mcs/go.mod @@ -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-20241108022316-afb197c94697 // 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/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect diff --git a/tests/integrations/tso/go.sum b/tests/integrations/tso/go.sum index 7fe5dbfa317..c0d01cf844e 100644 --- a/tests/integrations/tso/go.sum +++ b/tests/integrations/tso/go.sum @@ -377,8 +377,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-20241108022316-afb197c94697 h1:YKdEA3e+nB+jh6D4NrdZOxQ31HNVClWDja2T6atoCWo= github.com/pingcap/tidb-dashboard v0.0.0-20241108022316-afb197c94697/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=