diff --git a/conf/config.toml b/conf/config.toml index 488275267d6..8b80a5044f1 100644 --- a/conf/config.toml +++ b/conf/config.toml @@ -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. diff --git a/server/config/config.go b/server/config/config.go index 5c3f649a551..d5f39170932 100644 --- a/server/config/config.go +++ b/server/config/config.go @@ -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. @@ -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. @@ -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. @@ -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.