From bb4b5c7ae664bdbe083943f8a17e71df2a5df499 Mon Sep 17 00:00:00 2001 From: Suhaha Date: Tue, 12 Oct 2021 12:01:26 +0800 Subject: [PATCH] dashboard: update TiDB Dashboard to v2021.10.08.1 (#4070) * Update to TiDB Dashboard v2021.09.02.2 Signed-off-by: Suhaha * update: dashboard to v2021.09.03.1 & dashboard distro populate Signed-off-by: Suhaha * Update dashboard to v2021.09.27.1 Signed-off-by: Suhaha * chore: go mod tidy Signed-off-by: Suhaha * Update dashboard to v2021.10.08.1 Signed-off-by: Suhaha --- go.mod | 2 +- go.sum | 4 ++-- pkg/dashboard/distro/distro.go | 3 +++ .../distro/{distro_info_placeholder.go => placeholder.go} | 6 ------ 4 files changed, 6 insertions(+), 9 deletions(-) rename pkg/dashboard/distro/{distro_info_placeholder.go => placeholder.go} (78%) diff --git a/go.mod b/go.mod index 129255e8c76..a23c4762627 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,7 @@ require ( github.com/pingcap/kvproto v0.0.0-20210805052247-76981389e818 github.com/pingcap/log v0.0.0-20210625125904-98ed8e2eb1c7 github.com/pingcap/sysutil v0.0.0-20210730114356-fcd8a63f68c5 - github.com/pingcap/tidb-dashboard v0.0.0-20210826074103-29034af68525 + github.com/pingcap/tidb-dashboard v0.0.0-20211008050453-a25c25809529 github.com/prometheus/client_golang v1.1.0 github.com/prometheus/client_model v0.2.0 // indirect github.com/prometheus/common v0.6.0 diff --git a/go.sum b/go.sum index 2e3810b7402..b4db54ae744 100644 --- a/go.sum +++ b/go.sum @@ -327,8 +327,8 @@ github.com/pingcap/log v0.0.0-20210625125904-98ed8e2eb1c7/go.mod h1:8AanEdAHATuR github.com/pingcap/sysutil v0.0.0-20210315073920-cc0985d983a3/go.mod h1:tckvA041UWP+NqYzrJ3fMgC/Hw9wnmQ/tUkp/JaHly8= github.com/pingcap/sysutil v0.0.0-20210730114356-fcd8a63f68c5 h1:7rvAtZe/ZUzOKzgriNPQoBNvleJXBk4z7L3Z47+tS98= github.com/pingcap/sysutil v0.0.0-20210730114356-fcd8a63f68c5/go.mod h1:XsOaV712rUk63aOEKYP9PhXTIE3FMNHmC2r1wX5wElY= -github.com/pingcap/tidb-dashboard v0.0.0-20210826074103-29034af68525 h1:hJDAzcVGfVsUx90/JHXPgvHggxsiuYZJ6FKkLY6Vo3M= -github.com/pingcap/tidb-dashboard v0.0.0-20210826074103-29034af68525/go.mod h1:OCXbZTBTIMRcIt0jFsuCakZP+goYRv6IjawKbwLS2TQ= +github.com/pingcap/tidb-dashboard v0.0.0-20211008050453-a25c25809529 h1:EVU+6dwm/kVb0kHsh+Wdgu2RGcpK1o9eUZI5QFzZPR4= +github.com/pingcap/tidb-dashboard v0.0.0-20211008050453-a25c25809529/go.mod h1:OCXbZTBTIMRcIt0jFsuCakZP+goYRv6IjawKbwLS2TQ= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= diff --git a/pkg/dashboard/distro/distro.go b/pkg/dashboard/distro/distro.go index 3506206f00f..dff0ac47086 100644 --- a/pkg/dashboard/distro/distro.go +++ b/pkg/dashboard/distro/distro.go @@ -12,6 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build dashboard_distro +// +build dashboard_distro + package distro import ( diff --git a/pkg/dashboard/distro/distro_info_placeholder.go b/pkg/dashboard/distro/placeholder.go similarity index 78% rename from pkg/dashboard/distro/distro_info_placeholder.go rename to pkg/dashboard/distro/placeholder.go index 76cd5b28062..3cf9b18b1e3 100644 --- a/pkg/dashboard/distro/distro_info_placeholder.go +++ b/pkg/dashboard/distro/placeholder.go @@ -11,11 +11,5 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -// +build !dashboard_distro package distro - -import "github.com/pingcap/tidb-dashboard/pkg/utils/distro" - -// Resource declared the distro brand information -var Resource = distro.Resource