From 198a69715fd03242b1478ec6b7a74839b096dd6a Mon Sep 17 00:00:00 2001 From: Zach Wasserman Date: Fri, 21 Jun 2024 13:41:15 -0700 Subject: [PATCH 1/7] Fix anchor link for agent uninstall For #19936 --- .../pages/hosts/components/DeleteHostModal/DeleteHostModal.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/pages/hosts/components/DeleteHostModal/DeleteHostModal.tsx b/frontend/pages/hosts/components/DeleteHostModal/DeleteHostModal.tsx index 89efcf2a5f74..a90323140373 100644 --- a/frontend/pages/hosts/components/DeleteHostModal/DeleteHostModal.tsx +++ b/frontend/pages/hosts/components/DeleteHostModal/DeleteHostModal.tsx @@ -76,7 +76,7 @@ const DeleteHostModal = ({

Date: Fri, 21 Jun 2024 13:42:21 -0700 Subject: [PATCH 2/7] Update FAQ.md --- docs/Get started/FAQ.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Get started/FAQ.md b/docs/Get started/FAQ.md index 4634061c1f82..b6e04cd9699f 100644 --- a/docs/Get started/FAQ.md +++ b/docs/Get started/FAQ.md @@ -460,7 +460,7 @@ Read more about osquery packs and Fleet's commitment to supporting them [here](h In the Fleet UI, you can turn off MDM for a host by selecting **Actions > Turn off MDM** on the **Host details** page. -When you turn off MDM for a host, Fleet removes the enforcement of all macOS settings for that host. Also, the host will stop receiving macOS update reminders via Nudge. Turning MDM off doesn't remove the fleetd agent from the host. To remove the fleetd agent, share [these guided instructions](#how-can-i-uninstall-the-osquery-agent) with the end user. +When you turn off MDM for a host, Fleet removes the enforcement of all macOS settings for that host. Also, the host will stop receiving macOS update reminders via Nudge. Turning MDM off doesn't remove the fleetd agent from the host. To remove the fleetd agent, share [these guided instructions](#how-can-i-uninstall-fleetd) with the end user. To enforce macOS settings and send macOS update reminders, the host has to turn MDM back on. Turning MDM back on for a host requires end user action. From 36ba4e749afcc466abc71ea7218bc14a08202555 Mon Sep 17 00:00:00 2001 From: Zach Wasserman Date: Fri, 21 Jun 2024 13:43:17 -0700 Subject: [PATCH 3/7] Create 19937-fix-anchor-link --- changes/19937-fix-anchor-link | 1 + 1 file changed, 1 insertion(+) create mode 100644 changes/19937-fix-anchor-link diff --git a/changes/19937-fix-anchor-link b/changes/19937-fix-anchor-link new file mode 100644 index 000000000000..16ef161142e7 --- /dev/null +++ b/changes/19937-fix-anchor-link @@ -0,0 +1 @@ +* Fix link to fleetd uninstall instructions in "Delete device" modal From 04ccda28145dd281c61cce65301dbc752c34f872 Mon Sep 17 00:00:00 2001 From: Zach Wasserman Date: Fri, 21 Jun 2024 14:32:29 -0700 Subject: [PATCH 4/7] Update routes.js --- website/config/routes.js | 1 + 1 file changed, 1 insertion(+) diff --git a/website/config/routes.js b/website/config/routes.js index 884c7a591154..765da6ad8e86 100644 --- a/website/config/routes.js +++ b/website/config/routes.js @@ -516,6 +516,7 @@ module.exports.routes = { 'GET /learn-more-about/renew-abm': '/docs/using-fleet/mdm-setup#apple-business-manager-abm', 'GET /learn-more-about/fleet-server-private-key': '/docs/configuration/fleet-server-configuration#server-private-key', 'GET /learn-more-about/host-identifiers': '/docs/rest-api/rest-api#get-host-by-identifier', + 'GET /learn-more-about/uninstall-fleetd': '/docs/using-fleet/faq#how-can-i-uninstall-fleetd', // Sitemap // ============================================================================================================= From f56d2465542034030d6ef6bf34b1114d89574d7f Mon Sep 17 00:00:00 2001 From: Zach Wasserman Date: Fri, 21 Jun 2024 14:33:23 -0700 Subject: [PATCH 5/7] Update DeleteHostModal.tsx --- .../pages/hosts/components/DeleteHostModal/DeleteHostModal.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/pages/hosts/components/DeleteHostModal/DeleteHostModal.tsx b/frontend/pages/hosts/components/DeleteHostModal/DeleteHostModal.tsx index a90323140373..43c4452103d2 100644 --- a/frontend/pages/hosts/components/DeleteHostModal/DeleteHostModal.tsx +++ b/frontend/pages/hosts/components/DeleteHostModal/DeleteHostModal.tsx @@ -76,7 +76,7 @@ const DeleteHostModal = ({

Date: Fri, 21 Jun 2024 14:39:01 -0700 Subject: [PATCH 6/7] Update routes.js --- website/config/routes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/config/routes.js b/website/config/routes.js index 765da6ad8e86..62a6910d4bf3 100644 --- a/website/config/routes.js +++ b/website/config/routes.js @@ -516,7 +516,7 @@ module.exports.routes = { 'GET /learn-more-about/renew-abm': '/docs/using-fleet/mdm-setup#apple-business-manager-abm', 'GET /learn-more-about/fleet-server-private-key': '/docs/configuration/fleet-server-configuration#server-private-key', 'GET /learn-more-about/host-identifiers': '/docs/rest-api/rest-api#get-host-by-identifier', - 'GET /learn-more-about/uninstall-fleetd': '/docs/using-fleet/faq#how-can-i-uninstall-fleetd', + 'GET /learn-more-about/uninstall-fleetd': '/docs/using-fleet/faq#how-can-i-uninstall-fleetd', // Sitemap // ============================================================================================================= From 0617f995dae91d2ee7922b6bd056b93c16cc52aa Mon Sep 17 00:00:00 2001 From: Zach Wasserman Date: Tue, 25 Jun 2024 09:18:46 -0700 Subject: [PATCH 7/7] fix format --- .../hosts/components/DeleteHostModal/DeleteHostModal.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/frontend/pages/hosts/components/DeleteHostModal/DeleteHostModal.tsx b/frontend/pages/hosts/components/DeleteHostModal/DeleteHostModal.tsx index 43c4452103d2..56b47a95fb96 100644 --- a/frontend/pages/hosts/components/DeleteHostModal/DeleteHostModal.tsx +++ b/frontend/pages/hosts/components/DeleteHostModal/DeleteHostModal.tsx @@ -75,9 +75,7 @@ const DeleteHostModal = ({