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

cluster: add additional prom scrape_configs #1641

Merged
merged 4 commits into from
Dec 6, 2021

Conversation

nexustar
Copy link
Collaborator

What problem does this PR solve?

What is changed and how it works?

user may use like this:

Screenshot from 2021-11-26 15-45-27

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 26, 2021

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

@ti-chi-bot ti-chi-bot requested review from breezewish and nrc November 26, 2021 07:50
@ti-chi-bot ti-chi-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 26, 2021
@codecov-commenter
Copy link

codecov-commenter commented Nov 26, 2021

Codecov Report

Merging #1641 (1b21c48) into master (592b46c) will increase coverage by 18.85%.
The diff coverage is 0.00%.

Impacted file tree graph

@@             Coverage Diff             @@
##           master    #1641       +/-   ##
===========================================
+ Coverage   15.57%   34.43%   +18.85%     
===========================================
  Files         151      232       +81     
  Lines       15254    21821     +6567     
===========================================
+ Hits         2376     7513     +5137     
- Misses      12361    13173      +812     
- Partials      517     1135      +618     
Flag Coverage Δ
cluster 34.43% <0.00%> (?)
integrate 34.43% <0.00%> (+18.85%) ⬆️
tiup ?

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

Impacted Files Coverage Δ
pkg/cluster/spec/monitoring.go 56.59% <0.00%> (+56.59%) ⬆️
pkg/repository/store/store.go 0.00% <0.00%> (-100.00%) ⬇️
pkg/repository/utils/hash.go 0.00% <0.00%> (-83.34%) ⬇️
pkg/repository/model/publish.go 0.00% <0.00%> (-83.34%) ⬇️
pkg/repository/store/local.go 0.00% <0.00%> (-82.61%) ⬇️
pkg/repository/progress.go 23.07% <0.00%> (-76.93%) ⬇️
pkg/telemetry/meta.go 0.00% <0.00%> (-67.40%) ⬇️
pkg/telemetry/telemetry.go 0.00% <0.00%> (-66.67%) ⬇️
pkg/repository/v1manifest/keys.go 5.33% <0.00%> (-58.67%) ⬇️
pkg/repository/merge_mirror.go 0.00% <0.00%> (-58.51%) ⬇️
... and 210 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 592b46c...1b21c48. Read the comment docs.

@nexustar nexustar requested review from AstroProfundis and removed request for nrc November 26, 2021 08:10
@AstroProfundis
Copy link
Contributor

AstroProfundis commented Nov 26, 2021

I don't think the nested multi-line config is a good idea.

We had been using nested multi-line format for the server_config and xxx.config fields in early versions of tiup-cluster, the result was getting issues and bug reports about "the config is incorrect" or "the config can not be applied" every week due to wrong indents user input.

There are many editors trying to automatically prepending indents when you edit the file, that's sweet in most cases, but not working well when there is anything nested and will be used to another file with different structure.

-- edit

Oh I see it's not a nested multi-line config string, but rather a map[string]interface{} struct. It seems that could do the trick, we'll need some tests about wired user inputs.

@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 6, 2021
@nexustar nexustar requested a review from breezewish December 6, 2021 06:44
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 6, 2021
@nexustar nexustar added this to the v1.8.0 milestone Dec 6, 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: 1b21c48

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 6, 2021
@ti-chi-bot ti-chi-bot merged commit c1bd929 into pingcap:master Dec 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/L Denotes a PR that changes 100-499 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.

TiUP support user-defined prome configuration during reload
5 participants