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 incorrect usage of hints builder when exposed port is a substring of the hint #19052

Merged
merged 1 commit into from
Jun 12, 2020

Conversation

vjsamuel
Copy link
Contributor

@vjsamuel vjsamuel commented Jun 8, 2020

Type of change - Bug

What does this PR do?

This PR makes sure that if a user exposes port 80 and has 8080 on the metric hint, then we dont use that port to do the autodiscover as the port could be exposed on another container

Why is it important?

This is important as this impacts what container metadata gets appended to the metric.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Author's Checklist

How to test this PR locally

Related issues

Use cases

@elasticmachine
Copy link
Collaborator

Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually?

1 similar comment
@elasticmachine
Copy link
Collaborator

Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually?

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 8, 2020
@elasticmachine
Copy link
Collaborator

elasticmachine commented Jun 8, 2020

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #19052 updated]

  • Start Time: 2020-06-10T17:28:09.751+0000

  • Duration: 89 min 53 sec

Test stats 🧪

Test Results
Failed 0
Passed 4383
Skipped 1003
Total 5386

@jsoriano
Copy link
Member

jsoriano commented Jun 8, 2020

jenkins run the tests please

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jun 8, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/siem (Team:SIEM)

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 8, 2020
@andrewkroh andrewkroh added the Metricbeat Metricbeat label Jun 8, 2020
Copy link
Member

@jsoriano jsoriano left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this fix! I have added an small suggestion for a test case, let me know what you think.

metricbeat/autodiscover/builder/hints/metrics.go Outdated Show resolved Hide resolved
@jsoriano jsoriano self-assigned this Jun 8, 2020
@jsoriano
Copy link
Member

jsoriano commented Jun 8, 2020

@ChrsMark could you also take a look to this change? Thanks!

@jsoriano jsoriano added the Team:Platforms Label for the Integrations - Platforms team label Jun 8, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations-platforms (Team:Platforms)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jun 8, 2020
@vjsamuel vjsamuel force-pushed the correct_hints_usage branch 2 times, most recently from 603aeeb to de74e23 Compare June 9, 2020 06:11
Copy link
Member

@ChrsMark ChrsMark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

@ChrsMark
Copy link
Member

ChrsMark commented Jun 9, 2020

ok to test

@jsoriano
Copy link
Member

jsoriano commented Jun 9, 2020

jenkins run the tests please

@vjsamuel vjsamuel force-pushed the correct_hints_usage branch 2 times, most recently from 21efb1f to 9070b0e Compare June 10, 2020 06:20
@jsoriano
Copy link
Member

jenkins run the tests please

@jsoriano jsoriano added v7.9.0 needs_backport PR is waiting to be backported to other branches. labels Jun 10, 2020
@jsoriano jsoriano merged commit 138a23a into elastic:master Jun 12, 2020
jsoriano pushed a commit to jsoriano/beats that referenced this pull request Jun 12, 2020
… of the hint (elastic#19052)

This PR makes sure that if a user exposes port 80 and has 8080 on the
metric hint, then we don't use that port to do the autodiscover as the port
could be exposed on another container.

(cherry picked from commit 138a23a)
@jsoriano jsoriano removed the needs_backport PR is waiting to be backported to other branches. label Jun 12, 2020
@vjsamuel vjsamuel deleted the correct_hints_usage branch June 12, 2020 15:44
v1v added a commit to v1v/beats that referenced this pull request Jun 15, 2020
…ngs-archive

* upstream/master:
  Fix minor spelling error in Jenkinsfile (elastic#19153)
  [CI] fail if not possible to install python3 (elastic#19164)
  [Elastic Agent] Improved mage demo experience (elastic#18445)
  [yum] Clear cached data and add retry loop (elastic#19182)
  fix lint job by updating NOTICE (elastic#19161)
  Fix tags for coredns/envoyproxy (elastic#19134)
  Disable host.* fields by default for CrowdStrike module (elastic#19132)
  Allow host.* fields to be disabled in Zeek module (elastic#19113)
  Rename to management.Manager, add UpdateStatus to Manager interface. (elastic#19114)
  Edit Elastic Agent docs (elastic#19146)
  [JJBB] create job definition for the golang-crossbuild project (elastic#19162)
  Fix incorrect usage of hints builder when exposed port is a substring of the hint (elastic#19052)
  Add basic cloudfoundry integration tests (elastic#19018)
jsoriano added a commit that referenced this pull request Jun 15, 2020
… of the hint (#19052) (#19163)

This PR makes sure that if a user exposes port 80 and has 8080 on the
metric hint, then we don't use that port to do the autodiscover as the port
could be exposed on another container.

(cherry picked from commit 138a23a)

Co-authored-by: Vijay Samuel <[email protected]>
melchiormoulin pushed a commit to melchiormoulin/beats that referenced this pull request Oct 14, 2020
… of the hint (elastic#19052)

This PR makes sure that if a user exposes port 80 and has 8080 on the
metric hint, then we don't use that port to do the autodiscover as the port
could be exposed on another container.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Metricbeat Metricbeat review Team:Platforms Label for the Integrations - Platforms team v7.9.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants