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

support config scrape_interval and scrape_timeout for prometheus #2071

Merged
merged 4 commits into from
Nov 10, 2022

Conversation

nexustar
Copy link
Collaborator

@nexustar nexustar commented Nov 8, 2022

What problem does this PR solve?

What is changed and how it works?

截屏2022-11-08 下午3 06 36

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
Copy link
Member

ti-chi-bot commented Nov 8, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • srstack

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 submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@nexustar nexustar added this to the 1.11.1 milestone Nov 8, 2022
@ti-chi-bot ti-chi-bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Nov 8, 2022
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 9, 2022
@codecov-commenter
Copy link

codecov-commenter commented Nov 9, 2022

Codecov Report

Base: 57.14% // Head: 57.01% // Decreases project coverage by -0.13% ⚠️

Coverage data is based on head (894bd28) compared to base (799b089).
Patch coverage: 100.00% of modified lines in pull request are covered.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #2071      +/-   ##
==========================================
- Coverage   57.14%   57.01%   -0.13%     
==========================================
  Files         313      313              
  Lines       33513    33515       +2     
==========================================
- Hits        19149    19108      -41     
- Misses      12116    12159      +43     
  Partials     2248     2248              
Flag Coverage Δ
cluster 45.77% <100.00%> (-0.15%) ⬇️
dm 26.20% <100.00%> (+0.01%) ⬆️
playground 14.93% <0.00%> (-0.02%) ⬇️
tiup 16.15% <0.00%> (-<0.01%) ⬇️
unittest 22.59% <0.00%> (-0.01%) ⬇️

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

Impacted Files Coverage Δ
pkg/cluster/template/config/prometheus.go 81.44% <ø> (ø)
pkg/cluster/spec/monitoring.go 76.13% <100.00%> (+0.15%) ⬆️
pkg/cluster/api/cdcapi.go 44.19% <0.00%> (-12.56%) ⬇️
pkg/cluster/operation/scale_in.go 52.98% <0.00%> (-1.88%) ⬇️
pkg/cluster/api/pdapi.go 52.04% <0.00%> (-1.41%) ⬇️
pkg/cluster/spec/cdc.go 56.32% <0.00%> (-0.57%) ⬇️
components/playground/playground.go 50.61% <0.00%> (-0.33%) ⬇️
pkg/cluster/spec/tiflash.go 70.46% <0.00%> (+0.50%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@nexustar
Copy link
Collaborator Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 894bd28

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 10, 2022
@ti-chi-bot ti-chi-bot merged commit 75ba04a into pingcap:master Nov 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/S Denotes a PR that changes 10-29 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support scrape timeout config in prometheus
5 participants