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

Fix the issue that can't gernerate prometheus config #1185

Merged
merged 2 commits into from
Mar 5, 2021

Conversation

lucklove
Copy link
Member

@lucklove lucklove commented Mar 5, 2021

What problem does this PR solve?

Fix #1184, Fix #1186

What is changed and how it works?

Check List

Tests

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

Code changes

  • Has exported function/method change
  • Has exported variable/fields change
  • Has interface methods change
  • Has persistent data change

Side effects

  • Possible performance regression
  • Increased code complexity
  • Breaking backward compatibility

Related changes

  • Need to cherry-pick to the release branch
  • Need to update the documentation

Release notes:

NONE

@ti-chi-bot ti-chi-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 5, 2021
@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • AstroProfundis

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.

Reviewer can indicate their review by writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 5, 2021
@AstroProfundis
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: f0fe317

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 5, 2021
@AstroProfundis AstroProfundis added category/stability Categorizes issue or PR as a stability enhancement. type/bug-fix Categorizes PR as a bug-fix labels Mar 5, 2021
@AstroProfundis AstroProfundis added this to the v1.3.4 milestone Mar 5, 2021
@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 5, 2021
@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Mar 5, 2021
@ti-chi-bot
Copy link
Member

Merge canceled because a new commit is pushed.

@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 5, 2021
@codecov-io
Copy link

codecov-io commented Mar 5, 2021

Codecov Report

Merging #1185 (9a01e4a) into release-1.3 (99b4a13) will increase coverage by 28.55%.
The diff coverage is 50.00%.

Impacted file tree graph

@@               Coverage Diff                @@
##           release-1.3    #1185       +/-   ##
================================================
+ Coverage        16.72%   45.28%   +28.55%     
================================================
  Files              144      265      +121     
  Lines            11082    19090     +8008     
================================================
+ Hits              1854     8644     +6790     
- Misses            8746     9129      +383     
- Partials           482     1317      +835     
Flag Coverage Δ
cluster 37.99% <50.00%> (?)
dm 24.33% <50.00%> (?)
integrate 40.91% <50.00%> (+24.18%) ⬆️
tiup ?
unittest 22.35% <50.00%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
cmd/mirror.go 28.53% <ø> (-17.97%) ⬇️
pkg/environment/env.go 12.67% <ø> (-23.14%) ⬇️
pkg/repository/clone_mirror.go 0.00% <0.00%> (ø)
pkg/cluster/embed/autogen_pkger.go 100.00% <100.00%> (ø)
main.go 0.00% <0.00%> (-100.00%) ⬇️
pkg/repository/utils/hash.go 0.00% <0.00%> (-81.82%) ⬇️
pkg/repository/model/publish.go 0.00% <0.00%> (-71.43%) ⬇️
cmd/env.go 23.07% <0.00%> (-69.24%) ⬇️
pkg/utils/args.go 0.00% <0.00%> (-50.00%) ⬇️
pkg/repository/model/model.go 0.00% <0.00%> (-46.62%) ⬇️
... and 244 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 99b4a13...9a01e4a. Read the comment docs.

@AstroProfundis AstroProfundis merged commit 2c1f238 into pingcap:release-1.3 Mar 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category/stability Categorizes issue or PR as a stability enhancement. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. status/LGT1 Indicates that a PR has LGTM 1. type/bug-fix Categorizes PR as a bug-fix
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants