Rename disable_telemetry to enable_telemetry (#684)

pingcap · Jul 13, 2020 · d11799e · d11799e
1 parent 5af71fe
commit d11799e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/cmd/tidb-dashboard/main.go b/cmd/tidb-dashboard/main.go
@@ -71,7 +71,7 @@ func NewCLIConfig() *DashboardCLIConfig {
 	flag.StringVar(&cfg.CoreConfig.DataDir, "data-dir", "/tmp/dashboard-data", "path to the Dashboard Server data directory")
 	flag.StringVar(&cfg.CoreConfig.PublicPathPrefix, "path-prefix", config.DefaultPublicPathPrefix, "public URL path prefix for reverse proxies")
 	flag.StringVar(&cfg.CoreConfig.PDEndPoint, "pd", "http://127.0.0.1:2379", "PD endpoint address that Dashboard Server connects to")
-	flag.BoolVar(&cfg.CoreConfig.DisableTelemetry, "disable-telemetry", false, "disable client to report data")
+	flag.BoolVar(&cfg.CoreConfig.EnableTelemetry, "enable-telemetry", true, "enable client to report data for analysis")
 
 	showVersion := flag.BoolP("version", "v", false, "print version information and exit")
 

diff --git a/pkg/apiserver/info/info.go b/pkg/apiserver/info/info.go
@@ -47,9 +47,8 @@ func Register(r *gin.RouterGroup, auth *user.AuthService, s *Service) {
 }
 
 type InfoResponse struct { //nolint:golint
-	Version          *version.Info `json:"version"`
-	PDEndPoint       string        `json:"pd_end_point"`
-	DisableTelemetry bool          `json:"disable_telemetry"`
+	Version         *version.Info `json:"version"`
+	EnableTelemetry bool          `json:"enable_telemetry"`
 }
 
 // @Summary Dashboard info
@@ -62,9 +61,8 @@ type InfoResponse struct { //nolint:golint
 // @Failure 401 {object} utils.APIError "Unauthorized failure"
 func (s *Service) infoHandler(c *gin.Context) {
 	resp := InfoResponse{
-		Version:          version.GetInfo(),
-		PDEndPoint:       s.config.PDEndPoint,
-		DisableTelemetry: s.config.DisableTelemetry,
+		Version:         version.GetInfo(),
+		EnableTelemetry: s.config.EnableTelemetry,
 	}
 	c.JSON(http.StatusOK, resp)
 }

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -39,8 +39,8 @@ type Config struct {
 	// TLS config for mTLS authentication between TiDB and MySQL client.
 	TiDBTLSConfig *tls.Config
 
-	// Disable client to report data for analysis
-	DisableTelemetry bool
+	// Enable client to report data for analysis
+	EnableTelemetry bool
 }
 
 func (c *Config) NormalizePDEndPoint() error {

diff --git a/ui/lib/utils/telemetry.ts b/ui/lib/utils/telemetry.ts
@@ -26,7 +26,7 @@ export async function init(info: InfoInfoResponse) {
   mixpanel.init(token, options)
   // disable mixpanel to report data immediately
   mixpanel.opt_out_tracking()
-  if (info?.disable_telemetry === false) {
+  if (info?.enable_telemetry) {
     mixpanel.register({
       $current_url: getPathInLocationHash(),
     })