---
.../cards/DiskEncryption/DiskEncryption.tsx | 23 +++++++++-
.../HostDetailsBanners/HostDetailsBanners.tsx | 42 ++++++++++++++++---
2 files changed, 58 insertions(+), 7 deletions(-)
diff --git a/frontend/pages/ManageControlsPage/OSSettings/cards/DiskEncryption/DiskEncryption.tsx b/frontend/pages/ManageControlsPage/OSSettings/cards/DiskEncryption/DiskEncryption.tsx
index 16e773809d..fd4fe03310 100644
--- a/frontend/pages/ManageControlsPage/OSSettings/cards/DiskEncryption/DiskEncryption.tsx
+++ b/frontend/pages/ManageControlsPage/OSSettings/cards/DiskEncryption/DiskEncryption.tsx
@@ -124,7 +124,24 @@ const DiskEncryption = ({
setIsLoadingTeam(false);
}
- const getTipContent = (platform: "windows" | "macOS") => {
+ const getTipContent = (platform: "windows" | "macOS" | "linux") => {
+ if (platform === "linux") {
+ return (
+ <>
+ For Ubuntu and Fedora Linux.
+
+ Currently, full disk encryption must be turned on{" "}
+
+ during OS
+
+ setup
+
+ . If disk encryption is off, the end user must re-install
+
+ their operating system.
+ >
+ );
+ }
const [AppleOrWindows, DEMethod] =
platform === "windows"
? ["Windows", "BitLocker"]
@@ -149,7 +166,9 @@ const DiskEncryption = ({
Windows
- , Ubuntu Linux, and Fedora Linux hosts.
+ , and{" "}
+ Linux{" "}
+ hosts.
>
);
diff --git a/frontend/pages/hosts/details/HostDetailsPage/components/HostDetailsBanners/HostDetailsBanners.tsx b/frontend/pages/hosts/details/HostDetailsPage/components/HostDetailsBanners/HostDetailsBanners.tsx
index 188282bab1..0e4eb8b851 100644
--- a/frontend/pages/hosts/details/HostDetailsPage/components/HostDetailsBanners/HostDetailsBanners.tsx
+++ b/frontend/pages/hosts/details/HostDetailsPage/components/HostDetailsBanners/HostDetailsBanners.tsx
@@ -1,15 +1,21 @@
import React, { useContext } from "react";
import { AppContext } from "context/app";
-import { DiskEncryptionStatus, MdmEnrollmentStatus } from "interfaces/mdm";
import { hasLicenseExpired } from "utilities/helpers";
-import InfoBanner from "components/InfoBanner";
+
+import { DiskEncryptionStatus, MdmEnrollmentStatus } from "interfaces/mdm";
import { IOSSettings } from "interfaces/host";
import {
HostPlatform,
+ isDiskEncryptionSupportedLinuxPlatform,
platformSupportsDiskEncryption,
} from "interfaces/platform";
+import InfoBanner from "components/InfoBanner";
+import CustomLink from "components/CustomLink";
+import { LEARN_MORE_ABOUT_BASE_LINK } from "utilities/constants";
+import { isDiskEncryptionProfile } from "pages/hosts/details/OSSettingsModal/OSSettingsTable/OSSettingStatusCell/helpers";
+
const baseClass = "host-details-banners";
export interface IHostBannersBaseProps {
@@ -110,9 +116,35 @@ const HostDetailsBanners = ({
platformSupportsDiskEncryption(hostPlatform, hostOsVersion) &&
diskEncryptionOSSetting?.status
) {
- // host either not in compliance with setting, or is but Fleet doesn't yet have a disk
- // encryption key escrowed for the host (possible for Linux hosts)
- if (!diskIsEncrypted || !diskEncryptionKeyAvailable) {
+ if (
+ !diskIsEncrypted &&
+ isDiskEncryptionSupportedLinuxPlatform(hostPlatform, hostOsVersion ?? "")
+ ) {
+ // linux host not in compliance with setting
+ return (
+
+
+ }
+ >
+ Disk encryption: Disk encryption is off. Currently, to turn on{" "}
+ full disk encryption, the end user has to re-install their
+ operating system.
+
+
+ );
+ }
+ if (!diskEncryptionKeyAvailable) {
+ // disk is encrypted, but Fleet doesn't yet have a disk
+ // encryption key escrowed (possible for Linux hosts)
return (