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.

Sign up for GitHub

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

Jump to bottom

[Fleet] Allow integrations on hosted policies to be updated #96705

Merged
merged 4 commits into from
Apr 12, 2021
Merged

[Fleet] Allow integrations on hosted policies to be updated #96705

merged 4 commits into from
Apr 12, 2021

Conversation

jfsiii
Copy link
Contributor

@jfsiii jfsiii commented Apr 9, 2021

Summary

Remove the restriction against updating integrations on hosted policies.

I described the current behavior and asked if it should change in [1]. Based on the responses in [2] & [3] and looking back at prior discussion around hosted policies, I don't think updates should be restricted.

Adding or removing integrations is still blocked for hosted policies. Updated API tests to confirm behavior.

[1] #76843 (comment)
[2] #76843 (comment)
[3] #76843 (comment)

Screenshots

Current behavior

Error about updating integrations of a managed policy

Screen Shot 2021-04-08 at 3 23 37 PM
via flow A Screen Shot 2021-04-08 at 3 01 32 PM Screen Shot 2021-04-08 at 3 13 24 PM
via flow B Screen Shot 2021-04-08 at 3 19 52 PM Screen Shot 2021-04-08 at 3 20 06 PM
This PR

Successful updates using either form

Screen Shot 2021-04-09 at 1 21 02 PM Screen Shot 2021-04-09 at 1 05 10 PM

Checklist

@jfsiii jfsiii added v8.0.0 release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team v7.13.0 labels Apr 9, 2021
@jfsiii jfsiii self-assigned this Apr 9, 2021
@jfsiii jfsiii requested a review from a team as a code owner April 9, 2021 17:43
@elasticmachine
Copy link
Contributor

Pinging @elastic/fleet (Team:Fleet)

@jfsiii jfsiii requested review from ruflin and simitt April 9, 2021 17:43
@jfsiii
Copy link
Contributor Author

jfsiii commented Apr 9, 2021

@elasticmachine merge upstream

@jfsiii
Copy link
Contributor Author

jfsiii commented Apr 9, 2021

@elasticmachine merge upstream

@ruflin ruflin requested a review from jen-huang April 10, 2021 18:35
@jfsiii
Copy link
Contributor Author

jfsiii commented Apr 11, 2021

@elasticmachine merge upstream

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

cc @jfsiii

simitt
simitt reviewed Apr 12, 2021
View reviewed changes
Copy link
Contributor

@simitt simitt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO package updates should be triggered when the hosted policy is updated, no user interaction should be required. I don't see harm for allowing updating from an APM perspective though. @scunningham and @blakerouse do you see an issue with this for the Fleet Server integration?

@jfsiii
Copy link
Contributor Author

jfsiii commented Apr 12, 2021

@hbharding @mostlyjason here is the PR for the UI behavior we discussed last week. Users can now edit integrations associated with a hosted policy.

@blakerouse
Copy link

@simitt I don't see any issues with this.

