[Fleet] Force unenroll in Agent activity #141208

juliaElastic · 2022-09-21T11:13:36Z

Summary

Fix #140794 and #140923

Added an action document with action results on force unenroll, so that Agent activity shows that force unenroll was successful.
On force unenroll, checking other non-expired unenroll actions and adding action results for agents that were force unenrolled, so that the unenroll action is not stuck in progress.

To verify:

unenroll a few agents with fleet server stopped
check in agent activity that there is an in progress unenroll activity
force unenroll the same agents
check in agent activity that the previous unenroll action shows up as completed
check that there is a completed force unenroll activity as well

Checklist

Unit or functional tests were updated or added to match the most common scenarios

elasticmachine · 2022-09-21T11:13:42Z

Pinging @elastic/fleet (Team:Fleet)

juliaElastic · 2022-09-21T12:31:55Z

x-pack/plugins/fleet/server/services/agents/unenroll_action_runner.ts

+          (options.revoke && agent.unenrolled_at) ||
+          (!options.revoke && (agent.unenrollment_started_at || agent.unenrolled_at))
+        ) {
+          outgoingErrors[agent.id] = new FleetError(`Agent ${agent.id} already unenrolled`);


Changed the implementation of unenroll to be consistent with reassign: if an agent is already unenrolled, the action is set to failed for the agent.
Previously the unenrolled agents were filtered out, so the action didn't include them. This is problematic in agent activity, as those agents don't have any trace of being actioned.

nchaulet

Not tested locally but the code looks good to me 🚀

kpollich

Code LGTM and works as expected when testing locally. 🚀

…tions that do not have results yet

juliaElastic · 2022-09-21T14:04:14Z

x-pack/plugins/fleet/server/services/agents/unenroll_action_runner.ts

+    const commonAgents = intersection(action.agents, agentIds);
+    if (commonAgents.length > 0) {
+      // filtering out agents with action results
+      const agentsToUpdate = await getAgentsWithoutActionResults(


Added one more check to only update action results for those agents that do not yet have action results. This is to avoid having multiple result entries for the same action.
Did some measurements on 100k agent entries, and the unenroll took 24s without revoke and 31s with revoke.

juliaElastic · 2022-09-21T14:39:00Z

...blic/applications/fleet/sections/agents/agent_list_page/components/agent_activity_flyout.tsx

@@ -143,7 +143,7 @@ export const AgentActivityFlyout: React.FunctionComponent<{
                  body={
                    <FormattedMessage
                      id="xpack.fleet.agentActivityFlyout.noActivityDescription"
-                      defaultMessage="Activity feed will appear here as agents get enrolled, upgraded, or configured."
+                      defaultMessage="Activity feed will appear here as agents are reassigned, upgraded, or unenrolled."


tweaked description to fix #141186

juliaElastic · 2022-09-21T15:37:36Z

@elasticmachine merge upstream

kibana-ci · 2022-09-21T16:40:20Z

💚 Build Succeeded

Buildkite Build
Commit: 9d0cc70

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`	913.7KB	913.8KB	+122.0B

History

💔 Build #74468 failed 113cfa3
💔 Build #74375 failed 4dfeea5
💔 Build #74368 failed 278e6df

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

cc @juliaElastic

* fix for force unenroll * fixed tests * fixed checks, solve for one more edge case: only updating unenroll actions that do not have results yet * added more tests * added try catch * updated description on flyout Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> (cherry picked from commit 3433f5d)

kibanamachine · 2022-09-22T06:56:38Z

💚 All backports created successfully

Status	Branch	Result
✅	8.5

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

* fix for force unenroll * fixed tests * fixed checks, solve for one more edge case: only updating unenroll actions that do not have results yet * added more tests * added try catch * updated description on flyout Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> (cherry picked from commit 3433f5d) Co-authored-by: Julia Bardi <90178898+juliaElastic@users.noreply.github.com>

fix for force unenroll

278e6df

juliaElastic added release_note:skip Skip the PR/issue when compiling release notes v8.5.0 labels Sep 21, 2022

juliaElastic self-assigned this Sep 21, 2022

juliaElastic requested a review from a team as a code owner September 21, 2022 11:13

botelastic bot added the Team:Fleet Team label for Observability Data Collection Fleet team label Sep 21, 2022

fixed tests

4dfeea5

juliaElastic commented Sep 21, 2022

View reviewed changes

nchaulet approved these changes Sep 21, 2022

View reviewed changes

kpollich approved these changes Sep 21, 2022

View reviewed changes

juliaElastic added 3 commits September 21, 2022 15:35

fixed checks, solve for one more edge case: only updating unenroll ac…

d83b0ab

…tions that do not have results yet

added more tests

188b1e3

added try catch

aeed7b9

juliaElastic commented Sep 21, 2022

View reviewed changes

updated description on flyout

113cfa3

juliaElastic commented Sep 21, 2022

View reviewed changes

Merge branch 'main' into force-unenroll

9d0cc70

juliaElastic merged commit 3433f5d into elastic:main Sep 22, 2022

kibanamachine added the v8.6.0 label Sep 22, 2022

This was referenced Sep 22, 2022

[Fleet]: Force unenrolled action not visible under Agent activity. #140923

Closed

[Fleet]: Incorrect description as per actual working available under Agent activity. #141186

Closed

kibanamachine mentioned this pull request Sep 22, 2022

[8.5] [Fleet] Force unenroll in Agent activity (#141208) #141346

Merged

kibanamachine mentioned this pull request Sep 22, 2022

[Security Solution] Removes flakiness from pinned filters and adds code owners #141269

Merged

juliaElastic mentioned this pull request Sep 26, 2022

[Fleet] Agent activity enhancements #141206

Closed

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Fleet] Force unenroll in Agent activity #141208

[Fleet] Force unenroll in Agent activity #141208

juliaElastic commented Sep 21, 2022 •

edited by kibanamachine

Loading

elasticmachine commented Sep 21, 2022

juliaElastic Sep 21, 2022

nchaulet left a comment

kpollich left a comment

juliaElastic Sep 21, 2022

juliaElastic Sep 21, 2022

juliaElastic commented Sep 21, 2022

kibana-ci commented Sep 21, 2022

kibanamachine commented Sep 22, 2022

[Fleet] Force unenroll in Agent activity #141208

[Fleet] Force unenroll in Agent activity #141208

Conversation

juliaElastic commented Sep 21, 2022 • edited by kibanamachine Loading

Summary

Checklist

elasticmachine commented Sep 21, 2022

juliaElastic Sep 21, 2022

Choose a reason for hiding this comment

nchaulet left a comment

Choose a reason for hiding this comment

kpollich left a comment

Choose a reason for hiding this comment

juliaElastic Sep 21, 2022

Choose a reason for hiding this comment

juliaElastic Sep 21, 2022

Choose a reason for hiding this comment

juliaElastic commented Sep 21, 2022

kibana-ci commented Sep 21, 2022

💚 Build Succeeded

Metrics [docs]

Async chunks

History

kibanamachine commented Sep 22, 2022

💚 All backports created successfully

Questions ?

juliaElastic commented Sep 21, 2022 •

edited by kibanamachine

Loading