@@ -284,7 +284,7 @@ const (
284284)
285285
286286var (
287- defaultEnableTelemetry = true
287+ defaultEnableTelemetry = false
288288 defaultRuntimeServices = []string {}
289289 defaultLocationLabels = []string {}
290290 // DefaultStoreLimit is the default store limit of add peer and remove peer.
@@ -425,10 +425,6 @@ func (c *Config) Parse(arguments []string) error {
425425 msg := fmt .Sprintf ("disable-raft-learner in %s is deprecated" , c .configFile )
426426 c .WarningMsgs = append (c .WarningMsgs , msg )
427427 }
428- if meta .IsDefined ("dashboard" , "disable-telemetry" ) {
429- msg := fmt .Sprintf ("disable-telemetry in %s is deprecated, use enable-telemetry instead" , c .configFile )
430- c .WarningMsgs = append (c .WarningMsgs , msg )
431- }
432428 }
433429
434430 // Parse again to replace with command line options.
@@ -1424,8 +1420,6 @@ type DashboardConfig struct {
14241420 InternalProxy bool `toml:"internal-proxy" json:"internal-proxy"`
14251421 EnableTelemetry bool `toml:"enable-telemetry" json:"enable-telemetry"`
14261422 EnableExperimental bool `toml:"enable-experimental" json:"enable-experimental"`
1427- // WARN: DisableTelemetry is deprecated.
1428- DisableTelemetry bool `toml:"disable-telemetry" json:"disable-telemetry,omitempty"`
14291423}
14301424
14311425// ToTiDBTLSConfig generates tls config for connecting to TiDB, used by tidb-dashboard.
@@ -1449,7 +1443,6 @@ func (c *DashboardConfig) adjust(meta *configutil.ConfigMetaData) {
14491443 if ! meta .IsDefined ("enable-telemetry" ) {
14501444 c .EnableTelemetry = defaultEnableTelemetry
14511445 }
1452- c .EnableTelemetry = c .EnableTelemetry && ! c .DisableTelemetry
14531446}
14541447
14551448// ReplicationModeConfig is the configuration for the replication policy.
0 commit comments