Skip to content

grafana: Fix wrong scheduler command variables of grafana in cloud env (#15833)#16039

Merged
ti-chi-bot[bot] merged 1 commit intotikv:release-6.5from
ti-chi-bot:cherry-pick-15833-to-release-6.5
Nov 21, 2023
Merged

grafana: Fix wrong scheduler command variables of grafana in cloud env (#15833)#16039
ti-chi-bot[bot] merged 1 commit intotikv:release-6.5from
ti-chi-bot:cherry-pick-15833-to-release-6.5

Conversation

@ti-chi-bot
Copy link
Member

@ti-chi-bot ti-chi-bot commented Nov 21, 2023

This is an automated cherry-pick of #15833

What is changed and how it works?

Issue Number: Close #15832

What's Changed:

We use regex /type="([^"]+)"/ to grep the command variables. In cloud env, there is a field called instance_type apart from type. So it would accidentally grep the name of instance_type.

Fix wrong scheduler command variables of grafana in cloud env by adding a `\b` to regex to make sure it's at the word boundary.

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Manual test (add detailed scripts or steps below)
    Before
    FjNHXtqT8G
    After
    XahayOTOT7

Release note 

Fix wrong scheduler command variables of grafana in cloud env

@Connor1996 @ti-chi-bot
close tikv#15832 fix wrong scheduler command variables of grafana
f3d0378 
Signed-off-by: Connor1996 <zbk602423539@gmail.com>
@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR. labels Nov 21, 2023
@ti-chi-bot ti-chi-bot mentioned this pull request Nov 21, 2023
Merged
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Nov 21, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • tonyxuqqi
  • v01dstar

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

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

Details

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Nov 21, 2023
@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 21, 2023
v01dstar
v01dstar approved these changes Nov 21, 2023
View reviewed changes
Copy link
Member

@v01dstar v01dstar 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-chi-bot ti-chi-bot bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Nov 21, 2023
@tonyxuqqi
Copy link
Contributor

tonyxuqqi commented Nov 21, 2023

/test

@tonyxuqqi
Copy link
Contributor

tonyxuqqi commented Nov 21, 2023

/merge

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Nov 21, 2023

@tonyxuqqi: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Nov 21, 2023

This pull request has been accepted and is ready to merge.

DetailsCommit hash: f3d0378

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 21, 2023
@ti-chi-bot ti-chi-bot bot merged commit f442414 into tikv:release-6.5 Nov 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tonyxuqqi tonyxuqqi tonyxuqqi approved these changes

@v01dstar v01dstar v01dstar approved these changes

Assignees

@tonyxuqqi tonyxuqqi

Labels

cherry-pick-approved Cherry pick PR approved by release team. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@ti-chi-bot @tonyxuqqi @v01dstar @Connor1996