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 external alertmanager target #1149

Merged
merged 4 commits into from
Feb 24, 2021
Merged

Conversation

lucklove
Copy link
Member

What problem does this PR solve?

Close #1025

What is changed and how it works?

Add ExternalAlertmanagers field in PrometheusSpec, then we can define external alertmanagers in prometheus config:

monitoring_servers:
  - host: 172.16.5.140
    external_alertmanagers:
      - host: 172.16.5.134
      - host: 172.16.5.139
        web_port: 9094

Check List

Tests

  • Manual test (add detailed scripts or steps below)

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/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Feb 23, 2021
@codecov-io
Copy link

codecov-io commented Feb 23, 2021

Codecov Report

Merging #1149 (fc3093d) into master (3d00875) will decrease coverage by 13.84%.
The diff coverage is 0.00%.

Impacted file tree graph

@@             Coverage Diff             @@
##           master    #1149       +/-   ##
===========================================
- Coverage   52.33%   38.49%   -13.85%     
===========================================
  Files         284      222       -62     
  Lines       20278    16012     -4266     
===========================================
- Hits        10613     6164     -4449     
- Misses       8002     8788      +786     
+ Partials     1663     1060      -603     
Flag Coverage Δ
cluster 38.49% <0.00%> (-4.54%) ⬇️
dm ?
integrate 38.49% <0.00%> (-7.86%) ⬇️
playground ?
tiup ?
unittest ?

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

Impacted Files Coverage Δ
pkg/cluster/spec/prometheus.go 64.07% <0.00%> (-16.05%) ⬇️
pkg/repository/store/store.go 0.00% <0.00%> (-100.00%) ⬇️
pkg/queue/any_queue.go 0.00% <0.00%> (-83.34%) ⬇️
pkg/repository/utils/hash.go 0.00% <0.00%> (-81.82%) ⬇️
pkg/meta/err.go 0.00% <0.00%> (-81.25%) ⬇️
pkg/telemetry/meta.go 0.00% <0.00%> (-80.00%) ⬇️
pkg/telemetry/scrub.go 6.66% <0.00%> (-80.00%) ⬇️
pkg/cluster/api/error.go 0.00% <0.00%> (-80.00%) ⬇️
pkg/repository/store/local.go 0.00% <0.00%> (-76.48%) ⬇️
pkg/utils/semver.go 25.00% <0.00%> (-75.00%) ⬇️
... and 177 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 3d00875...fc3093d. Read the comment docs.

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • 9547

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 Feb 23, 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: dee2467

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Feb 24, 2021
@AstroProfundis AstroProfundis added category/usability Categorizes issue or PR as a usability enhancement. type/new-feature Categorizes pr as related to a new feature. labels Feb 24, 2021
@AstroProfundis AstroProfundis added this to the v1.4.0 milestone Feb 24, 2021
@ti-chi-bot ti-chi-bot merged commit 4607799 into pingcap:master Feb 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category/usability Categorizes issue or PR as a usability enhancement. size/M Denotes a PR that changes 30-99 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. type/new-feature Categorizes pr as related to a new feature.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

support configure exists alertmanager target
5 participants