Fixes agentless integration data fields being overwritten by package metadata#230479
Merged
MichelLosier merged 3 commits intoelastic:mainfrom Aug 5, 2025
Conversation
MichelLosier
changed the title
MichelLosier
added
release_note:fix
backport:version
jen-huang
added
the
Team:Fleet
Contributor
|
Pinging @elastic/fleet (Team:Fleet) |
jen-huang
added
backport:prev-major
and removed
backport:version
jen-huang
approved these changes
Aug 4, 2025
Contributor
jen-huang
left a comment
jen-huang
left a comment
There was a problem hiding this comment.
Small nit (take or leave! 😉), otherwise LGTM
| ): GlobalDataTag[] | undefined => { | ||
| const agentlessGlobalDataTags = getAgentlessGlobalDataTags(packageInfo); | ||
|
|
||
| if (!globalDataTags || !packageInfo || !agentlessGlobalDataTags) { |
Contributor
There was a problem hiding this comment.
nit: could probably be simplified to just this if I'm following correctly:
Suggested change
| if (!globalDataTags || !packageInfo || !agentlessGlobalDataTags) { | |
| if (!agentlessGlobalDataTags) { |
Contributor
Author
There was a problem hiding this comment.
Ah good insight! Yeah I'll swap to that
Contributor
|
Also updated the backport label here because using labels |
Contributor
💛 Build succeeded, but was flaky
Failed CI StepsTest Failures
Metrics [docs]Async chunks
History
|
Contributor
|
Starting backport for target branches: 8.17, 8.18, 8.19 |
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Aug 5, 2025
…metadata (elastic#230479) ## Summary Resolves: elastic#221312 Excludes the agentless package metadata ('organization', 'division', 'team') from an `add_fields` global processor for agent policy inputs. This is to avoid collision with data field usage of the same names by integrations. ## Release Note Fixes agentless integrations using 'organization', 'division', or 'team' data fields being overwritten by package agentless metadata on the agent policy. (cherry picked from commit 35f52e9)
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Aug 5, 2025
…metadata (elastic#230479) ## Summary Resolves: elastic#221312 Excludes the agentless package metadata ('organization', 'division', 'team') from an `add_fields` global processor for agent policy inputs. This is to avoid collision with data field usage of the same names by integrations. ## Release Note Fixes agentless integrations using 'organization', 'division', or 'team' data fields being overwritten by package agentless metadata on the agent policy. (cherry picked from commit 35f52e9)
Contributor
💔 Some backports could not be created
Note: Successful backport PRs will be merged automatically after passing CI. Manual backportTo create the backport manually run: Questions ?Please refer to the Backport tool documentation |
kibanamachine
added a commit
that referenced
this pull request
Aug 5, 2025
…ackage metadata (#230479) (#230650) # Backport This will backport the following commits from `main` to `8.19`: - [Fixes agentless integration data fields being overwritten by package metadata (#230479)](#230479) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Michel Losier","email":"michel.losier@elastic.co"},"sourceCommit":{"committedDate":"2025-08-05T17:32:21Z","message":"Fixes agentless integration data fields being overwritten by package metadata (#230479)\n\n## Summary\n\nResolves: https://github.com/elastic/kibana/issues/221312\n\nExcludes the agentless package metadata ('organization', 'division',\n'team') from an `add_fields` global processor for agent policy inputs.\nThis is to avoid collision with data field usage of the same names by\nintegrations.\n\n## Release Note\n\nFixes agentless integrations using 'organization', 'division', or 'team'\ndata fields being overwritten by package agentless metadata on the agent\npolicy.","sha":"35f52e9778641e94489345d9836449e9230ce559","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Fleet","backport:prev-major","v9.2.0"],"title":"Fixes agentless integration data fields being overwritten by package metadata","number":230479,"url":"https://github.com/elastic/kibana/pull/230479","mergeCommit":{"message":"Fixes agentless integration data fields being overwritten by package metadata (#230479)\n\n## Summary\n\nResolves: https://github.com/elastic/kibana/issues/221312\n\nExcludes the agentless package metadata ('organization', 'division',\n'team') from an `add_fields` global processor for agent policy inputs.\nThis is to avoid collision with data field usage of the same names by\nintegrations.\n\n## Release Note\n\nFixes agentless integrations using 'organization', 'division', or 'team'\ndata fields being overwritten by package agentless metadata on the agent\npolicy.","sha":"35f52e9778641e94489345d9836449e9230ce559"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/230479","number":230479,"mergeCommit":{"message":"Fixes agentless integration data fields being overwritten by package metadata (#230479)\n\n## Summary\n\nResolves: https://github.com/elastic/kibana/issues/221312\n\nExcludes the agentless package metadata ('organization', 'division',\n'team') from an `add_fields` global processor for agent policy inputs.\nThis is to avoid collision with data field usage of the same names by\nintegrations.\n\n## Release Note\n\nFixes agentless integrations using 'organization', 'division', or 'team'\ndata fields being overwritten by package agentless metadata on the agent\npolicy.","sha":"35f52e9778641e94489345d9836449e9230ce559"}}]}] BACKPORT--> Co-authored-by: Michel Losier <michel.losier@elastic.co>
Contributor
|
Uh, |
kibanamachine
added a commit
that referenced
this pull request
Aug 5, 2025
…ackage metadata (#230479) (#230649) # Backport This will backport the following commits from `main` to `8.18`: - [Fixes agentless integration data fields being overwritten by package metadata (#230479)](#230479) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Michel Losier","email":"michel.losier@elastic.co"},"sourceCommit":{"committedDate":"2025-08-05T17:32:21Z","message":"Fixes agentless integration data fields being overwritten by package metadata (#230479)\n\n## Summary\n\nResolves: https://github.com/elastic/kibana/issues/221312\n\nExcludes the agentless package metadata ('organization', 'division',\n'team') from an `add_fields` global processor for agent policy inputs.\nThis is to avoid collision with data field usage of the same names by\nintegrations.\n\n## Release Note\n\nFixes agentless integrations using 'organization', 'division', or 'team'\ndata fields being overwritten by package agentless metadata on the agent\npolicy.","sha":"35f52e9778641e94489345d9836449e9230ce559","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Fleet","backport:prev-major","v9.2.0"],"title":"Fixes agentless integration data fields being overwritten by package metadata","number":230479,"url":"https://github.com/elastic/kibana/pull/230479","mergeCommit":{"message":"Fixes agentless integration data fields being overwritten by package metadata (#230479)\n\n## Summary\n\nResolves: https://github.com/elastic/kibana/issues/221312\n\nExcludes the agentless package metadata ('organization', 'division',\n'team') from an `add_fields` global processor for agent policy inputs.\nThis is to avoid collision with data field usage of the same names by\nintegrations.\n\n## Release Note\n\nFixes agentless integrations using 'organization', 'division', or 'team'\ndata fields being overwritten by package agentless metadata on the agent\npolicy.","sha":"35f52e9778641e94489345d9836449e9230ce559"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/230479","number":230479,"mergeCommit":{"message":"Fixes agentless integration data fields being overwritten by package metadata (#230479)\n\n## Summary\n\nResolves: https://github.com/elastic/kibana/issues/221312\n\nExcludes the agentless package metadata ('organization', 'division',\n'team') from an `add_fields` global processor for agent policy inputs.\nThis is to avoid collision with data field usage of the same names by\nintegrations.\n\n## Release Note\n\nFixes agentless integrations using 'organization', 'division', or 'team'\ndata fields being overwritten by package agentless metadata on the agent\npolicy.","sha":"35f52e9778641e94489345d9836449e9230ce559"}}]}] BACKPORT--> Co-authored-by: Michel Losier <michel.losier@elastic.co>
Contributor
Author
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
MichelLosier
added a commit
to MichelLosier/kibana
that referenced
this pull request
Aug 5, 2025
…metadata (elastic#230479) ## Summary Resolves: elastic#221312 Excludes the agentless package metadata ('organization', 'division', 'team') from an `add_fields` global processor for agent policy inputs. This is to avoid collision with data field usage of the same names by integrations. ## Release Note Fixes agentless integrations using 'organization', 'division', or 'team' data fields being overwritten by package agentless metadata on the agent policy. (cherry picked from commit 35f52e9)
MichelLosier
added a commit
to MichelLosier/kibana
that referenced
this pull request
Aug 5, 2025
…metadata (elastic#230479) ## Summary Resolves: elastic#221312 Excludes the agentless package metadata ('organization', 'division', 'team') from an `add_fields` global processor for agent policy inputs. This is to avoid collision with data field usage of the same names by integrations. ## Release Note Fixes agentless integrations using 'organization', 'division', or 'team' data fields being overwritten by package agentless metadata on the agent policy. (cherry picked from commit 35f52e9)
delanni
pushed a commit
to delanni/kibana
that referenced
this pull request
Aug 5, 2025
…metadata (elastic#230479) ## Summary Resolves: elastic#221312 Excludes the agentless package metadata ('organization', 'division', 'team') from an `add_fields` global processor for agent policy inputs. This is to avoid collision with data field usage of the same names by integrations. ## Release Note Fixes agentless integrations using 'organization', 'division', or 'team' data fields being overwritten by package agentless metadata on the agent policy.
MichelLosier
added a commit
that referenced
this pull request
Aug 5, 2025
…ckage metadata (#230479) (#230680) # Backport This will backport the following commits from `main` to `9.1`: - [Fixes agentless integration data fields being overwritten by package metadata (#230479)](#230479) <!--- Backport version: 10.0.1 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Michel Losier","email":"michel.losier@elastic.co"},"sourceCommit":{"committedDate":"2025-08-05T17:32:21Z","message":"Fixes agentless integration data fields being overwritten by package metadata (#230479)\n\n## Summary\n\nResolves: https://github.com/elastic/kibana/issues/221312\n\nExcludes the agentless package metadata ('organization', 'division',\n'team') from an `add_fields` global processor for agent policy inputs.\nThis is to avoid collision with data field usage of the same names by\nintegrations.\n\n## Release Note\n\nFixes agentless integrations using 'organization', 'division', or 'team'\ndata fields being overwritten by package agentless metadata on the agent\npolicy.","sha":"35f52e9778641e94489345d9836449e9230ce559","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Fleet","backport:prev-major","v9.2.0","v8.18.5","v8.19.1"],"title":"Fixes agentless integration data fields being overwritten by package metadata","number":230479,"url":"https://github.com/elastic/kibana/pull/230479","mergeCommit":{"message":"Fixes agentless integration data fields being overwritten by package metadata (#230479)\n\n## Summary\n\nResolves: https://github.com/elastic/kibana/issues/221312\n\nExcludes the agentless package metadata ('organization', 'division',\n'team') from an `add_fields` global processor for agent policy inputs.\nThis is to avoid collision with data field usage of the same names by\nintegrations.\n\n## Release Note\n\nFixes agentless integrations using 'organization', 'division', or 'team'\ndata fields being overwritten by package agentless metadata on the agent\npolicy.","sha":"35f52e9778641e94489345d9836449e9230ce559"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/230479","number":230479,"mergeCommit":{"message":"Fixes agentless integration data fields being overwritten by package metadata (#230479)\n\n## Summary\n\nResolves: https://github.com/elastic/kibana/issues/221312\n\nExcludes the agentless package metadata ('organization', 'division',\n'team') from an `add_fields` global processor for agent policy inputs.\nThis is to avoid collision with data field usage of the same names by\nintegrations.\n\n## Release Note\n\nFixes agentless integrations using 'organization', 'division', or 'team'\ndata fields being overwritten by package agentless metadata on the agent\npolicy.","sha":"35f52e9778641e94489345d9836449e9230ce559"}},{"branch":"8.18","label":"v8.18.5","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/230649","number":230649,"state":"MERGED","mergeCommit":{"sha":"570bfc04c04e970ac9e972f310967fb64a72ed74","message":"[8.18] Fixes agentless integration data fields being overwritten by package metadata (#230479) (#230649)\n\n# Backport\n\nThis will backport the following commits from `main` to `8.18`:\n- [Fixes agentless integration data fields being overwritten by package\nmetadata (#230479)](https://github.com/elastic/kibana/pull/230479)\n\n\n\n### Questions ?\nPlease refer to the [Backport tool\ndocumentation](https://github.com/sorenlouv/backport)\n\n\n\nCo-authored-by: Michel Losier <michel.losier@elastic.co>"}},{"branch":"8.19","label":"v8.19.1","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/230650","number":230650,"state":"MERGED","mergeCommit":{"sha":"01de655281c53bde129028e8d0d53a004d7edd16","message":"[8.19] Fixes agentless integration data fields being overwritten by package metadata (#230479) (#230650)\n\n# Backport\n\nThis will backport the following commits from `main` to `8.19`:\n- [Fixes agentless integration data fields being overwritten by package\nmetadata (#230479)](https://github.com/elastic/kibana/pull/230479)\n\n\n\n### Questions ?\nPlease refer to the [Backport tool\ndocumentation](https://github.com/sorenlouv/backport)\n\n\n\nCo-authored-by: Michel Losier <michel.losier@elastic.co>"}}]}] BACKPORT-->
MichelLosier
added a commit
that referenced
this pull request
Aug 5, 2025
…ckage metadata (#230479) (#230681) # Backport This will backport the following commits from `main` to `9.0`: - [Fixes agentless integration data fields being overwritten by package metadata (#230479)](#230479) <!--- Backport version: 10.0.1 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Michel Losier","email":"michel.losier@elastic.co"},"sourceCommit":{"committedDate":"2025-08-05T17:32:21Z","message":"Fixes agentless integration data fields being overwritten by package metadata (#230479)\n\n## Summary\n\nResolves: https://github.com/elastic/kibana/issues/221312\n\nExcludes the agentless package metadata ('organization', 'division',\n'team') from an `add_fields` global processor for agent policy inputs.\nThis is to avoid collision with data field usage of the same names by\nintegrations.\n\n## Release Note\n\nFixes agentless integrations using 'organization', 'division', or 'team'\ndata fields being overwritten by package agentless metadata on the agent\npolicy.","sha":"35f52e9778641e94489345d9836449e9230ce559","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Fleet","backport:prev-major","v9.2.0","v8.18.5","v8.19.1"],"title":"Fixes agentless integration data fields being overwritten by package metadata","number":230479,"url":"https://github.com/elastic/kibana/pull/230479","mergeCommit":{"message":"Fixes agentless integration data fields being overwritten by package metadata (#230479)\n\n## Summary\n\nResolves: https://github.com/elastic/kibana/issues/221312\n\nExcludes the agentless package metadata ('organization', 'division',\n'team') from an `add_fields` global processor for agent policy inputs.\nThis is to avoid collision with data field usage of the same names by\nintegrations.\n\n## Release Note\n\nFixes agentless integrations using 'organization', 'division', or 'team'\ndata fields being overwritten by package agentless metadata on the agent\npolicy.","sha":"35f52e9778641e94489345d9836449e9230ce559"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/230479","number":230479,"mergeCommit":{"message":"Fixes agentless integration data fields being overwritten by package metadata (#230479)\n\n## Summary\n\nResolves: https://github.com/elastic/kibana/issues/221312\n\nExcludes the agentless package metadata ('organization', 'division',\n'team') from an `add_fields` global processor for agent policy inputs.\nThis is to avoid collision with data field usage of the same names by\nintegrations.\n\n## Release Note\n\nFixes agentless integrations using 'organization', 'division', or 'team'\ndata fields being overwritten by package agentless metadata on the agent\npolicy.","sha":"35f52e9778641e94489345d9836449e9230ce559"}},{"branch":"8.18","label":"v8.18.5","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/230649","number":230649,"state":"MERGED","mergeCommit":{"sha":"570bfc04c04e970ac9e972f310967fb64a72ed74","message":"[8.18] Fixes agentless integration data fields being overwritten by package metadata (#230479) (#230649)\n\n# Backport\n\nThis will backport the following commits from `main` to `8.18`:\n- [Fixes agentless integration data fields being overwritten by package\nmetadata (#230479)](https://github.com/elastic/kibana/pull/230479)\n\n\n\n### Questions ?\nPlease refer to the [Backport tool\ndocumentation](https://github.com/sorenlouv/backport)\n\n\n\nCo-authored-by: Michel Losier <michel.losier@elastic.co>"}},{"branch":"8.19","label":"v8.19.1","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/230650","number":230650,"state":"MERGED","mergeCommit":{"sha":"01de655281c53bde129028e8d0d53a004d7edd16","message":"[8.19] Fixes agentless integration data fields being overwritten by package metadata (#230479) (#230650)\n\n# Backport\n\nThis will backport the following commits from `main` to `8.19`:\n- [Fixes agentless integration data fields being overwritten by package\nmetadata (#230479)](https://github.com/elastic/kibana/pull/230479)\n\n\n\n### Questions ?\nPlease refer to the [Backport tool\ndocumentation](https://github.com/sorenlouv/backport)\n\n\n\nCo-authored-by: Michel Losier <michel.losier@elastic.co>"}}]}] BACKPORT-->
NicholasPeretti
pushed a commit
to NicholasPeretti/kibana
that referenced
this pull request
Aug 18, 2025
…metadata (elastic#230479) ## Summary Resolves: elastic#221312 Excludes the agentless package metadata ('organization', 'division', 'team') from an `add_fields` global processor for agent policy inputs. This is to avoid collision with data field usage of the same names by integrations. ## Release Note Fixes agentless integrations using 'organization', 'division', or 'team' data fields being overwritten by package agentless metadata on the agent policy.
5 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Resolves: #221312
Excludes the agentless package metadata ('organization', 'division', 'team') from an
add_fieldsglobal processor for agent policy inputs. This is to avoid collision with data field usage of the same names by integrations.Release Note
Fixes agentless integrations using 'organization', 'division', or 'team' data fields being overwritten by package agentless metadata on the agent policy.
Checklist
Check the PR satisfies following conditions.
Reviewers should verify this PR satisfies this list as well.
release_note:*label is applied per the guidelinesbackport:*labels.