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: grant cap_net_raw to blackbox_exporter #1250

Merged

Conversation

STRRL
Copy link
Contributor

@STRRL STRRL commented Mar 26, 2021

Signed-off-by: STRRL str_ruiling@outlook.com

What problem does this PR solve?

fix #1249

What is changed and how it works?

  • add AmbientCapabilities=CAP_NET_RAW with condition GrantCapNetRaw in the template
  • set GrantCapNetRaw to true when componentName == spec.ComponentBlackboxExporter

Check List

Tests

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

Manually test with tiup cluster deploy.

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

Signed-off-by: STRRL <str_ruiling@outlook.com>
@ti-chi-bot ti-chi-bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 26, 2021
@CLAassistant
Copy link

CLAassistant commented Mar 26, 2021

CLA assistant check
All committers have signed the CLA.

@ti-chi-bot ti-chi-bot requested a review from lonng March 26, 2021 11:45
@ti-chi-bot ti-chi-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 26, 2021
@STRRL STRRL marked this pull request as ready for review March 29, 2021 10:44
@ti-chi-bot ti-chi-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 29, 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 29, 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: 86b4e8d

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 29, 2021
@codecov-io
Copy link

codecov-io commented Mar 29, 2021

Codecov Report

Merging #1250 (dce0623) into master (50932b4) will decrease coverage by 15.24%.
The diff coverage is 100.00%.

Impacted file tree graph

@@             Coverage Diff             @@
##           master    #1250       +/-   ##
===========================================
- Coverage   53.55%   38.31%   -15.25%     
===========================================
  Files         289      254       -35     
  Lines       20773    17874     -2899     
===========================================
- Hits        11126     6848     -4278     
- Misses       7911     9808     +1897     
+ Partials     1736     1218      -518     
Flag Coverage Δ
cluster 32.64% <100.00%> (-12.52%) ⬇️
dm 26.68% <100.00%> (+0.06%) ⬆️
integrate 38.31% <100.00%> (-9.74%) ⬇️
playground ?
tiup ?
unittest ?

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

Impacted Files Coverage Δ
pkg/cluster/template/systemd/system.go 73.33% <ø> (ø)
pkg/cluster/task/monitored_config.go 56.94% <100.00%> (+1.23%) ⬆️
pkg/repository/store/store.go 0.00% <0.00%> (-100.00%) ⬇️
components/dm/ansible/worker.go 0.00% <0.00%> (-100.00%) ⬇️
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/repository/store/local.go 0.00% <0.00%> (-76.48%) ⬇️
pkg/cluster/api/error.go 0.00% <0.00%> (-75.00%) ⬇️
... and 159 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 50932b4...dce0623. Read the comment docs.

@ti-chi-bot ti-chi-bot merged commit 3836c20 into pingcap:master Mar 30, 2021
@AstroProfundis AstroProfundis added this to the v1.4.0 milestone Mar 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/XS Denotes a PR that changes 0-9 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.

blackbox_exporter need cap_net_raw capability for ICMP ping
5 participants