Skip to content

dashboard: default close telemetry #5974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ti-chi-bot merged 6 commits into from
Feb 13, 2023
Merged

dashboard: default close telemetry #5974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
691d03e
dashboard: default close telemetry
nolouch Feb 13, 2023
2ce6418
Merge branch 'master' into default-close-telemetry
ti-chi-bot Feb 13, 2023
7e61a7d
Merge branch 'master' into default-close-telemetry
lhy1024 Feb 13, 2023
cbba1ce
Merge branch 'master' into default-close-telemetry
rleungx Feb 13, 2023
cb0f7bf
Merge branch 'master' into default-close-telemetry
ti-chi-bot Feb 13, 2023
52bb29f
Merge branch 'master' into default-close-telemetry
ti-chi-bot Feb 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion conf/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
# internal-proxy = false

## When enabled, usage data will be sent to PingCAP for improving user experience.
# enable-telemetry = true
# enable-telemetry = false

[keyspaces]
## pre-alloc is used to pre-allocate keyspaces during pd bootstrap.
Expand Down
9 changes: 1 addition & 8 deletions server/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ const (
)

var (
defaultEnableTelemetry = true
defaultEnableTelemetry = false
defaultRuntimeServices = []string{}
defaultLocationLabels = []string{}
// DefaultStoreLimit is the default store limit of add peer and remove peer.
Expand Down Expand Up @@ -425,10 +425,6 @@ func (c *Config) Parse(arguments []string) error {
msg := fmt.Sprintf("disable-raft-learner in %s is deprecated", c.configFile)
c.WarningMsgs = append(c.WarningMsgs, msg)
}
if meta.IsDefined("dashboard", "disable-telemetry") {
msg := fmt.Sprintf("disable-telemetry in %s is deprecated, use enable-telemetry instead", c.configFile)
c.WarningMsgs = append(c.WarningMsgs, msg)
}
}

// Parse again to replace with command line options.
Expand Down Expand Up @@ -1424,8 +1420,6 @@ type DashboardConfig struct {
InternalProxy bool `toml:"internal-proxy" json:"internal-proxy"`
EnableTelemetry bool `toml:"enable-telemetry" json:"enable-telemetry"`
EnableExperimental bool `toml:"enable-experimental" json:"enable-experimental"`
// WARN: DisableTelemetry is deprecated.
DisableTelemetry bool `toml:"disable-telemetry" json:"disable-telemetry,omitempty"`
}

// ToTiDBTLSConfig generates tls config for connecting to TiDB, used by tidb-dashboard.
Expand All @@ -1449,7 +1443,6 @@ func (c *DashboardConfig) adjust(meta *configutil.ConfigMetaData) {
if !meta.IsDefined("enable-telemetry") {
c.EnableTelemetry = defaultEnableTelemetry
}
c.EnableTelemetry = c.EnableTelemetry && !c.DisableTelemetry
}

// ReplicationModeConfig is the configuration for the replication policy.
Expand Down
⚡