Skip to content

Cherry-pick #19052 to 7.x: Fix incorrect usage of hints builder when exposed port is a substring of the hint #19163

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Jun 15, 2020
Merged

Cherry-pick #19052 to 7.x: Fix incorrect usage of hints builder when exposed port is a substring of the hint #19163

merged 1 commit into from
Jun 15, 2020

Conversation

@jsoriano
Copy link
Member

@jsoriano jsoriano commented Jun 12, 2020 •
edited by zube bot
Loading

Cherry-pick of PR #19052 to 7.x branch. Original message:

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

@vjsamuel @jsoriano
Fix incorrect usage of hints builder when exposed port is a substring…
4ee0d53 
… 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 added [zube]: In Review backport Team:Platforms Label for the Integrations - Platforms team labels Jun 12, 2020
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 12, 2020
@elasticmachine
Copy link
Collaborator

elasticmachine commented Jun 12, 2020

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

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jun 12, 2020
@jsoriano jsoriano self-assigned this Jun 12, 2020
@elasticmachine
Copy link
Collaborator

elasticmachine commented Jun 12, 2020

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #19163 opened]

  • Start Time: 2020-06-12T15:33:29.824+0000

  • Duration: 71 min 57 sec

Test stats 🧪

Test Results
Failed 0
Passed 2853
Skipped 631
Total 3484

@jsoriano jsoriano merged commit f8298da into elastic:7.x Jun 15, 2020
@jsoriano jsoriano deleted the backport_19052_7.x branch June 15, 2020 15:20
@zube zube bot removed the [zube]: Done label Oct 13, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ChrsMark ChrsMark ChrsMark approved these changes

Assignees

@jsoriano jsoriano

Labels

backport Team:Platforms Label for the Integrations - Platforms team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jsoriano @elasticmachine @ChrsMark @vjsamuel