Skip to content

metrics: let panel series overrides compatible with additional group_by (#18061)#18064

Merged
ti-chi-bot[bot] merged 2 commits intotikv:release-8.5from
ti-chi-bot:cherry-pick-18061-to-release-8.5
Dec 27, 2024
Merged

metrics: let panel series overrides compatible with additional group_by (#18061)#18064
ti-chi-bot[bot] merged 2 commits intotikv:release-8.5from
ti-chi-bot:cherry-pick-18061-to-release-8.5

Conversation

@ti-chi-bot
Copy link
Member

@ti-chi-bot ti-chi-bot commented Dec 26, 2024

This is an automated cherry-pick of #18061

What is changed and how it works?

Issue Number: Close #18060

What's Changed:

Use regex expression in panel seriesOverrides to let it compatible with the optional "additional_groupby" alias.

Current:

image

After this change:

image

Related changes

  • PR to update pingcap/docs/pingcap/docs-cn:
  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Release note

None

@glorv @ti-chi-bot
This is an automated cherry-pick of tikv#18061
55ab3d8 
close tikv#18060

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot added dco-signoff: yes Indicates the PR's author has signed the dco. release-note-none Denotes a PR that doesn't merit a release note. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. type/cherry-pick-for-release-8.5 This PR is cherry-picked to release-8.5 from a source PR. labels Dec 26, 2024
@ti-chi-bot ti-chi-bot mentioned this pull request Dec 26, 2024
Merged
9 tasks
@ti-chi-bot ti-chi-bot bot added do-not-merge/cherry-pick-not-approved size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. cherry-pick-approved Cherry pick PR approved by release team. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. do-not-merge/cherry-pick-not-approved labels Dec 26, 2024
@glorv
resolve conflicts
fbed22e 
Signed-off-by: glorv <glorvs@163.com>
@ti-chi-bot ti-chi-bot bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Dec 27, 2024
@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Dec 27, 2024
@glorv glorv requested review from hbisheng and overvenus December 27, 2024 02:31
overvenus
overvenus approved these changes Dec 27, 2024
View reviewed changes
Copy link
Member

@overvenus overvenus left a comment

Choose a reason for hiding this comment

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

Thanks!

@ti-chi-bot ti-chi-bot bot added the lgtm label Dec 27, 2024
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Dec 27, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: glorv, overvenus

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

The pull request process is described here

Details 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 ti-chi-bot bot removed the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Dec 27, 2024
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Dec 27, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-12-27 02:31:43.48522938 +0000 UTC m=+58438.841233917: ☑️ agreed by glorv.
  • 2024-12-27 02:42:28.335346144 +0000 UTC m=+59083.691350707: ☑️ agreed by overvenus.

@ti-chi-bot ti-chi-bot bot merged commit ddbcd54 into tikv:release-8.5 Dec 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@overvenus overvenus overvenus approved these changes

@glorv glorv glorv approved these changes

@hbisheng hbisheng Awaiting requested review from hbisheng

Assignees

@glorv glorv

Labels

approved cherry-pick-approved Cherry pick PR approved by release team. dco-signoff: yes Indicates the PR's author has signed the dco. lgtm release-note-none Denotes a PR that doesn't merit a release note. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. type/cherry-pick-for-release-8.5 This PR is cherry-picked to release-8.5 from a source PR.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ti-chi-bot @overvenus @glorv