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.

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

tiup: add additional_args #16114

Merged
merged 6 commits into from
Apr 8, 2024
Merged

tiup: add additional_args #16114

merged 6 commits into from
Apr 8, 2024

Conversation

WalterWj
Copy link
Contributor

@WalterWj WalterWj commented Jan 10, 2024

First-time contributors' checklist

What is changed, added or deleted? (Required)

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

Tips for choosing the affected version(s):

By default, CHOOSE MASTER ONLY so your changes will be applied to the next TiDB major or minor releases. If your PR involves a product feature behavior change or a compatibility change, CHOOSE THE AFFECTED RELEASE BRANCH(ES) AND MASTER.

For details, see tips for choosing the affected versions (in Chinese).

  • master (the latest development version)
  • v7.6 (TiDB 7.6 versions)
  • v7.5 (TiDB 7.5 versions)
  • v7.4 (TiDB 7.4 versions)
  • v7.3 (TiDB 7.3 versions)
  • v7.1 (TiDB 7.1 versions)
  • v6.5 (TiDB 6.5 versions)
  • v6.1 (TiDB 6.1 versions)
  • v5.4 (TiDB 5.4 versions)
  • v5.3 (TiDB 5.3 versions)
  • v5.2 (TiDB 5.2 versions)
  • v5.1 (TiDB 5.1 versions)
  • v5.0 (TiDB 5.0 versions)

What is the related PR or file 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

@ti-chi-bot ti-chi-bot bot added contribution This PR is from a community contributor. missing-translation-status This PR does not have translation status info. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 10, 2024
@Oreoxmt Oreoxmt added needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-7.3 needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. type/enhancement The issue or PR belongs to an enhancement. labels Jan 10, 2024
@Oreoxmt
Copy link
Collaborator

Oreoxmt commented Jan 10, 2024

/cc @srstack

@ti-chi-bot ti-chi-bot bot requested a review from srstack January 10, 2024 09:56
@Oreoxmt Oreoxmt self-assigned this Jan 10, 2024
@Oreoxmt Oreoxmt changed the title Tiup topology tiup: add additional_args Jan 10, 2024
@Oreoxmt Oreoxmt self-requested a review January 10, 2024 09:57
@Oreoxmt Oreoxmt added the translation/doing This PR’s assignee is translating this PR. label Jan 10, 2024
@ti-chi-bot ti-chi-bot bot removed the missing-translation-status This PR does not have translation status info. label Jan 10, 2024
@@ -554,6 +554,7 @@ tispark_workers:
- `os`:`host` 字段所指定的机器的操作系统,若不指定该字段,则默认为 `global` 中的 `os`
- `arch`:`host` 字段所指定的机器的架构,若不指定该字段,则默认为 `global` 中的 `arch`
- `resource_control`:针对该服务的资源控制,如果配置了该字段,会将该字段和 `global` 中的 `resource_control` 内容合并(若字段重叠,以本字段内容为准),然后生成 systemd 配置文件并下发到 `host` 指定机器。`resource_control` 的配置规则同 `global` 中的 `resource_control`
- `additional_args`:配置额外的 Prometheus Args 参数。该字段为一个数组,数组元素为 Prometheus 运行参数。例如:开启 Prometheus 热加载配置,配置 `--web.enable-lifecycle` 即可
Copy link
Contributor

Choose a reason for hiding this comment

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

这个参数虽然merge 到 tiup master 代码了 (pingcap/tiup#2340) ,但鉴于 tiup 未发版,目前终端用户无法直接用到这个参数,建议待包含相关代码的tiup发版后再增加这段文档,最好再标注下从tiup v?开始可以使用

Copy link
Contributor Author

Choose a reason for hiding this comment

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

这个 PR 可以晚点合并。后续的 tiup 发版,我补充下 tiup 版本信息吧。

Copy link
Contributor Author

Choose a reason for hiding this comment

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

这个 PR 应该会合并到 tiup 1.15.0 这个版本

@Oreoxmt Oreoxmt added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 24, 2024
@Oreoxmt
Copy link
Collaborator

Oreoxmt commented Jan 24, 2024

I will merge this PR once TiUP v1.15.0 has been released.

@ti-chi-bot ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Jan 24, 2024
Copy link

ti-chi-bot bot commented Jan 24, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-01-24 02:32:39.413777348 +0000 UTC m=+928000.978075040: ☑️ agreed by Oreoxmt.

@WalterWj
Copy link
Contributor Author

WalterWj commented Apr 8, 2024

When can this be merged? Or do you need me to do something here? @Oreoxmt

@Oreoxmt
Copy link
Collaborator

Oreoxmt commented Apr 8, 2024

/approve

Copy link

ti-chi-bot bot commented Apr 8, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Oreoxmt

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-6.5: #17019.

@ti-chi-bot ti-chi-bot mentioned this pull request Apr 8, 2024
18 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.1: #17020.

@ti-chi-bot ti-chi-bot mentioned this pull request Apr 8, 2024
18 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.4: #17021.

@ti-chi-bot ti-chi-bot mentioned this pull request Apr 8, 2024
18 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.5: #17022.

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.6: #17023.

@ti-chi-bot ti-chi-bot mentioned this pull request Apr 8, 2024
18 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-8.0: #17024.

@ti-chi-bot ti-chi-bot mentioned this pull request Apr 8, 2024
18 tasks
ti-chi-bot bot pushed a commit that referenced this pull request Apr 8, 2024
ti-chi-bot bot pushed a commit that referenced this pull request Apr 8, 2024
ti-chi-bot bot pushed a commit that referenced this pull request Apr 8, 2024
ti-chi-bot bot pushed a commit that referenced this pull request Apr 8, 2024
ti-chi-bot bot pushed a commit that referenced this pull request Apr 8, 2024
ti-chi-bot bot pushed a commit that referenced this pull request Apr 8, 2024
@WalterWj WalterWj deleted the tiupTopology branch April 9, 2024 06:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved contribution This PR is from a community contributor. lgtm needs-1-more-lgtm Indicates a PR needs 1 more LGTM. needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. type/enhancement The issue or PR belongs to an enhancement.
Development

Successfully merging this pull request may close these issues.

5 participants