From 509ba4864b9a976814d00f57be506c74d74cff3e Mon Sep 17 00:00:00 2001 From: Suhaha Date: Fri, 3 Sep 2021 23:18:38 +0800 Subject: [PATCH] update: dashboard to v2021.09.03.1 & dashboard distro populate Signed-off-by: Suhaha --- go.mod | 2 +- go.sum | 4 ++-- pkg/dashboard/distro/distro.go | 3 +++ .../distro/{distro_info_placeholder.go => placeholder.go} | 8 +------- 4 files changed, 7 insertions(+), 10 deletions(-) rename pkg/dashboard/distro/{distro_info_placeholder.go => placeholder.go} (73%) diff --git a/go.mod b/go.mod index 78e36db36ab6..394baab371bd 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-20210902131650-8f3ae7a9f96e + github.com/pingcap/tidb-dashboard v0.0.0-20210903143224-ee42b1db0c90 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 961e41ccdb3e..720a597d16e6 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-20210902131650-8f3ae7a9f96e h1:QOPqg7Ofy/4g5d0oOCTTV0uZu826fqLy8tVs//FGROs= -github.com/pingcap/tidb-dashboard v0.0.0-20210902131650-8f3ae7a9f96e/go.mod h1:OCXbZTBTIMRcIt0jFsuCakZP+goYRv6IjawKbwLS2TQ= +github.com/pingcap/tidb-dashboard v0.0.0-20210903143224-ee42b1db0c90 h1:20uyvMa9D7vBVoLl9b5ENMy+TmMrr1zjTYEpspFZ7gE= +github.com/pingcap/tidb-dashboard v0.0.0-20210903143224-ee42b1db0c90/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 3506206f00f5..dff0ac47086d 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 73% rename from pkg/dashboard/distro/distro_info_placeholder.go rename to pkg/dashboard/distro/placeholder.go index 76cd5b28062f..8c2f958cfa52 100644 --- a/pkg/dashboard/distro/distro_info_placeholder.go +++ b/pkg/dashboard/distro/placeholder.go @@ -1,4 +1,4 @@ -// Copyright 2021 TiKV Project Authors. +// Copyright 2021 root // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -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