From e48d8033a95a55e17f6e19f38f60afa64c9aaf5d Mon Sep 17 00:00:00 2001 From: Ian Littman Date: Thu, 16 Oct 2025 11:00:05 -0500 Subject: [PATCH] Map manjaro-arm platform (#34357) Resolves #34318. Thx @jmwatts for the QA on this! - [x] QA'd all new/changed functionality manually --- .../understanding-host-vitals.md | 34 +++++++++---------- frontend/interfaces/platform.ts | 2 ++ .../details/cards/HostSummary/HostSummary.tsx | 3 +- server/fleet/hosts.go | 4 ++- 4 files changed, 24 insertions(+), 19 deletions(-) diff --git a/docs/Contributing/product-groups/orchestration/understanding-host-vitals.md b/docs/Contributing/product-groups/orchestration/understanding-host-vitals.md index e21ca99b14..9b1ac97172 100644 --- a/docs/Contributing/product-groups/orchestration/understanding-host-vitals.md +++ b/docs/Contributing/product-groups/orchestration/understanding-host-vitals.md @@ -86,7 +86,7 @@ SELECT 1 FROM disk_encryption WHERE user_uuid IS NOT "" AND filevault_status = ' ## disk_encryption_linux -- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm +- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, manjaro-arm, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm - Query: ```sql @@ -111,7 +111,7 @@ WITH encrypted(enabled) AS ( ## disk_space_unix -- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm, darwin +- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, manjaro-arm, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm, darwin - Query: ```sql @@ -331,7 +331,7 @@ SELECT ipv4 AS address, mac FROM network_interfaces LIMIT 1 ## network_interface_unix -- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm, darwin +- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, manjaro-arm, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm, darwin - Query: ```sql @@ -407,7 +407,7 @@ LIMIT 1; ## orbit_info -- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm, darwin, windows +- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, manjaro-arm, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm, darwin, windows - Discovery query: ```sql @@ -441,7 +441,7 @@ SELECT ## os_unix_like -- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm, darwin +- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, manjaro-arm, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm, darwin - Query: ```sql @@ -533,7 +533,7 @@ WITH display_version_table AS ( ## osquery_flags -- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm, darwin, windows +- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, manjaro-arm, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm, darwin, windows - Query: ```sql @@ -551,7 +551,7 @@ select * from osquery_info limit 1 ## scheduled_query_stats -- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm, darwin, windows +- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, manjaro-arm, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm, darwin, windows - Query: ```sql @@ -581,7 +581,7 @@ FROM chrome_extensions - Description: A software override query[^1] to append last_opened_at information to Linux DEB software entries. The accuracy of this information is limited by the accuracy of the atime column in the file table, which can be affected by the system clock and mount settings like noatime and relatime. -- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm +- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, manjaro-arm, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm - Discovery query: ```sql @@ -599,7 +599,7 @@ SELECT package, MAX(atime) AS last_opened_at ## software_jetbrains_plugins -- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm, darwin, windows +- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, manjaro-arm, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm, darwin, windows - Discovery query: ```sql @@ -627,7 +627,7 @@ FROM cached_users CROSS JOIN jetbrains_plugins USING (uid) ## software_linux -- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm +- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, manjaro-arm, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm - Query: ```sql @@ -711,7 +711,7 @@ FROM cached_users CROSS JOIN firefox_addons USING (uid); ## software_linux_fleetd_pacman -- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm +- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, manjaro-arm, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm - Discovery query: ```sql @@ -883,7 +883,7 @@ WITH app_paths AS ( - Description: Prior to osquery version 5.16.0, the python_packages table did not search user directories. -- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm, darwin, windows +- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, manjaro-arm, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm, darwin, windows - Discovery query: ```sql @@ -911,7 +911,7 @@ SELECT - Description: As of osquery version 5.16.0, the python_packages table searches user directories with support from a cross join on users. See https://fleetdm.com/guides/osquery-consider-joining-against-the-users-table. -- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm, darwin, windows +- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, manjaro-arm, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm, darwin, windows - Discovery query: ```sql @@ -943,7 +943,7 @@ WITH cached_users AS (WITH cached_groups AS (select * from groups) - Description: A software override query[^1] to append last_opened_at information to Linux RPM software entries. The accuracy of this information is limited by the accuracy of the atime column in the file table, which can be affected by the system clock and mount settings like noatime and relatime. -- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm +- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, manjaro-arm, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm - Discovery query: ```sql @@ -961,7 +961,7 @@ SELECT package, MAX(atime) AS last_opened_at ## software_vscode_extensions -- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm, darwin, windows +- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, manjaro-arm, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm, darwin, windows - Discovery query: ```sql @@ -1074,7 +1074,7 @@ select * from system_info limit 1 ## uptime -- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm, darwin, windows +- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, manjaro-arm, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm, darwin, windows - Query: ```sql @@ -1083,7 +1083,7 @@ select * from uptime limit 1 ## users -- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm, darwin, windows +- Platforms: linux, ubuntu, debian, rhel, centos, sles, kali, gentoo, amzn, pop, arch, linuxmint, void, nixos, endeavouros, manjaro, manjaro-arm, opensuse-leap, opensuse-tumbleweed, tuxedo, neon, archarm, darwin, windows - Query: ```sql diff --git a/frontend/interfaces/platform.ts b/frontend/interfaces/platform.ts index 4b1300e875..5b32b1dcf1 100644 --- a/frontend/interfaces/platform.ts +++ b/frontend/interfaces/platform.ts @@ -109,6 +109,7 @@ export const HOST_LINUX_PLATFORMS = [ "nixos", "endeavouros", "manjaro", + "manjaro-arm", "opensuse-leap", "opensuse-tumbleweed", "tuxedo", @@ -166,6 +167,7 @@ export const DISK_ENCRYPTION_SUPPORTED_LINUX_PLATFORMS = [ "arch", // Arch Linux "archarm", // Arch Linux ARM "manjaro", + "manjaro-arm", ] as const; export const isDiskEncryptionSupportedLinuxPlatform = ( diff --git a/frontend/pages/hosts/details/cards/HostSummary/HostSummary.tsx b/frontend/pages/hosts/details/cards/HostSummary/HostSummary.tsx index 6903dc1e33..2f6ce9f8fb 100644 --- a/frontend/pages/hosts/details/cards/HostSummary/HostSummary.tsx +++ b/frontend/pages/hosts/details/cards/HostSummary/HostSummary.tsx @@ -108,7 +108,8 @@ const getHostDiskEncryptionTooltipMessage = ( platform === "ubuntu" || platform === "arch" || platform === "archarm" || - platform === "manjaro" + platform === "manjaro" || + platform === "manjaro-arm" ) { return DISK_ENCRYPTION_MESSAGES.linux[ diskEncryptionEnabled ? "enabled" : "unknown" diff --git a/server/fleet/hosts.go b/server/fleet/hosts.go index a197601ef5..03d7978e7f 100644 --- a/server/fleet/hosts.go +++ b/server/fleet/hosts.go @@ -818,7 +818,7 @@ func (h *Host) IsDEPAssignedToFleet() bool { func (h *Host) IsLUKSSupported() bool { return h.Platform == "ubuntu" || strings.Contains(h.OSVersion, "Fedora") || // fedora h.Platform reports as "rhel" - h.Platform == "arch" || h.Platform == "archarm" || h.Platform == "manjaro" + h.Platform == "arch" || h.Platform == "archarm" || h.Platform == "manjaro" || h.Platform == "manjaro-arm" } // IsEligibleForWindowsMDMUnenrollment returns true if the host must be @@ -1003,6 +1003,7 @@ var HostLinuxOSs = []string{ "nixos", "endeavouros", "manjaro", + "manjaro-arm", "opensuse-leap", "opensuse-tumbleweed", "tuxedo", @@ -1019,6 +1020,7 @@ var HostNeitherDebNorRpmPackageOSs = map[string]struct{}{ "nixos": {}, "endeavouros": {}, "manjaro": {}, + "manjaro-arm": {}, } // HostDebPackageOSs are the list of known Linux platforms that support DEB packages