[Synthetics] Clean up extra synthetics package policies !! #235200
Merged
Conversation
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
ada5a86 to
46acf7d
Compare
mgiota
reviewed
Sep 23, 2025
| encryptedSavedObjects: EncryptedSavedObjectsPluginStart; | ||
| }) { | ||
| const { privateLocationAPI } = this.syntheticsMonitorClient; | ||
| const privateConfigs: Array<{ |
Contributor
There was a problem hiding this comment.
@shahzad31 As far as I understand you fixed synthetics policies being created in multiple places in this PR. With this change you undo the fix. Could it be that you pushed this change by mistake in order to create a broken environment with duplicated policies?
Contributor
There was a problem hiding this comment.
I reapplied the fix in this commit. This change fixes Synthetics API Tests SyncGlobalParamsSpaces number of package policies matches number of monitors failing tests. Will look into the rest ones
Contributor
|
@elasticmachine merge upstream |
csr
approved these changes
Sep 24, 2025
Contributor
csr
left a comment
There was a problem hiding this comment.
AppEx QA codeowner changes LGTM 👍
Contributor
|
Pinging @elastic/obs-ux-management-team (Team:obs-ux-management) |
Contributor
|
Pinging @elastic/fleet (Team:Fleet) |
Contributor
|
@shahzad31 I tested it and here are the results: Before
After
I confirm that the extra policy was successfully deleted. Is it ok though that only one of the automatically generated Another observation I have is that the 2nd space (test) doesn't list any policies under Fleet > Agent policies (this is also on main, nothing to do with the clean up task) 
|
mgiota
approved these changes
Sep 24, 2025
nchaulet
reviewed
Sep 24, 2025
| user?: AuthenticatedUser; | ||
| skipUnassignFromAgentPolicies?: boolean; | ||
| force?: boolean; | ||
| spaceIds?: string[]; |
Member
There was a problem hiding this comment.
I am wondering if we could use the same pattern as getByIds
ids: Array<
| string
| {
id: string;
/**
* The space id associated with the agent policy. When using an un-scoped SO client, the
* space id can be set to `*` which will look for that agent policy across all spaces
*/
spaceId?: string;
}
>,
Contributor
There was a problem hiding this comment.
Looks like this ask is in reference to the getByIds definition on AgentPolicyService
https://github.com/elastic/kibana/blob/main/x-pack/platform/plugins/shared/fleet/server/services/agent_policy.ts#L719-L726
That said, the PackagePolicyClientImpl.getByIDs follows a different pattern, which this PR adopts, using the WithSpaceIdsOption interface, which is also used in other parts of this client.
65d2cc4 to
03955be
Compare
shahzad31
commented
Sep 26, 2025
x-pack/solutions/observability/plugins/synthetics/server/routes/tasks/trigger_task_run.ts
Outdated
Show resolved
Hide resolved
Contributor
💔 Build Failed
Failed CI StepsHistory
|
...utions/observability/plugins/synthetics/server/tasks/sync_private_locations_monitors_task.ts
Show resolved
Hide resolved
...utions/observability/plugins/synthetics/server/tasks/sync_private_locations_monitors_task.ts
Show resolved
Hide resolved
MichelLosier
approved these changes
Sep 30, 2025
Contributor
MichelLosier
left a comment
There was a problem hiding this comment.
Looks good!
With regards to this ask: #235200 (review)
Looks like the changes in this PR are consistent with other parts of the client, if we wanted to adopt later the pattern that was suggested, the changes here would not prevent that. So not a blocker for ✅
Contributor
|
Starting backport for target branches: 8.19, 9.1 |
Contributor
💔 All backports failed
Manual backportTo create the backport manually run: Questions ?Please refer to the Backport tool documentation |
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 |
dominiqueclarke
pushed a commit
to dominiqueclarke/kibana
that referenced
this pull request
Sep 30, 2025
…35200) ## Summary Clean up extra synthetics package policies created via elastic#235021 !! ### Clean up There are three basic tests for clean up 1. SpaceIds being added in a processor where there should only be one 2. Multiple package policies exists for same configId and locationId 3. ConfigId is missing altogether from monitors for a package policy The bug meant multiple spaceIds were being added in processor and also if multiple package policies exists for a locationId and configId, that also passes the test, so we clean up those policies. ### Testing Revert changes in PR elastic#235021, it will create extra package policies once you have monitors in multiple places, switching to this branch should clean up those. --------- Co-authored-by: kibanamachine <[email protected]> (cherry picked from commit ced929a) # Conflicts: # x-pack/solutions/observability/plugins/synthetics/server/tasks/sync_private_locations_monitors_task.test.ts # x-pack/solutions/observability/plugins/synthetics/server/tasks/sync_private_locations_monitors_task.ts # x-pack/solutions/observability/test/api_integration_deployment_agnostic/services/synthetics_private_location.ts
dominiqueclarke
pushed a commit
to dominiqueclarke/kibana
that referenced
this pull request
Oct 1, 2025
…35200) ## Summary Clean up extra synthetics package policies created via elastic#235021 !! ### Clean up There are three basic tests for clean up 1. SpaceIds being added in a processor where there should only be one 2. Multiple package policies exists for same configId and locationId 3. ConfigId is missing altogether from monitors for a package policy The bug meant multiple spaceIds were being added in processor and also if multiple package policies exists for a locationId and configId, that also passes the test, so we clean up those policies. ### Testing Revert changes in PR elastic#235021, it will create extra package policies once you have monitors in multiple places, switching to this branch should clean up those. --------- Co-authored-by: kibanamachine <[email protected]> (cherry picked from commit ced929a) # Conflicts: # x-pack/platform/plugins/shared/fleet/server/services/package_policy.ts # x-pack/platform/plugins/shared/fleet/server/services/package_policy_service.ts # x-pack/solutions/observability/plugins/synthetics/server/tasks/sync_private_locations_monitors_task.test.ts # x-pack/solutions/observability/plugins/synthetics/server/tasks/sync_private_locations_monitors_task.ts # x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/synthetics/index.ts # x-pack/solutions/observability/test/api_integration_deployment_agnostic/services/synthetics_private_location.ts
Contributor
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
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 |
shahzad31
added a commit
to shahzad31/kibana
that referenced
this pull request
Oct 1, 2025
…35200) ## Summary Clean up extra synthetics package policies created via elastic#235021 !! ### Clean up There are three basic tests for clean up 1. SpaceIds being added in a processor where there should only be one 2. Multiple package policies exists for same configId and locationId 3. ConfigId is missing altogether from monitors for a package policy The bug meant multiple spaceIds were being added in processor and also if multiple package policies exists for a locationId and configId, that also passes the test, so we clean up those policies. ### Testing Revert changes in PR elastic#235021, it will create extra package policies once you have monitors in multiple places, switching to this branch should clean up those. --------- Co-authored-by: kibanamachine <[email protected]> (cherry picked from commit ced929a) # Conflicts: # x-pack/platform/plugins/shared/fleet/server/services/package_policy.ts # x-pack/platform/plugins/shared/fleet/server/services/package_policy_service.ts # x-pack/solutions/observability/plugins/synthetics/server/tasks/sync_private_locations_monitors_task.test.ts # x-pack/solutions/observability/plugins/synthetics/server/tasks/sync_private_locations_monitors_task.ts # x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/synthetics/index.ts # x-pack/solutions/observability/test/api_integration_deployment_agnostic/services/synthetics_private_location.ts
dominiqueclarke
added a commit
that referenced
this pull request
Oct 1, 2025
…5200) (#237032) # Backport This will backport the following commits from `main` to `9.1`: - [[Synthetics] Clean up extra synthetics package policies !! (#235200)](#235200) <!--- Backport version: 10.0.2 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Shahzad","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-09-30T19:46:07Z","message":"[Synthetics] Clean up extra synthetics package policies !! (#235200)\n\n## Summary\n\nClean up extra synthetics package policies created via\nhttps://github.com//pull/235021 !!\n\n### Clean up\n\nThere are three basic tests for clean up\n\n1. SpaceIds being added in a processor where there should only be one \n2. Multiple package policies exists for same configId and locationId\n3. ConfigId is missing altogether from monitors for a package policy \n\nThe bug meant multiple spaceIds were being added in processor and also\nif multiple package policies exists for a locationId and configId, that\nalso passes the test, so we clean up those policies.\n\n\n### Testing \n\nRevert changes in PR #235021, it\nwill create extra package policies once you have monitors in multiple\nplaces, switching to this branch should clean up those.\n\n---------\n\nCo-authored-by: kibanamachine <[email protected]>","sha":"ced929a22bff204846cad448d3603f517cdd240f","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Fleet","Team:obs-ux-management","backport:version","author:obs-ux-management","v9.2.0","v8.19.5","v9.1.5"],"title":"[Synthetics] Clean up extra synthetics package policies !!","number":235200,"url":"https://github.com/elastic/kibana/pull/235200","mergeCommit":{"message":"[Synthetics] Clean up extra synthetics package policies !! (#235200)\n\n## Summary\n\nClean up extra synthetics package policies created via\nhttps://github.com//pull/235021 !!\n\n### Clean up\n\nThere are three basic tests for clean up\n\n1. SpaceIds being added in a processor where there should only be one \n2. Multiple package policies exists for same configId and locationId\n3. ConfigId is missing altogether from monitors for a package policy \n\nThe bug meant multiple spaceIds were being added in processor and also\nif multiple package policies exists for a locationId and configId, that\nalso passes the test, so we clean up those policies.\n\n\n### Testing \n\nRevert changes in PR #235021, it\nwill create extra package policies once you have monitors in multiple\nplaces, switching to this branch should clean up those.\n\n---------\n\nCo-authored-by: kibanamachine <[email protected]>","sha":"ced929a22bff204846cad448d3603f517cdd240f"}},"sourceBranch":"main","suggestedTargetBranches":["8.19","9.1"],"targetPullRequestStates":[{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/235200","number":235200,"mergeCommit":{"message":"[Synthetics] Clean up extra synthetics package policies !! (#235200)\n\n## Summary\n\nClean up extra synthetics package policies created via\nhttps://github.com//pull/235021 !!\n\n### Clean up\n\nThere are three basic tests for clean up\n\n1. SpaceIds being added in a processor where there should only be one \n2. Multiple package policies exists for same configId and locationId\n3. ConfigId is missing altogether from monitors for a package policy \n\nThe bug meant multiple spaceIds were being added in processor and also\nif multiple package policies exists for a locationId and configId, that\nalso passes the test, so we clean up those policies.\n\n\n### Testing \n\nRevert changes in PR #235021, it\nwill create extra package policies once you have monitors in multiple\nplaces, switching to this branch should clean up those.\n\n---------\n\nCo-authored-by: kibanamachine <[email protected]>","sha":"ced929a22bff204846cad448d3603f517cdd240f"}},{"branch":"8.19","label":"v8.19.5","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.1","label":"v9.1.5","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT--> --------- Co-authored-by: Shahzad <[email protected]>
dominiqueclarke
added a commit
that referenced
this pull request
Oct 1, 2025
…35200) (#237050) # Backport This will backport the following commits from `main` to `8.19`: - [[Synthetics] Clean up extra synthetics package policies !! (#235200)](#235200) <!--- Backport version: 10.0.2 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Shahzad","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-09-30T19:46:07Z","message":"[Synthetics] Clean up extra synthetics package policies !! (#235200)\n\n## Summary\n\nClean up extra synthetics package policies created via\nhttps://github.com//pull/235021 !!\n\n### Clean up\n\nThere are three basic tests for clean up\n\n1. SpaceIds being added in a processor where there should only be one \n2. Multiple package policies exists for same configId and locationId\n3. ConfigId is missing altogether from monitors for a package policy \n\nThe bug meant multiple spaceIds were being added in processor and also\nif multiple package policies exists for a locationId and configId, that\nalso passes the test, so we clean up those policies.\n\n\n### Testing \n\nRevert changes in PR #235021, it\nwill create extra package policies once you have monitors in multiple\nplaces, switching to this branch should clean up those.\n\n---------\n\nCo-authored-by: kibanamachine <[email protected]>","sha":"ced929a22bff204846cad448d3603f517cdd240f","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Fleet","Team:obs-ux-management","backport:version","author:obs-ux-management","v9.2.0","v8.19.5","v9.1.5"],"title":"[Synthetics] Clean up extra synthetics package policies !!","number":235200,"url":"https://github.com/elastic/kibana/pull/235200","mergeCommit":{"message":"[Synthetics] Clean up extra synthetics package policies !! (#235200)\n\n## Summary\n\nClean up extra synthetics package policies created via\nhttps://github.com//pull/235021 !!\n\n### Clean up\n\nThere are three basic tests for clean up\n\n1. SpaceIds being added in a processor where there should only be one \n2. Multiple package policies exists for same configId and locationId\n3. ConfigId is missing altogether from monitors for a package policy \n\nThe bug meant multiple spaceIds were being added in processor and also\nif multiple package policies exists for a locationId and configId, that\nalso passes the test, so we clean up those policies.\n\n\n### Testing \n\nRevert changes in PR #235021, it\nwill create extra package policies once you have monitors in multiple\nplaces, switching to this branch should clean up those.\n\n---------\n\nCo-authored-by: kibanamachine <[email protected]>","sha":"ced929a22bff204846cad448d3603f517cdd240f"}},"sourceBranch":"main","suggestedTargetBranches":["8.19"],"targetPullRequestStates":[{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/235200","number":235200,"mergeCommit":{"message":"[Synthetics] Clean up extra synthetics package policies !! (#235200)\n\n## Summary\n\nClean up extra synthetics package policies created via\nhttps://github.com//pull/235021 !!\n\n### Clean up\n\nThere are three basic tests for clean up\n\n1. SpaceIds being added in a processor where there should only be one \n2. Multiple package policies exists for same configId and locationId\n3. ConfigId is missing altogether from monitors for a package policy \n\nThe bug meant multiple spaceIds were being added in processor and also\nif multiple package policies exists for a locationId and configId, that\nalso passes the test, so we clean up those policies.\n\n\n### Testing \n\nRevert changes in PR #235021, it\nwill create extra package policies once you have monitors in multiple\nplaces, switching to this branch should clean up those.\n\n---------\n\nCo-authored-by: kibanamachine <[email protected]>","sha":"ced929a22bff204846cad448d3603f517cdd240f"}},{"branch":"8.19","label":"v8.19.5","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.1","label":"v9.1.5","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/237032","number":237032,"state":"OPEN"}]}] BACKPORT--> --------- Co-authored-by: Shahzad <[email protected]>
rylnd
pushed a commit
to rylnd/kibana
that referenced
this pull request
Oct 17, 2025
…35200) ## Summary Clean up extra synthetics package policies created via elastic#235021 !! ### Clean up There are three basic tests for clean up 1. SpaceIds being added in a processor where there should only be one 2. Multiple package policies exists for same configId and locationId 3. ConfigId is missing altogether from monitors for a package policy The bug meant multiple spaceIds were being added in processor and also if multiple package policies exists for a locationId and configId, that also passes the test, so we clean up those policies. ### Testing Revert changes in PR elastic#235021, it will create extra package policies once you have monitors in multiple places, switching to this branch should clean up those. --------- Co-authored-by: kibanamachine <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 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
Clean up extra synthetics package policies created via #235021 !!
Clean up
There are three basic tests for clean up
The bug meant multiple spaceIds were being added in processor and also if multiple package policies exists for a locationId and configId, that also passes the test, so we clean up those policies.
Testing
Revert changes in PR #235021, it will create extra package policies once you have monitors in multiple places, switching to this branch should clean up those.