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

[8.x] [UII] Allow to create integration policy with no agent policies (#201051) #201306

Merged
merged 1 commit into from
Nov 22, 2024

Conversation

kibanamachine
Copy link
Contributor

Backport

This will backport the following commits from main to 8.x:

Questions ?

Please refer to the Backport tool documentation

…tic#201051)

## Summary

Resolves elastic#198165. This PR fixes an issue where `policy_ids` array was
not able to be cleared behind the scenes to create an orphaned
integration policy, even when cluster is able to use the multiple agent
policies feature.

(cherry picked from commit 3952dea)
@kibanamachine kibanamachine enabled auto-merge (squash) November 22, 2024 01:03
@botelastic botelastic bot added the Team:Fleet Team label for Observability Data Collection Fleet team label Nov 22, 2024
@elasticmachine
Copy link
Contributor

Pinging @elastic/fleet (Team:Fleet)

@kibanamachine kibanamachine merged commit 19059ee into elastic:8.x Nov 22, 2024
29 checks passed
@elasticmachine
Copy link
Contributor

💛 Build succeeded, but was flaky

Failed CI Steps

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 -204.0B

Page load bundle

Size of the bundles that are downloaded on every page load. Target size is below 100kb

id before after diff
fleet 173.6KB 173.7KB +102.0B

cc @jen-huang

jen-huang added a commit that referenced this pull request Nov 25, 2024
#201051) (#201684)

# Backport

This will backport the following commits from `main` to `8.15`:
- [[UII] Allow to create integration policy with no agent policies
(#201051)](#201051)

<!--- Backport version: 8.9.8 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Jen
Huang","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-11-22T00:57:06Z","message":"[UII]
Allow to create integration policy with no agent policies
(#201051)\n\n## Summary\r\n\r\nResolves #198165. This PR fixes an issue
where `policy_ids` array was\r\nnot able to be cleared behind the scenes
to create an orphaned\r\nintegration policy, even when cluster is able
to use the multiple agent\r\npolicies
feature.","sha":"3952dea3962c52dbd8d0cf01f7966670a64639d4","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Fleet","v9.0.0","backport:prev-major","v8.17.0","v8.18.0"],"number":201051,"url":"https://github.com/elastic/kibana/pull/201051","mergeCommit":{"message":"[UII]
Allow to create integration policy with no agent policies
(#201051)\n\n## Summary\r\n\r\nResolves #198165. This PR fixes an issue
where `policy_ids` array was\r\nnot able to be cleared behind the scenes
to create an orphaned\r\nintegration policy, even when cluster is able
to use the multiple agent\r\npolicies
feature.","sha":"3952dea3962c52dbd8d0cf01f7966670a64639d4"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/201051","number":201051,"mergeCommit":{"message":"[UII]
Allow to create integration policy with no agent policies
(#201051)\n\n## Summary\r\n\r\nResolves #198165. This PR fixes an issue
where `policy_ids` array was\r\nnot able to be cleared behind the scenes
to create an orphaned\r\nintegration policy, even when cluster is able
to use the multiple agent\r\npolicies
feature.","sha":"3952dea3962c52dbd8d0cf01f7966670a64639d4"}},{"branch":"8.17","label":"v8.17.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/201305","number":201305,"state":"MERGED","mergeCommit":{"sha":"8eb67bd1883aad804d5c33df61d065f01f4398ca","message":"[8.17]
[UII] Allow to create integration policy with no agent policies
(#201051) (#201305)\n\n# Backport\n\nThis will backport the following
commits from `main` to `8.17`:\n- [[UII] Allow to create integration
policy with no agent
policies\n(#201051)](https://github.com/elastic/kibana/pull/201051)\n\n<!---
Backport version: 9.4.3 -->\n\n### Questions ?\nPlease refer to the
[Backport
tool\ndocumentation](https://github.com/sqren/backport)\n\n<!--BACKPORT
[{\"author\":{\"name\":\"Jen\nHuang\",\"email\":\"[email protected]\"},\"sourceCommit\":{\"committedDate\":\"2024-11-22T00:57:06Z\",\"message\":\"[UII]\nAllow
to create integration policy with no agent policies\n(#201051)\\n\\n##
Summary\\r\\n\\r\\nResolves #198165. This PR fixes an issue\nwhere
`policy_ids` array was\\r\\nnot able to be cleared behind the scenes\nto
create an orphaned\\r\\nintegration policy, even when cluster is
able\nto use the multiple
agent\\r\\npolicies\nfeature.\",\"sha\":\"3952dea3962c52dbd8d0cf01f7966670a64639d4\",\"branchLabelMapping\":{\"^v9.0.0$\":\"main\",\"^v8.18.0$\":\"8.x\",\"^v(\\\\d+).(\\\\d+).\\\\d+$\":\"$1.$2\"}},\"sourcePullRequest\":{\"labels\":[\"release_note:fix\",\"Team:Fleet\",\"v9.0.0\",\"backport:prev-major\"],\"title\":\"[UII]\nAllow
to create integration policy with no
agent\npolicies\",\"number\":201051,\"url\":\"https://github.com/elastic/kibana/pull/201051\",\"mergeCommit\":{\"message\":\"[UII]\nAllow
to create integration policy with no agent policies\n(#201051)\\n\\n##
Summary\\r\\n\\r\\nResolves #198165. This PR fixes an issue\nwhere
`policy_ids` array was\\r\\nnot able to be cleared behind the scenes\nto
create an orphaned\\r\\nintegration policy, even when cluster is
able\nto use the multiple
agent\\r\\npolicies\nfeature.\",\"sha\":\"3952dea3962c52dbd8d0cf01f7966670a64639d4\"}},\"sourceBranch\":\"main\",\"suggestedTargetBranches\":[],\"targetPullRequestStates\":[{\"branch\":\"main\",\"label\":\"v9.0.0\",\"branchLabelMappingKey\":\"^v9.0.0$\",\"isSourceBranch\":true,\"state\":\"MERGED\",\"url\":\"https://github.com/elastic/kibana/pull/201051\",\"number\":201051,\"mergeCommit\":{\"message\":\"[UII]\nAllow
to create integration policy with no agent policies\n(#201051)\\n\\n##
Summary\\r\\n\\r\\nResolves #198165. This PR fixes an issue\nwhere
`policy_ids` array was\\r\\nnot able to be cleared behind the scenes\nto
create an orphaned\\r\\nintegration policy, even when cluster is
able\nto use the multiple
agent\\r\\npolicies\nfeature.\",\"sha\":\"3952dea3962c52dbd8d0cf01f7966670a64639d4\"}}]}]\nBACKPORT-->\n\nCo-authored-by:
Jen Huang
<[email protected]>"}},{"branch":"8.x","label":"v8.18.0","labelRegex":"^v8.18.0$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/201306","number":201306,"state":"MERGED","mergeCommit":{"sha":"19059ee9c2d90d1da7cc21ce05c7c34e6a5b0578","message":"[8.x]
[UII] Allow to create integration policy with no agent policies
(#201051) (#201306)\n\n# Backport\n\nThis will backport the following
commits from `main` to `8.x`:\n- [[UII] Allow to create integration
policy with no agent
policies\n(#201051)](https://github.com/elastic/kibana/pull/201051)\n\n<!---
Backport version: 9.4.3 -->\n\n### Questions ?\nPlease refer to the
[Backport
tool\ndocumentation](https://github.com/sqren/backport)\n\n<!--BACKPORT
[{\"author\":{\"name\":\"Jen\nHuang\",\"email\":\"[email protected]\"},\"sourceCommit\":{\"committedDate\":\"2024-11-22T00:57:06Z\",\"message\":\"[UII]\nAllow
to create integration policy with no agent policies\n(#201051)\\n\\n##
Summary\\r\\n\\r\\nResolves #198165. This PR fixes an issue\nwhere
`policy_ids` array was\\r\\nnot able to be cleared behind the scenes\nto
create an orphaned\\r\\nintegration policy, even when cluster is
able\nto use the multiple
agent\\r\\npolicies\nfeature.\",\"sha\":\"3952dea3962c52dbd8d0cf01f7966670a64639d4\",\"branchLabelMapping\":{\"^v9.0.0$\":\"main\",\"^v8.18.0$\":\"8.x\",\"^v(\\\\d+).(\\\\d+).\\\\d+$\":\"$1.$2\"}},\"sourcePullRequest\":{\"labels\":[\"release_note:fix\",\"Team:Fleet\",\"v9.0.0\",\"backport:prev-major\"],\"title\":\"[UII]\nAllow
to create integration policy with no
agent\npolicies\",\"number\":201051,\"url\":\"https://github.com/elastic/kibana/pull/201051\",\"mergeCommit\":{\"message\":\"[UII]\nAllow
to create integration policy with no agent policies\n(#201051)\\n\\n##
Summary\\r\\n\\r\\nResolves #198165. This PR fixes an issue\nwhere
`policy_ids` array was\\r\\nnot able to be cleared behind the scenes\nto
create an orphaned\\r\\nintegration policy, even when cluster is
able\nto use the multiple
agent\\r\\npolicies\nfeature.\",\"sha\":\"3952dea3962c52dbd8d0cf01f7966670a64639d4\"}},\"sourceBranch\":\"main\",\"suggestedTargetBranches\":[],\"targetPullRequestStates\":[{\"branch\":\"main\",\"label\":\"v9.0.0\",\"branchLabelMappingKey\":\"^v9.0.0$\",\"isSourceBranch\":true,\"state\":\"MERGED\",\"url\":\"https://github.com/elastic/kibana/pull/201051\",\"number\":201051,\"mergeCommit\":{\"message\":\"[UII]\nAllow
to create integration policy with no agent policies\n(#201051)\\n\\n##
Summary\\r\\n\\r\\nResolves #198165. This PR fixes an issue\nwhere
`policy_ids` array was\\r\\nnot able to be cleared behind the scenes\nto
create an orphaned\\r\\nintegration policy, even when cluster is
able\nto use the multiple
agent\\r\\npolicies\nfeature.\",\"sha\":\"3952dea3962c52dbd8d0cf01f7966670a64639d4\"}}]}]\nBACKPORT-->\n\nCo-authored-by:
Jen Huang <[email protected]>"}}]}] BACKPORT-->
jen-huang added a commit that referenced this pull request Nov 26, 2024
#201051) (#201683)

# Backport

This will backport the following commits from `main` to `8.16`:
- [[UII] Allow to create integration policy with no agent policies
(#201051)](#201051)

<!--- Backport version: 8.9.8 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Jen
Huang","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-11-22T00:57:06Z","message":"[UII]
Allow to create integration policy with no agent policies
(#201051)\n\n## Summary\r\n\r\nResolves #198165. This PR fixes an issue
where `policy_ids` array was\r\nnot able to be cleared behind the scenes
to create an orphaned\r\nintegration policy, even when cluster is able
to use the multiple agent\r\npolicies
feature.","sha":"3952dea3962c52dbd8d0cf01f7966670a64639d4","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Fleet","v9.0.0","backport:prev-major","v8.17.0","v8.18.0"],"number":201051,"url":"https://github.com/elastic/kibana/pull/201051","mergeCommit":{"message":"[UII]
Allow to create integration policy with no agent policies
(#201051)\n\n## Summary\r\n\r\nResolves #198165. This PR fixes an issue
where `policy_ids` array was\r\nnot able to be cleared behind the scenes
to create an orphaned\r\nintegration policy, even when cluster is able
to use the multiple agent\r\npolicies
feature.","sha":"3952dea3962c52dbd8d0cf01f7966670a64639d4"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/201051","number":201051,"mergeCommit":{"message":"[UII]
Allow to create integration policy with no agent policies
(#201051)\n\n## Summary\r\n\r\nResolves #198165. This PR fixes an issue
where `policy_ids` array was\r\nnot able to be cleared behind the scenes
to create an orphaned\r\nintegration policy, even when cluster is able
to use the multiple agent\r\npolicies
feature.","sha":"3952dea3962c52dbd8d0cf01f7966670a64639d4"}},{"branch":"8.17","label":"v8.17.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/201305","number":201305,"state":"MERGED","mergeCommit":{"sha":"8eb67bd1883aad804d5c33df61d065f01f4398ca","message":"[8.17]
[UII] Allow to create integration policy with no agent policies
(#201051) (#201305)\n\n# Backport\n\nThis will backport the following
commits from `main` to `8.17`:\n- [[UII] Allow to create integration
policy with no agent
policies\n(#201051)](https://github.com/elastic/kibana/pull/201051)\n\n<!---
Backport version: 9.4.3 -->\n\n### Questions ?\nPlease refer to the
[Backport
tool\ndocumentation](https://github.com/sqren/backport)\n\n<!--BACKPORT
[{\"author\":{\"name\":\"Jen\nHuang\",\"email\":\"[email protected]\"},\"sourceCommit\":{\"committedDate\":\"2024-11-22T00:57:06Z\",\"message\":\"[UII]\nAllow
to create integration policy with no agent policies\n(#201051)\\n\\n##
Summary\\r\\n\\r\\nResolves #198165. This PR fixes an issue\nwhere
`policy_ids` array was\\r\\nnot able to be cleared behind the scenes\nto
create an orphaned\\r\\nintegration policy, even when cluster is
able\nto use the multiple
agent\\r\\npolicies\nfeature.\",\"sha\":\"3952dea3962c52dbd8d0cf01f7966670a64639d4\",\"branchLabelMapping\":{\"^v9.0.0$\":\"main\",\"^v8.18.0$\":\"8.x\",\"^v(\\\\d+).(\\\\d+).\\\\d+$\":\"$1.$2\"}},\"sourcePullRequest\":{\"labels\":[\"release_note:fix\",\"Team:Fleet\",\"v9.0.0\",\"backport:prev-major\"],\"title\":\"[UII]\nAllow
to create integration policy with no
agent\npolicies\",\"number\":201051,\"url\":\"https://github.com/elastic/kibana/pull/201051\",\"mergeCommit\":{\"message\":\"[UII]\nAllow
to create integration policy with no agent policies\n(#201051)\\n\\n##
Summary\\r\\n\\r\\nResolves #198165. This PR fixes an issue\nwhere
`policy_ids` array was\\r\\nnot able to be cleared behind the scenes\nto
create an orphaned\\r\\nintegration policy, even when cluster is
able\nto use the multiple
agent\\r\\npolicies\nfeature.\",\"sha\":\"3952dea3962c52dbd8d0cf01f7966670a64639d4\"}},\"sourceBranch\":\"main\",\"suggestedTargetBranches\":[],\"targetPullRequestStates\":[{\"branch\":\"main\",\"label\":\"v9.0.0\",\"branchLabelMappingKey\":\"^v9.0.0$\",\"isSourceBranch\":true,\"state\":\"MERGED\",\"url\":\"https://github.com/elastic/kibana/pull/201051\",\"number\":201051,\"mergeCommit\":{\"message\":\"[UII]\nAllow
to create integration policy with no agent policies\n(#201051)\\n\\n##
Summary\\r\\n\\r\\nResolves #198165. This PR fixes an issue\nwhere
`policy_ids` array was\\r\\nnot able to be cleared behind the scenes\nto
create an orphaned\\r\\nintegration policy, even when cluster is
able\nto use the multiple
agent\\r\\npolicies\nfeature.\",\"sha\":\"3952dea3962c52dbd8d0cf01f7966670a64639d4\"}}]}]\nBACKPORT-->\n\nCo-authored-by:
Jen Huang
<[email protected]>"}},{"branch":"8.x","label":"v8.18.0","labelRegex":"^v8.18.0$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/201306","number":201306,"state":"MERGED","mergeCommit":{"sha":"19059ee9c2d90d1da7cc21ce05c7c34e6a5b0578","message":"[8.x]
[UII] Allow to create integration policy with no agent policies
(#201051) (#201306)\n\n# Backport\n\nThis will backport the following
commits from `main` to `8.x`:\n- [[UII] Allow to create integration
policy with no agent
policies\n(#201051)](https://github.com/elastic/kibana/pull/201051)\n\n<!---
Backport version: 9.4.3 -->\n\n### Questions ?\nPlease refer to the
[Backport
tool\ndocumentation](https://github.com/sqren/backport)\n\n<!--BACKPORT
[{\"author\":{\"name\":\"Jen\nHuang\",\"email\":\"[email protected]\"},\"sourceCommit\":{\"committedDate\":\"2024-11-22T00:57:06Z\",\"message\":\"[UII]\nAllow
to create integration policy with no agent policies\n(#201051)\\n\\n##
Summary\\r\\n\\r\\nResolves #198165. This PR fixes an issue\nwhere
`policy_ids` array was\\r\\nnot able to be cleared behind the scenes\nto
create an orphaned\\r\\nintegration policy, even when cluster is
able\nto use the multiple
agent\\r\\npolicies\nfeature.\",\"sha\":\"3952dea3962c52dbd8d0cf01f7966670a64639d4\",\"branchLabelMapping\":{\"^v9.0.0$\":\"main\",\"^v8.18.0$\":\"8.x\",\"^v(\\\\d+).(\\\\d+).\\\\d+$\":\"$1.$2\"}},\"sourcePullRequest\":{\"labels\":[\"release_note:fix\",\"Team:Fleet\",\"v9.0.0\",\"backport:prev-major\"],\"title\":\"[UII]\nAllow
to create integration policy with no
agent\npolicies\",\"number\":201051,\"url\":\"https://github.com/elastic/kibana/pull/201051\",\"mergeCommit\":{\"message\":\"[UII]\nAllow
to create integration policy with no agent policies\n(#201051)\\n\\n##
Summary\\r\\n\\r\\nResolves #198165. This PR fixes an issue\nwhere
`policy_ids` array was\\r\\nnot able to be cleared behind the scenes\nto
create an orphaned\\r\\nintegration policy, even when cluster is
able\nto use the multiple
agent\\r\\npolicies\nfeature.\",\"sha\":\"3952dea3962c52dbd8d0cf01f7966670a64639d4\"}},\"sourceBranch\":\"main\",\"suggestedTargetBranches\":[],\"targetPullRequestStates\":[{\"branch\":\"main\",\"label\":\"v9.0.0\",\"branchLabelMappingKey\":\"^v9.0.0$\",\"isSourceBranch\":true,\"state\":\"MERGED\",\"url\":\"https://github.com/elastic/kibana/pull/201051\",\"number\":201051,\"mergeCommit\":{\"message\":\"[UII]\nAllow
to create integration policy with no agent policies\n(#201051)\\n\\n##
Summary\\r\\n\\r\\nResolves #198165. This PR fixes an issue\nwhere
`policy_ids` array was\\r\\nnot able to be cleared behind the scenes\nto
create an orphaned\\r\\nintegration policy, even when cluster is
able\nto use the multiple
agent\\r\\npolicies\nfeature.\",\"sha\":\"3952dea3962c52dbd8d0cf01f7966670a64639d4\"}}]}]\nBACKPORT-->\n\nCo-authored-by:
Jen Huang <[email protected]>"}}]}] BACKPORT-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 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