Automated cherry pick of #2828: update pd/tidb/tikv config to v4.0.2 (#…

…2830)

docs/api-references/docs.md

@@ -3453,6 +3453,19 @@ bool
 <em>(Optional)</em>
 </td>
 </tr>
+<tr>
+<td>
+<code>disable-telemetry</code></br>
+<em>
+bool
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>When not disabled, usage data will be sent to PingCAP for improving user experience.
+Optional: Defaults to false</p>
+</td>
+</tr>
 </tbody>
 </table>
 <h3 id="discoveryspec">DiscoverySpec</h3>
@@ -9475,8 +9488,8 @@ bool
 </em>
 </td>
 <td>
-<p>imported from v3.1.0
-optional</p>
+<em>(Optional)</em>
+<p>imported from v3.1.0</p>
 </td>
 </tr>
 <tr>
@@ -9487,8 +9500,24 @@ uint64
 </em>
 </td>
 <td>
-<p>imported from v3.1.0
-optional</p>
+<em>(Optional)</em>
+<p>imported from v3.1.0</p>
+</td>
+</tr>
+<tr>
+<td>
+<code>enable-telemetry</code></br>
+<em>
+bool
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>When enabled, usage data (for example, instance versions) will be reported to PingCAP periodically for user experience analytics.
+If this config is set to <code>false</code> on all TiDB servers, telemetry will be always disabled regardless of the value of the global variable <code>tidb_enable_telemetry</code>.
+See PingCAP privacy policy for details: <a href="https://pingcap.com/en/privacy-policy/">https://pingcap.com/en/privacy-policy/</a>.
+Imported from v4.0.2.
+Optional: Defaults to true</p>
 </td>
 </tr>
 </tbody>

manifests/crd.yaml

@@ -1716,6 +1716,8 @@ spec:
                       type: string
                     dashboard:
                       properties:
+                        disable-telemetry:
+                          type: boolean
                         internal-proxy:
                           type: boolean
                         public-path-prefix:
@@ -6468,6 +6470,8 @@ spec:
                       type: boolean
                     enable-table-lock:
                       type: boolean
+                    enable-telemetry:
+                      type: boolean
                     experimental:
                       properties:
                         allow-auto-random:

pkg/apis/pingcap/v1alpha1/pd_config.go

@@ -136,6 +136,10 @@ type DashboardConfig struct {
 	PublicPathPrefix *string `toml:"public-path-prefix,omitempty" json:"public-path-prefix,omitempty"`
 	// +optional
 	InternalProxy *bool `toml:"internal-proxy,omitempty" json:"internal-proxy,omitempty"`
+	// When not disabled, usage data will be sent to PingCAP for improving user experience.
+	// Optional: Defaults to false
+	// +optional
+	DisableTelemetry *bool `toml:"disable-telemetry,omitempty" json:"disable-telemetry,omitempty"`
 }
 
 // PDLogConfig serializes log related config in toml/json.

pkg/apis/pingcap/v1alpha1/tidb_config.go

@@ -134,11 +134,18 @@ type TiDBConfig struct {
 	// +optional
 	EnableDynamicConfig *bool `toml:"enable-dynamic-config,omitempty" json:"enable-dynamic-config,omitempty"`
 	// imported from v3.1.0
-	// optional
+	// +optional
 	EnableTableLock *bool `toml:"enable-table-lock,omitempty" json:"enable-table-lock,omitempty"`
 	// imported from v3.1.0
-	// optional
+	// +optional
 	DelayCleanTableLock *uint64 `toml:"delay-clean-table-lock,omitempty" json:"delay-clean-table-lock,omitempty"`
+	// When enabled, usage data (for example, instance versions) will be reported to PingCAP periodically for user experience analytics.
+	// If this config is set to `false` on all TiDB servers, telemetry will be always disabled regardless of the value of the global variable `tidb_enable_telemetry`.
+	// See PingCAP privacy policy for details: https://pingcap.com/en/privacy-policy/.
+	// Imported from v4.0.2.
+	// Optional: Defaults to true
+	// +optional
+	EnableTelemetry *bool `toml:"enable-telemetry,omitempty" json:"enable-telemetry,omitempty"`
 }
 
 // Log is the log section of config.