From 2c9978ef21ecb62cd8a757a152aa52b389998696 Mon Sep 17 00:00:00 2001
From: Rachael Shaw <r@rachael.wtf>
Date: Thu, 25 Apr 2024 10:33:29 -0500
Subject: [PATCH] Use "Fleet's agent (fleetd)" naming in the UI (#18238)

For https://github.com/fleetdm/fleet/issues/16512

---------

Co-authored-by: Noah Talerman <47070608+noahtalerman@users.noreply.github.com>
---
 .../EnrollSecrets/DeleteSecretModal/DeleteSecretModal.tsx     | 4 +---
 frontend/pages/DashboardPage/cards/MDM/MDM.tsx                | 4 ++--
 frontend/pages/DashboardPage/cards/Munki/Munki.tsx            | 4 ++--
 frontend/pages/admin/OrgSettingsPage/cards/Agents/Agents.tsx  | 2 +-
 .../TeamDetailsWrapper/AgentOptionsPage/AgentOptionsPage.tsx  | 2 +-
 frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx      | 2 +-
 frontend/pages/policies/constants.ts                          | 2 +-
 7 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/frontend/components/EnrollSecrets/DeleteSecretModal/DeleteSecretModal.tsx b/frontend/components/EnrollSecrets/DeleteSecretModal/DeleteSecretModal.tsx
index 6238373843..1c32637a17 100644
--- a/frontend/components/EnrollSecrets/DeleteSecretModal/DeleteSecretModal.tsx
+++ b/frontend/components/EnrollSecrets/DeleteSecretModal/DeleteSecretModal.tsx
@@ -50,9 +50,7 @@ const DeleteSecretModal = ({
             unable to enroll.
           </p>
           <p>
-            Any enrolled hosts using this secret will not receive updates
-            through Orbit including updates to agent options and command line
-            flags.
+            Hosts that enrolled with this secret will not get updates to agent options.
           </p>
           <p>
             Follow this guide to{" "}
diff --git a/frontend/pages/DashboardPage/cards/MDM/MDM.tsx b/frontend/pages/DashboardPage/cards/MDM/MDM.tsx
index 2e79bd8749..583460c128 100644
--- a/frontend/pages/DashboardPage/cards/MDM/MDM.tsx
+++ b/frontend/pages/DashboardPage/cards/MDM/MDM.tsx
@@ -57,9 +57,9 @@ const EmptyMdmStatus = (): JSX.Element => (
       <>
         To see MDM versions, deploy&nbsp;
         <CustomLink
-          url="https://fleetdm.com/docs/using-fleet/adding-hosts#osquery-installer"
+          url="https://fleetdm.com/learn-more-about/fleetd"
           newTab
-          text="Fleet's osquery installer"
+          text="Fleet's agent (fleetd)"
         />
       </>
     }
diff --git a/frontend/pages/DashboardPage/cards/Munki/Munki.tsx b/frontend/pages/DashboardPage/cards/Munki/Munki.tsx
index ea77e59a2a..8b12f2d2a1 100644
--- a/frontend/pages/DashboardPage/cards/Munki/Munki.tsx
+++ b/frontend/pages/DashboardPage/cards/Munki/Munki.tsx
@@ -109,8 +109,8 @@ const Munki = ({
                         <>
                           To see Munki versions, deploy&nbsp;
                           <CustomLink
-                            url="https://fleetdm.com/docs/using-fleet/adding-hosts#osquery-installer"
-                            text="Fleet's osquery installer"
+                            url="https://fleetdm.com/learn-more-about/fleetd"
+                            text="Fleet's agent (fleetd)"
                             newTab
                           />
                           .
diff --git a/frontend/pages/admin/OrgSettingsPage/cards/Agents/Agents.tsx b/frontend/pages/admin/OrgSettingsPage/cards/Agents/Agents.tsx
index c0acbfc680..1a57ef5576 100644
--- a/frontend/pages/admin/OrgSettingsPage/cards/Agents/Agents.tsx
+++ b/frontend/pages/admin/OrgSettingsPage/cards/Agents/Agents.tsx
@@ -81,7 +81,7 @@ const Agents = ({
         <SectionHeader title="Agent options" />
         <form onSubmit={onFormSubmit} autoComplete="off">
           <p className={`${baseClass}__section-description`}>
-            Agent options configure the osquery agent. When you update agent
+            Agent options configure Fleet's agent (fleetd). When you update agent
             options, they will be applied the next time a host checks in to
             Fleet.{" "}
             <CustomLink
diff --git a/frontend/pages/admin/TeamManagementPage/TeamDetailsWrapper/AgentOptionsPage/AgentOptionsPage.tsx b/frontend/pages/admin/TeamManagementPage/TeamDetailsWrapper/AgentOptionsPage/AgentOptionsPage.tsx
index fa59ded99b..d80d188966 100644
--- a/frontend/pages/admin/TeamManagementPage/TeamDetailsWrapper/AgentOptionsPage/AgentOptionsPage.tsx
+++ b/frontend/pages/admin/TeamManagementPage/TeamDetailsWrapper/AgentOptionsPage/AgentOptionsPage.tsx
@@ -142,7 +142,7 @@ const AgentOptionsPage = ({
   return (
     <div className={`${baseClass}`}>
       <p className={`${baseClass}__page-description`}>
-        Agent options configure the osquery agent. When you update agent
+        Agent options configure Fleet's agent (fleetd). When you update agent
         options, they will be applied the next time a host checks in to Fleet.
         <br />
         <CustomLink
diff --git a/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx b/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx
index 0bd5f3cb7e..bf461122ce 100644
--- a/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx
+++ b/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx
@@ -1462,7 +1462,7 @@ const ManageHostsPage = ({
             "Expecting to see new hosts? Try again in a few seconds as the system catches up.";
         } else if (canEnrollHosts) {
           emptyHosts.header = "Add your hosts to Fleet";
-          emptyHosts.info = "Generate an installer to add your own hosts.";
+          emptyHosts.info = "Generate Fleet's agent (fleetd) to add your own hosts.";
           emptyHosts.primaryButton = (
             <Button variant="brand" onClick={toggleAddHostsModal} type="button">
               Add hosts
diff --git a/frontend/pages/policies/constants.ts b/frontend/pages/policies/constants.ts
index 6bc9ded8a3..a4284615a2 100644
--- a/frontend/pages/policies/constants.ts
+++ b/frontend/pages/policies/constants.ts
@@ -126,7 +126,7 @@ export const DEFAULT_POLICIES: IPolicyNew[] = [
     query: "SELECT 1 FROM mdm WHERE enrolled='true';",
     name: "MDM enrolled (macOS)",
     description:
-      "Required: osquery deployed with Orbit, or manual installation of macadmins/osquery-extension. Checks that a Mac is enrolled to MDM. Add a AND on identity_certificate_uuid to check for a specific MDM.",
+      "Checks that a Mac is enrolled to MDM. Add a AND on identity_certificate_uuid to check for a specific MDM.",
     resolution: "Enroll device to MDM",
     critical: false,
     platform: "darwin",