Skip to content

Add TiFlash security configuration (#5094)#5130

Merged
TomShawn merged 2 commits intopingcap:release-4.0from
ti-srebot:release-4.0-f3fdf283ae16
Dec 18, 2020
Merged

Add TiFlash security configuration (#5094)#5130
TomShawn merged 2 commits intopingcap:release-4.0from
ti-srebot:release-4.0-f3fdf283ae16

Conversation

@ti-srebot
Copy link
Contributor

cherry-pick #5094 to release-4.0


Signed-off-by: JaySon-Huang tshent@qq.com

First-time contributors' checklist

What is changed, added or deleted? (Required)

Add document for security configuration in TiFlash.

Which TiDB version(s) do your changes apply to? (Required)

  • master (the latest development version)
  • v4.0 (TiDB 4.0 versions)
  • v3.1 (TiDB 3.1 versions)
  • v3.0 (TiDB 3.0 versions)
  • v2.1 (TiDB 2.1 versions)

What is the related PR or file link(s)?

  • This PR is translated from:
  • Other reference link(s):

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Need modification after applied to another branch
  • Might cause conflicts after applied to another branch

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Dec 18, 2020
10 tasks
@ti-srebot ti-srebot added size/small Changes of a small size. status/PTAL This PR is ready for reviewing. type/cherry-pick-for-release-4.0 This PR is cherry-picked to release-4.0 from a source PR. requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. labels Dec 18, 2020
@ti-srebot
Copy link
Contributor Author

@JaySon-Huang you're already a collaborator in bot's repo.

Comment on lines +86 to +90
[security]
## 若开启该选项,日志中的用户数据会以 `?` 代替显示
## 注意,tiflash-learner 对应的安全配置选项为 `security.redact-info-log`,需要在 tiflash-learner.toml 中另外开启
# redact_info_log = false

Copy link
Contributor

@TomShawn TomShawn Dec 18, 2020

Choose a reason for hiding this comment

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

@JaySon-Huang PTAL

Suggested change
[security]
## 若开启该选项,日志中的用户数据会以 `?` 代替显示
## 注意,tiflash-learner 对应的安全配置选项为 `security.redact-info-log`,需要在 tiflash-learner.toml 中另外开启
# redact_info_log = false

Copy link
Contributor

@JaySon-Huang JaySon-Huang left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-srebot
Copy link
Contributor Author

@JaySon-Huang, Thanks for your review. The bot only counts LGTMs from Reviewers and higher roles, but you're still welcome to leave your comments. See the corresponding SIG page for more information. Related SIG: docs(slack).

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 18, 2020
@TomShawn TomShawn merged commit 8c4dd2e into pingcap:release-4.0 Dec 18, 2020
@JaySon-Huang JaySon-Huang deleted the release-4.0-f3fdf283ae16 branch December 21, 2020 04:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. size/small Changes of a small size. status/LGT1 Indicates that a PR has LGTM 1. status/PTAL This PR is ready for reviewing. type/cherry-pick-for-release-4.0 This PR is cherry-picked to release-4.0 from a source PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants