Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update pd/tidb/tikv config to v4.0.2 #2828

Merged
merged 1 commit into from
Jun 29, 2020
Merged

update pd/tidb/tikv config to v4.0.2 #2828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 33 additions & 4 deletions docs/api-references/docs.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3683,6 +3683,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.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to add "Imported from v4.0.2."?

Optional: Defaults to false</p>
</td>
</tr>
</tbody>
</table>
<h3 id="discoveryspec">DiscoverySpec</h3>
Expand Down Expand Up @@ -9705,8 +9718,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>
Expand All @@ -9717,8 +9730,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>
Expand Down
6 changes: 6 additions & 0 deletions manifests/crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1716,6 +1716,8 @@ spec:
type: string
dashboard:
properties:
disable-telemetry:
type: boolean
internal-proxy:
type: boolean
public-path-prefix:
Expand Down Expand Up @@ -6468,6 +6470,8 @@ spec:
type: boolean
enable-table-lock:
type: boolean
enable-telemetry:
type: boolean
experimental:
properties:
allow-auto-random:
Expand Down Expand Up @@ -14817,6 +14821,8 @@ spec:
type: boolean
enable-table-lock:
type: boolean
enable-telemetry:
type: boolean
experimental:
properties:
allow-auto-random:
Expand Down
18 changes: 16 additions & 2 deletions pkg/apis/pingcap/v1alpha1/openapi_generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions pkg/apis/pingcap/v1alpha1/pd_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
11 changes: 9 additions & 2 deletions pkg/apis/pingcap/v1alpha1/tidb_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
10 changes: 10 additions & 0 deletions pkg/apis/pingcap/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.