Skip to content

Conversation

@kibanamachine
Copy link
Contributor

Backport

This will backport the following commits from main to 8.18:

Questions ?

Please refer to the Backport tool documentation

…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 kibanamachine added the backport This PR is a backport of another PR label Aug 5, 2025
@kibanamachine kibanamachine enabled auto-merge (squash) August 5, 2025 17:39
@botelastic botelastic bot added the Team:Fleet Team label for Observability Data Collection Fleet team label Aug 5, 2025
@elasticmachine
Copy link
Contributor

Pinging @elastic/fleet (Team:Fleet)

@kibanamachine kibanamachine merged commit 570bfc0 into elastic:8.18 Aug 5, 2025
13 checks passed
@elasticmachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id before after diff
fleet 1.8MB 1.8MB +22.0B

cc @MichelLosier

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-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport This PR is a backport of another PR Team:Fleet Team label for Observability Data Collection Fleet team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants