Skip to content
This repository has been archived by the owner on Nov 24, 2023. It is now read-only.

*: refine metrics #1438

Merged
merged 4 commits into from
Feb 20, 2021
Merged

*: refine metrics #1438

merged 4 commits into from
Feb 20, 2021

Conversation

lance6716
Copy link
Collaborator

@lance6716 lance6716 commented Feb 18, 2021 •
edited
Loading

What problem does this PR solve?

part of #1218
part of #1419

What is changed and how it works?

  • don't overwrite prometheus registry so metrics of embedded etcd could be exposed
  • add alert when no master is up
  • fix prometheus query error of one-to-many subtraction
  • remove duplicate copys of metrics config files

Check List

Tests

  • Integration test
  • Manual test (check group_right could work)

Code changes

Side effects

Related changes

  • Need to cherry-pick to the release branch
  • Need to be included in the release note

@lance6716 lance6716 added needs-cherry-pick-release-2.0 This PR should be cherry-picked to release-2.0. Remove this label after cherry-picked to release-2.0 needs-update-docs Should update docs after this PR is merged. Remove this label once the docs are updated needs-update-release-note This PR should be added into release notes. Remove this label once the release notes are updated labels Feb 19, 2021
@lance6716 lance6716 added this to the v2.0.2 milestone Feb 19, 2021
lichunzhu
lichunzhu reviewed Feb 19, 2021
View reviewed changes
Copy link
Contributor

@lichunzhu lichunzhu left a comment

Choose a reason for hiding this comment

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

/lgtm

@lance6716 lance6716 added the status/LGT1 One reviewer already commented LGTM label Feb 20, 2021
@lance6716
Copy link
Collaborator Author

/run-all-tests

@zier-one
Copy link
Contributor

LGTM

@lance6716 lance6716 merged commit 2fa864f into pingcap:master Feb 20, 2021
ti-srebot pushed a commit to ti-srebot/dm that referenced this pull request Feb 20, 2021
@lance6716 @ti-srebot
cherry pick pingcap#1438 to release-2.0
f820c1d 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Feb 20, 2021
Merged
@ti-srebot
Copy link

cherry pick to release-2.0 in PR #1443

@ti-srebot ti-srebot added already-cherry-pick-2.0 The related PR is already cherry-picked to release-2.0. Add this label once the PR is cherry-picked and removed needs-cherry-pick-release-2.0 This PR should be cherry-picked to release-2.0. Remove this label after cherry-picked to release-2.0 labels Feb 20, 2021
lance6716 pushed a commit that referenced this pull request Feb 20, 2021
@ti-srebot
cherry pick #1438 to release-2.0 (#1443)
b9f9f5c
@lance6716 lance6716 mentioned this pull request Feb 24, 2021
Merged
7 tasks
@ti-srebot ti-srebot mentioned this pull request Mar 8, 2021
Merged
7 tasks
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lichunzhu lichunzhu lichunzhu left review comments

@zier-one zier-one zier-one approved these changes

Assignees
No one assigned
Labels
already-cherry-pick-2.0 The related PR is already cherry-picked to release-2.0. Add this label once the PR is cherry-picked needs-update-docs Should update docs after this PR is merged. Remove this label once the docs are updated needs-update-release-note This PR should be added into release notes. Remove this label once the release notes are updated status/LGT1 One reviewer already commented LGTM
Projects
None yet
Milestone
v2.0.2
Development

Successfully merging this pull request may close these issues.
4 participants
@lance6716 @zier-one @ti-srebot @lichunzhu