dashboard: default close telemetry (#5974) (#5984)

close #5973, ref #5974 dashboard: default close telemetry Signed-off-by: nolouch <[email protected]> Co-authored-by: nolouch <[email protected]> Co-authored-by: ShuNing <[email protected]>
tikv · Feb 14, 2023 · 67c0fa2 · 67c0fa2
1 parent 0722c7d
commit 67c0fa2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git 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
@@ -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.