Skip to content

Cherry-pick #24864 to 7.x: Use identifier in HarvesterGroup in filestream#24873

Merged
kvch merged 1 commit intoelastic:7.xfrom
kvch:backport_24864_7.x
Mar 31, 2021
Merged

Cherry-pick #24864 to 7.x: Use identifier in HarvesterGroup in filestream#24873
kvch merged 1 commit intoelastic:7.xfrom
kvch:backport_24864_7.x

Conversation

@kvch
Copy link
Copy Markdown
Contributor

@kvch kvch commented Mar 31, 2021

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

What does this PR do?

This PR adds sourceIdentifier to defaultHarvesterGroup so it uses the same method to access entries in the registry as the Prospector.

Why is it important?

Previously, the HarvesterGroup and Prospector looked for the same resources but got different IDs. HarvesterGroup was not aware of the filestream::{user_id} prefix, thus the Prospector never found the entries created by the HarvesterGroup and vica versa.

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.

@elasticmachine
Copy link
Copy Markdown
Contributor

Pinging @elastic/agent (Team:Agent)

@botelastic botelastic Bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Mar 31, 2021
@kvch kvch force-pushed the backport_24864_7.x branch from 7d26885 to 076f67e Compare March 31, 2021 13:09
@elasticmachine
Copy link
Copy Markdown
Contributor

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #24873 updated

  • Start Time: 2021-03-31T13:35:07.652+0000

  • Duration: 53 min 3 sec

  • Commit: 076f67e

Test stats 🧪

Test Results
Failed 0
Passed 13157
Skipped 2285
Total 15442

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 13157
Skipped 2285
Total 15442

@kvch kvch merged commit c7aa3bd into elastic:7.x Mar 31, 2021
@zube zube Bot removed the [zube]: Done label Jun 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Team:Elastic-Agent Label for the Agent team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants