This is an automated cherry-pick of #5974

close #5973

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

Author: nolouch

conf/config.toml

@@ -199,4 +199,15 @@
 # internal-proxy = false
 
 ## When enabled, usage data will be sent to PingCAP for improving user experience.
+<<<<<<< HEAD
 # enable-telemetry = true
+=======
+# enable-telemetry = false
+
+[keyspaces]
+## pre-alloc is used to pre-allocate keyspaces during pd bootstrap.
+## Its value should be a list of strings, denotting the name of the keyspaces.
+## Example:
+## pre-alloc = ["admin", "user1", "user2"]
+# pre-alloc = []
+>>>>>>> 1bc8e2a5b (dashboard: default close telemetry (#5974))

server/config/config.go

@@ -270,7 +270,7 @@ const (
 )
 
 var (
-	defaultEnableTelemetry = true
+	defaultEnableTelemetry = false
 	defaultRuntimeServices = []string{}
 	defaultLocationLabels  = []string{}
 	// DefaultStoreLimit is the default store limit of add peer and remove peer.
@@ -411,10 +411,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.
@@ -1368,8 +1364,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.
@@ -1393,7 +1387,6 @@ func (c *DashboardConfig) adjust(meta *configMetaData) {
 	if !meta.IsDefined("enable-telemetry") {
 		c.EnableTelemetry = defaultEnableTelemetry
 	}
-	c.EnableTelemetry = c.EnableTelemetry && !c.DisableTelemetry
 }
 
 // ReplicationModeConfig is the configuration for the replication policy.