[Fleet] Fix incorrect count of agents in bulk actions #175318
Merged
Conversation
This file contains 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
criamico
added
the
Team:Fleet
🤖 GitHub commentsExpand to view the GitHub comments
Just comment with:
|
|
/ci |
criamico
force-pushed
the
171914_fix_inactive_count
branch
from
616245c to
322e6c3
Compare
|
@elasticmachine merge upstream |
criamico
added
release_note:fix
v8.13.0
backport:prev-minor
|
Pinging @elastic/fleet (Team:Fleet) |
x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/index.tsx
Outdated
Show resolved
Hide resolved
x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/index.tsx
Outdated
Show resolved
Hide resolved
|
Looks good, great to see the tests. Added some small suggestions. |
criamico
added
QA:Needs Validation
|
@elasticmachine merge upstream |
|
@elasticmachine merge upstream |
|
@elasticmachine merge upstream |
💛 Build succeeded, but was flaky
Failed CI StepsMetrics [docs]Async chunks
History
To update your PR or re-run it, just comment with: cc @criamico |
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Jan 25, 2024
Fixes elastic#171914 ## Summary Fix a small issue occurring when there are inactive agents, both regular and managed. Another PR with some refactoring for this component will follow. ### Repro steps - Enroll fleet server on fleet-server-policy - make sure to have two inactive fleet server agents on this policy as well - Enroll ~20 agents with horde and make them inactive - Make fleet server policy "managed" - Select "inactive" in the status filter - Click on "Select agents on all pages" - The bulk actions shouldn't report negative actions. If the count is 0, the actions will appear disabled #### Before  #### After  ### Checklist - [ ] [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 - [ ] [Flaky Test Runner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was used on any tests changed --------- Co-authored-by: Kibana Machine <[email protected]> (cherry picked from commit f2fb3ee)
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
2 tasks
kibanamachine
added a commit
that referenced
this pull request
Jan 25, 2024
#175527) # Backport This will backport the following commits from `main` to `8.12`: - [[Fleet] Fix incorrect count of agents in bulk actions (#175318)](#175318) <!--- Backport version: 9.4.3 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Cristina Amico","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-01-25T11:29:25Z","message":"[Fleet] Fix incorrect count of agents in bulk actions (#175318)\n\nFixes https://github.com/elastic/kibana/issues/171914\r\n\r\n## Summary\r\nFix a small issue occurring when there are inactive agents, both regular\r\nand managed.\r\n\r\nAnother PR with some refactoring for this component will follow.\r\n\r\n### Repro steps\r\n\r\n- Enroll fleet server on fleet-server-policy - make sure to have two\r\ninactive fleet server agents on this policy as well\r\n- Enroll ~20 agents with horde and make them inactive\r\n- Make fleet server policy \"managed\"\r\n- Select \"inactive\" in the status filter\r\n- Click on \"Select agents on all pages\"\r\n- The bulk actions shouldn't report negative actions. If the count is 0,\r\nthe actions will appear disabled\r\n\r\n#### Before\r\n\r\n\r\n#### After\r\n\r\n\r\n\r\n### Checklist\r\n\r\n- [ ] [Unit or functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere updated or added to match the most common scenarios\r\n- [ ] [Flaky Test\r\nRunner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was\r\nused on any tests changed\r\n\r\n---------\r\n\r\nCo-authored-by: Kibana Machine <[email protected]>","sha":"f2fb3ee768f62aca11a6b3adae0514e1b1f56fcd","branchLabelMapping":{"^v8.13.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Fleet","backport:prev-minor","v8.13.0"],"title":"[Fleet] Fix incorrect count of agents in bulk actions","number":175318,"url":"https://github.com/elastic/kibana/pull/175318","mergeCommit":{"message":"[Fleet] Fix incorrect count of agents in bulk actions (#175318)\n\nFixes https://github.com/elastic/kibana/issues/171914\r\n\r\n## Summary\r\nFix a small issue occurring when there are inactive agents, both regular\r\nand managed.\r\n\r\nAnother PR with some refactoring for this component will follow.\r\n\r\n### Repro steps\r\n\r\n- Enroll fleet server on fleet-server-policy - make sure to have two\r\ninactive fleet server agents on this policy as well\r\n- Enroll ~20 agents with horde and make them inactive\r\n- Make fleet server policy \"managed\"\r\n- Select \"inactive\" in the status filter\r\n- Click on \"Select agents on all pages\"\r\n- The bulk actions shouldn't report negative actions. If the count is 0,\r\nthe actions will appear disabled\r\n\r\n#### Before\r\n\r\n\r\n#### After\r\n\r\n\r\n\r\n### Checklist\r\n\r\n- [ ] [Unit or functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere updated or added to match the most common scenarios\r\n- [ ] [Flaky Test\r\nRunner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was\r\nused on any tests changed\r\n\r\n---------\r\n\r\nCo-authored-by: Kibana Machine <[email protected]>","sha":"f2fb3ee768f62aca11a6b3adae0514e1b1f56fcd"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.13.0","branchLabelMappingKey":"^v8.13.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/175318","number":175318,"mergeCommit":{"message":"[Fleet] Fix incorrect count of agents in bulk actions (#175318)\n\nFixes https://github.com/elastic/kibana/issues/171914\r\n\r\n## Summary\r\nFix a small issue occurring when there are inactive agents, both regular\r\nand managed.\r\n\r\nAnother PR with some refactoring for this component will follow.\r\n\r\n### Repro steps\r\n\r\n- Enroll fleet server on fleet-server-policy - make sure to have two\r\ninactive fleet server agents on this policy as well\r\n- Enroll ~20 agents with horde and make them inactive\r\n- Make fleet server policy \"managed\"\r\n- Select \"inactive\" in the status filter\r\n- Click on \"Select agents on all pages\"\r\n- The bulk actions shouldn't report negative actions. If the count is 0,\r\nthe actions will appear disabled\r\n\r\n#### Before\r\n\r\n\r\n#### After\r\n\r\n\r\n\r\n### Checklist\r\n\r\n- [ ] [Unit or functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere updated or added to match the most common scenarios\r\n- [ ] [Flaky Test\r\nRunner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was\r\nused on any tests changed\r\n\r\n---------\r\n\r\nCo-authored-by: Kibana Machine <[email protected]>","sha":"f2fb3ee768f62aca11a6b3adae0514e1b1f56fcd"}}]}] BACKPORT--> Co-authored-by: Cristina Amico <[email protected]>
criamico
added a commit
that referenced
this pull request
Jan 29, 2024
Closes #131153 Follow up of #175318 ## Summary Extract the main logic for agentList component in a separate hook. ### Checklist - [ ] [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 - [ ] [Flaky Test Runner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was used on any tests changed --------- Co-authored-by: Kibana Machine <[email protected]>
1 task
criamico
added a commit
that referenced
this pull request
Feb 8, 2024
Patch for #171914 ## Summary In #175318 I had disabled the bulk actions when the count was incorrect (negative). This was not a good idea, since some of those actions could still be applied (like unenrolling) even if the shown count is not correct. Here I'm removing that check. ### Checklist - [ ] [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
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Feb 8, 2024
Patch for elastic#171914 ## Summary In elastic#175318 I had disabled the bulk actions when the count was incorrect (negative). This was not a good idea, since some of those actions could still be applied (like unenrolling) even if the shown count is not correct. Here I'm removing that check. ### Checklist - [ ] [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]> (cherry picked from commit b620110)
kibanamachine
added a commit
that referenced
this pull request
Feb 8, 2024
…176512) # Backport This will backport the following commits from `main` to `8.12`: - [[Fleet] Allow back previously disabled bulk actions (#176485)](#176485) <!--- Backport version: 9.4.3 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Cristina Amico","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-02-08T14:59:23Z","message":"[Fleet] Allow back previously disabled bulk actions (#176485)\n\nPatch for https://github.com/elastic/kibana/issues/171914\r\n\r\n## Summary\r\nIn #175318 I had disabled the bulk\r\nactions when the count was incorrect (negative). This was not a good\r\nidea, since some of those actions could still be applied (like\r\nunenrolling) even if the shown count is not correct. Here I'm removing\r\nthat check.\r\n\r\n\r\n\r\n### Checklist\r\n\r\n- [ ] [Unit or functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere updated or added to match the most common scenarios\r\n\r\nCo-authored-by: Kibana Machine <[email protected]>","sha":"b62011026850bf968a90c403cae11c453c4e9130","branchLabelMapping":{"^v8.13.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","backport:prev-minor","v8.13.0"],"title":"[Fleet] Allow back previously disabled bulk actions","number":176485,"url":"https://github.com/elastic/kibana/pull/176485","mergeCommit":{"message":"[Fleet] Allow back previously disabled bulk actions (#176485)\n\nPatch for https://github.com/elastic/kibana/issues/171914\r\n\r\n## Summary\r\nIn #175318 I had disabled the bulk\r\nactions when the count was incorrect (negative). This was not a good\r\nidea, since some of those actions could still be applied (like\r\nunenrolling) even if the shown count is not correct. Here I'm removing\r\nthat check.\r\n\r\n\r\n\r\n### Checklist\r\n\r\n- [ ] [Unit or functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere updated or added to match the most common scenarios\r\n\r\nCo-authored-by: Kibana Machine <[email protected]>","sha":"b62011026850bf968a90c403cae11c453c4e9130"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.13.0","branchLabelMappingKey":"^v8.13.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/176485","number":176485,"mergeCommit":{"message":"[Fleet] Allow back previously disabled bulk actions (#176485)\n\nPatch for https://github.com/elastic/kibana/issues/171914\r\n\r\n## Summary\r\nIn #175318 I had disabled the bulk\r\nactions when the count was incorrect (negative). This was not a good\r\nidea, since some of those actions could still be applied (like\r\nunenrolling) even if the shown count is not correct. Here I'm removing\r\nthat check.\r\n\r\n\r\n\r\n### Checklist\r\n\r\n- [ ] [Unit or functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere updated or added to match the most common scenarios\r\n\r\nCo-authored-by: Kibana Machine <[email protected]>","sha":"b62011026850bf968a90c403cae11c453c4e9130"}}]}] BACKPORT--> Co-authored-by: Cristina Amico <[email protected]>
CoenWarmer
pushed a commit
to CoenWarmer/kibana
that referenced
this pull request
Feb 15, 2024
Fixes elastic#171914 ## Summary Fix a small issue occurring when there are inactive agents, both regular and managed. Another PR with some refactoring for this component will follow. ### Repro steps - Enroll fleet server on fleet-server-policy - make sure to have two inactive fleet server agents on this policy as well - Enroll ~20 agents with horde and make them inactive - Make fleet server policy "managed" - Select "inactive" in the status filter - Click on "Select agents on all pages" - The bulk actions shouldn't report negative actions. If the count is 0, the actions will appear disabled #### Before  #### After  ### Checklist - [ ] [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 - [ ] [Flaky Test Runner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was used on any tests changed --------- Co-authored-by: Kibana Machine <[email protected]>
CoenWarmer
pushed a commit
to CoenWarmer/kibana
that referenced
this pull request
Feb 15, 2024
Closes elastic#131153 Follow up of elastic#175318 ## Summary Extract the main logic for agentList component in a separate hook. ### Checklist - [ ] [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 - [ ] [Flaky Test Runner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was used on any tests changed --------- Co-authored-by: Kibana Machine <[email protected]>
CoenWarmer
pushed a commit
to CoenWarmer/kibana
that referenced
this pull request
Feb 15, 2024
Patch for elastic#171914 ## Summary In elastic#175318 I had disabled the bulk actions when the count was incorrect (negative). This was not a good idea, since some of those actions could still be applied (like unenrolling) even if the shown count is not correct. Here I'm removing that check. ### Checklist - [ ] [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]>
fkanout
pushed a commit
to fkanout/kibana
that referenced
this pull request
Mar 4, 2024
Closes elastic#131153 Follow up of elastic#175318 ## Summary Extract the main logic for agentList component in a separate hook. ### Checklist - [ ] [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 - [ ] [Flaky Test Runner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was used on any tests changed --------- Co-authored-by: Kibana Machine <[email protected]>
fkanout
pushed a commit
to fkanout/kibana
that referenced
this pull request
Mar 4, 2024
Patch for elastic#171914 ## Summary In elastic#175318 I had disabled the bulk actions when the count was incorrect (negative). This was not a good idea, since some of those actions could still be applied (like unenrolling) even if the shown count is not correct. Here I'm removing that check. ### Checklist - [ ] [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]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #171914
Summary
Fix a small issue occurring when there are inactive agents, both regular and managed.
Another PR with some refactoring for this component will follow.
Repro steps
Before
After
Checklist