@jfsiii jfsiii added the auto-backport Deprecated - use backport:version if exact versions are needed label Apr 12, 2021
@jfsiii jfsiii merged commit d338f1c into elastic:master Apr 12, 2021
kibanamachine added a commit to kibanamachine/kibana that referenced this pull request Apr 12, 2021
@kibanamachine
Allow integrations of hosted policies to be updated (elastic#96705)
cda02ff 
## Summary

Remove the restriction against updating integrations on hosted policies.

I described the current behavior and asked if it should change in [1]. Based on the responses in [2] & [3] and looking back at prior discussion around hosted policies, I don't think updates should be restricted.

Adding or removing integrations is still blocked for hosted policies. Updated API tests to confirm behavior. 


[1] elastic#76843 (comment)
[2] elastic#76843 (comment)
[3] elastic#76843 (comment)

## Screenshots
<details><summary>Current behavior</summary>

<h3>Error about updating integrations of a managed policy</h3>

<img width="1208" alt="Screen Shot 2021-04-08 at 3 23 37 PM" src="https://user-images.githubusercontent.com/57655/114084750-87686880-987e-11eb-91a9-081c45dbe871.png">

<details><summary>via flow A</summary>
<img width="1223" alt="Screen Shot 2021-04-08 at 3 01 32 PM" src="https://user-images.githubusercontent.com/57655/114082826-3a839280-987c-11eb-94d0-151ae93ab523.png">

<img width="1205" alt="Screen Shot 2021-04-08 at 3 13 24 PM" src="https://user-images.githubusercontent.com/57655/114083728-5c314980-987d-11eb-92be-195d7d44c037.png">
</details>

<details><summary>via flow B</summary>
<img width="1221" alt="Screen Shot 2021-04-08 at 3 19 52 PM" src="https://user-images.githubusercontent.com/57655/114084502-3fe1dc80-987e-11eb-8879-57718586ac95.png">
<img width="1198" alt="Screen Shot 2021-04-08 at 3 20 06 PM" src="https://user-images.githubusercontent.com/57655/114084503-3fe1dc80-987e-11eb-9fa9-512210b938cd.png">
</details>

</details>

<details><summary>This PR</summary>
<h3>Successful updates using either form</h3>
<img width="1301" alt="Screen Shot 2021-04-09 at 1 21 02 PM" src="https://user-images.githubusercontent.com/57655/114219370-8f84de80-9938-11eb-9b94-dfbeb18535b2.png">
<img width="1320" alt="Screen Shot 2021-04-09 at 1 05 10 PM" src="https://user-images.githubusercontent.com/57655/114219408-9f9cbe00-9938-11eb-96d2-2918332d1539.png">

</details>


### Checklist
- [x] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios

Co-authored-by: Kibana Machine <[email protected]>
@kibanamachine kibanamachine mentioned this pull request Apr 12, 2021
Merged
@kibanamachine
Copy link
Contributor

💚 Backport successful

Status Branch Result
✅ 7.x

This backport PR will be merged automatically after passing CI.

kibanamachine added a commit that referenced this pull request Apr 12, 2021
@kibanamachine
Allow integrations of hosted policies to be updated (#96705) (#96799)
ae825ad 
## Summary

Remove the restriction against updating integrations on hosted policies.

I described the current behavior and asked if it should change in [1]. Based on the responses in [2] & [3] and looking back at prior discussion around hosted policies, I don't think updates should be restricted.

Adding or removing integrations is still blocked for hosted policies. Updated API tests to confirm behavior. 


[1] #76843 (comment)
[2] #76843 (comment)
[3] #76843 (comment)

## Screenshots
<details><summary>Current behavior</summary>

<h3>Error about updating integrations of a managed policy</h3>

<img width="1208" alt="Screen Shot 2021-04-08 at 3 23 37 PM" src="https://user-images.githubusercontent.com/57655/114084750-87686880-987e-11eb-91a9-081c45dbe871.png">

<details><summary>via flow A</summary>
<img width="1223" alt="Screen Shot 2021-04-08 at 3 01 32 PM" src="https://user-images.githubusercontent.com/57655/114082826-3a839280-987c-11eb-94d0-151ae93ab523.png">

<img width="1205" alt="Screen Shot 2021-04-08 at 3 13 24 PM" src="https://user-images.githubusercontent.com/57655/114083728-5c314980-987d-11eb-92be-195d7d44c037.png">
</details>

<details><summary>via flow B</summary>
<img width="1221" alt="Screen Shot 2021-04-08 at 3 19 52 PM" src="https://user-images.githubusercontent.com/57655/114084502-3fe1dc80-987e-11eb-8879-57718586ac95.png">
<img width="1198" alt="Screen Shot 2021-04-08 at 3 20 06 PM" src="https://user-images.githubusercontent.com/57655/114084503-3fe1dc80-987e-11eb-9fa9-512210b938cd.png">
</details>

</details>

<details><summary>This PR</summary>
<h3>Successful updates using either form</h3>
<img width="1301" alt="Screen Shot 2021-04-09 at 1 21 02 PM" src="https://user-images.githubusercontent.com/57655/114219370-8f84de80-9938-11eb-9b94-dfbeb18535b2.png">
<img width="1320" alt="Screen Shot 2021-04-09 at 1 05 10 PM" src="https://user-images.githubusercontent.com/57655/114219408-9f9cbe00-9938-11eb-96d2-2918332d1539.png">

</details>


### Checklist
- [x] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios

Co-authored-by: Kibana Machine <[email protected]>

Co-authored-by: John Schulz <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@simitt simitt simitt left review comments

@jen-huang jen-huang jen-huang approved these changes

@ruflin ruflin Awaiting requested review from ruflin

Assignees

@jfsiii jfsiii

Labels
auto-backport Deprecated - use backport:version if exact versions are needed release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team v7.13.0 v8.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@jfsiii @elasticmachine @kibanamachine @blakerouse @jen-huang @simitt