Skip to content

Commit

Permalink
chore(dashboard): update TiDB Dashboard to v6.5.11-9d2b0ce6 [release-…
Browse files Browse the repository at this point in the history 
…6.5] (tikv#8601)

ref tikv#8611

Signed-off-by: baurine <2008.hbl@gmail.com>
Signed-off-by: mornyx <mornyx.z@gmail.com>

Co-authored-by: mornyx <mornyx.z@gmail.com>
  • Loading branch information
@baurine @mornyx
baurine and mornyx authored Sep 10, 2024
1 parent 1bbec47 commit 86ddba1
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 7 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ require (
github.com/pingcap/kvproto v0.0.0-20230726063044-73d6d7f3756b
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3
github.com/pingcap/sysutil v0.0.0-20211208032423-041a72e5860d
github.com/pingcap/tidb-dashboard v0.0.0-20240327052925-0f035e0e22ee
github.com/pingcap/tidb-dashboard v0.0.0-20240830072655-9d2b0ce603a1
github.com/prometheus/client_golang v1.11.1
github.com/prometheus/common v0.26.0
github.com/sasha-s/go-deadlock v0.2.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -394,8 +394,8 @@ 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 v0.0.0-20211208032423-041a72e5860d h1:k3/APKZjXOyJrFy8VyYwRlZhMelpD3qBLJNsw3bPl/g=
github.com/pingcap/sysutil v0.0.0-20211208032423-041a72e5860d/go.mod h1:7j18ezaWTao2LHOyMlsc2Dg1vW+mDY9dEbPzVyOlaeM=
github.com/pingcap/tidb-dashboard v0.0.0-20240327052925-0f035e0e22ee h1:NRj1mZgcyXxvbvb0eaoI5UZCQfT2kv3oKwlb4bdgXGY=
github.com/pingcap/tidb-dashboard v0.0.0-20240327052925-0f035e0e22ee/go.mod h1:ucZBRz52icb23T/5Z4CsuUHmarYiin7p2MeiVBe+o8c=
github.com/pingcap/tidb-dashboard v0.0.0-20240830072655-9d2b0ce603a1 h1:otd51FMCCJiW7wagKABCeULfcZdMI+WCTH5N6emPGzY=
github.com/pingcap/tidb-dashboard v0.0.0-20240830072655-9d2b0ce603a1/go.mod h1:ucZBRz52icb23T/5Z4CsuUHmarYiin7p2MeiVBe+o8c=
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/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
Expand Down
13 changes: 13 additions & 0 deletions pkg/dashboard/adapter/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,18 @@
package adapter

import (
"os"
"strings"

"github.com/pingcap/tidb-dashboard/pkg/config"

"github.com/tikv/pd/server"
)

const (
envTidbDashboardDisableCustomPromAddr = "TIDB_DASHBOARD_DISABLE_CUSTOM_PROM_ADDR"
)

// GenDashboardConfig generates a configuration for Dashboard Server.
func GenDashboardConfig(srv *server.Server) (*config.Config, error) {
cfg := srv.GetConfig()
Expand Down Expand Up @@ -47,5 +54,11 @@ func GenDashboardConfig(srv *server.Server) (*config.Config, error) {

dashboardCfg.NormalizePublicPathPrefix()

// Allow setting DisableCustomPromAddr via environment variable.
disableCustomPromAddr := strings.ToLower(os.Getenv(envTidbDashboardDisableCustomPromAddr))
if disableCustomPromAddr == "true" || disableCustomPromAddr == "1" {
dashboardCfg.DisableCustomPromAddr = true
}

return dashboardCfg, nil
}
2 changes: 1 addition & 1 deletion scripts/dashboard-version
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# This file is updated by running scripts/update-dashboard.sh
# Don't edit it manullay
6.5.9-0f035e0e
6.5.11-9d2b0ce6
2 changes: 1 addition & 1 deletion tests/client/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ require (
github.com/pingcap/errors v0.11.5-0.20211224045212-9687c2b0f87c // indirect
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 // indirect
github.com/pingcap/sysutil v0.0.0-20211208032423-041a72e5860d // indirect
github.com/pingcap/tidb-dashboard v0.0.0-20240327052925-0f035e0e22ee // indirect
github.com/pingcap/tidb-dashboard v0.0.0-20240830072655-9d2b0ce603a1 // indirect
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: 2 additions & 2 deletions tests/client/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,8 +347,8 @@ 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 v0.0.0-20211208032423-041a72e5860d h1:k3/APKZjXOyJrFy8VyYwRlZhMelpD3qBLJNsw3bPl/g=
github.com/pingcap/sysutil v0.0.0-20211208032423-041a72e5860d/go.mod h1:7j18ezaWTao2LHOyMlsc2Dg1vW+mDY9dEbPzVyOlaeM=
github.com/pingcap/tidb-dashboard v0.0.0-20240327052925-0f035e0e22ee h1:NRj1mZgcyXxvbvb0eaoI5UZCQfT2kv3oKwlb4bdgXGY=
github.com/pingcap/tidb-dashboard v0.0.0-20240327052925-0f035e0e22ee/go.mod h1:ucZBRz52icb23T/5Z4CsuUHmarYiin7p2MeiVBe+o8c=
github.com/pingcap/tidb-dashboard v0.0.0-20240830072655-9d2b0ce603a1 h1:otd51FMCCJiW7wagKABCeULfcZdMI+WCTH5N6emPGzY=
github.com/pingcap/tidb-dashboard v0.0.0-20240830072655-9d2b0ce603a1/go.mod h1:ucZBRz52icb23T/5Z4CsuUHmarYiin7p2MeiVBe+o8c=
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/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
Expand Down

0 comments on commit 86ddba1

Please sign in to comment.